* [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically
@ 2019-12-11 10:59 Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description Stefan Riedmueller
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
Bring the device tree nodes in alphabetical order and in this context
also remove the deprecated iomux group.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi | 182 ++++++++++++++++-----------------
1 file changed, 90 insertions(+), 92 deletions(-)
diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
index 66b547ad8eef..db986f87ef26 100644
--- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
+++ b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
@@ -17,104 +17,16 @@
compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
chosen {
- environment-sd3 {
- compatible = "barebox,environment";
- device-path = &environment_usdhc3;
- status = "disabled";
- };
-
environment-nand {
compatible = "barebox,environment";
device-path = &environment_nand;
status = "disabled";
};
- };
-};
-
-&i2c1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1>;
-
- eeprom: m24c32@50 {
- compatible = "st,24c32", "at24";
- reg = <0x50>;
- };
-};
-
-&iomuxc {
- pinctrl-names = "default";
-
- imx6q-phytec-pcaaxl3 {
- pinctrl_enet: enetgrp {
- fsl,pins = <
- MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
- MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
- MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0
- MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0
- MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0
- MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
- MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0
- MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0
- MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0
- MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
- MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3 0x1b0b0
- MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3 0x1b0b0
- MX6QDL_PAD_KEY_ROW1__ENET_COL 0x1b0b0
- MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2 0x1b0b0
- MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2 0x1b0b0
- MX6QDL_PAD_KEY_COL3__ENET_CRS 0x1b0b0
- MX6QDL_PAD_GPIO_18__ENET_RX_CLK 0x1b0b0
- MX6QDL_PAD_GPIO_19__ENET_TX_ER 0x1b0b0
- >;
- };
-
- pinctrl_gpmi_nand: gpmigrp {
- fsl,pins = <
- MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
- MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
- MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
- MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
- MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
- MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
- MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
- MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
- MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
- MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
- MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
- MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
- MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
- MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
- MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
- MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
- MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
- >;
- };
-
- pinctrl_i2c1: i2c1grp {
- fsl,pins = <
- MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
- MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
- >;
- };
-
- pinctrl_uart3: uart3grp {
- fsl,pins = <
- MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
- MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
- >;
- };
- pinctrl_usdhc3: usdhc3grp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
- MX6QDL_PAD_CSI0_DAT4__GPIO5_IO22 0x80000000 /* CD */
- >;
+ environment-sd3 {
+ compatible = "barebox,environment";
+ device-path = &environment_usdhc3;
+ status = "disabled";
};
};
};
@@ -154,6 +66,92 @@
};
};
+&i2c1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+
+ eeprom: m24c32@50 {
+ compatible = "st,24c32", "at24";
+ reg = <0x50>;
+ };
+};
+
+&iomuxc {
+ pinctrl-names = "default";
+
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+ MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0
+ MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0
+ MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0
+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
+ MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0
+ MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0
+ MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
+ MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3 0x1b0b0
+ MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3 0x1b0b0
+ MX6QDL_PAD_KEY_ROW1__ENET_COL 0x1b0b0
+ MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2 0x1b0b0
+ MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2 0x1b0b0
+ MX6QDL_PAD_KEY_COL3__ENET_CRS 0x1b0b0
+ MX6QDL_PAD_GPIO_18__ENET_RX_CLK 0x1b0b0
+ MX6QDL_PAD_GPIO_19__ENET_TX_ER 0x1b0b0
+ >;
+ };
+
+ pinctrl_gpmi_nand: gpmigrp {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
+ >;
+ };
+
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
+ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
+ >;
+ };
+
+ pinctrl_uart3: uart3grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+ >;
+ };
+
+ pinctrl_usdhc3: usdhc3grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+ MX6QDL_PAD_CSI0_DAT4__GPIO5_IO22 0x80000000 /* CD */
+ >;
+ };
+};
+
&ocotp {
barebox,provide-mac-address = <&fec 0x620>;
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
Make use of SPDX license identifiers and update copyright notices and
model descriptions of the phyCARD-i.MX 6 SOM.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6q-phytec-pbaa03.dts | 13 ++++---------
arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi | 13 ++++---------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-pbaa03.dts
index 5216a2dfe316..8034f90804ec 100644
--- a/arch/arm/dts/imx6q-phytec-pbaa03.dts
+++ b/arch/arm/dts/imx6q-phytec-pbaa03.dts
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
/*
- * Copyright 2014 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2014 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
*/
/dts-v1/;
@@ -16,7 +11,7 @@
#include "imx6q-phytec-pcaaxl3.dtsi"
/ {
- model = "Phytec phyCARD-i.MX6 Quad Carrier-Board";
+ model = "PHYTEC phyCARD-i.MX6 Quad";
compatible = "phytec,imx6q-pbaa03", "phytec,imx6q-pcaaxl3", "fsl,imx6q";
chosen {
diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
index db986f87ef26..0dbd5419ba10 100644
--- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
+++ b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
@@ -1,19 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
/*
- * Copyright 2014444 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2014 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
*/
#include <arm/imx6q.dtsi>
#include "imx6q.dtsi"
/ {
- model = "Phytec phyCARD-i.MX6 Quad";
+ model = "PHYTEC phyCARD-i.MX6 Quad";
compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
chosen {
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
Use the simpler name phycard instead of the article number pcaaxl3
for device tree file names and image names of the phyCARD-i.MX 6.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/boards/phytec-som-imx6/lowlevel.c | 6 +++---
arch/arm/dts/Makefile | 2 +-
arch/arm/dts/{imx6q-phytec-pbaa03.dts => imx6q-phytec-phycard.dts} | 6 +++++-
.../{imx6q-phytec-pcaaxl3.dtsi => imx6qdl-phytec-phycard-som.dtsi} | 6 ------
images/Makefile.imx | 6 +++---
5 files changed, 12 insertions(+), 14 deletions(-)
rename arch/arm/dts/{imx6q-phytec-pbaa03.dts => imx6q-phytec-phycard.dts} (83%)
rename arch/arm/dts/{imx6q-phytec-pcaaxl3.dtsi => imx6qdl-phytec-phycard-som.dtsi} (96%)
diff --git a/arch/arm/boards/phytec-som-imx6/lowlevel.c b/arch/arm/boards/phytec-som-imx6/lowlevel.c
index 2de84169c692..900aa19c19ea 100644
--- a/arch/arm/boards/phytec-som-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-som-imx6/lowlevel.c
@@ -90,9 +90,9 @@ static void __noreturn start_imx6_phytec_common(uint32_t size,
__dtb_##fdt_name##_start); \
}
-PHYTEC_ENTRY(start_phytec_pbaa03_1gib, imx6q_phytec_pbaa03, SZ_1G, true);
-PHYTEC_ENTRY(start_phytec_pbaa03_1gib_1bank, imx6q_phytec_pbaa03, SZ_1G, true);
-PHYTEC_ENTRY(start_phytec_pbaa03_2gib, imx6q_phytec_pbaa03, SZ_2G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib, imx6q_phytec_phycard, SZ_1G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_1gib_1bank, imx6q_phytec_phycard, SZ_1G, true);
+PHYTEC_ENTRY(start_phytec_phycard_imx6q_2gib, imx6q_phytec_phycard, SZ_2G, true);
PHYTEC_ENTRY(start_phytec_pbab01_512mb_1bank, imx6q_phytec_pbab01, SZ_512M, true);
PHYTEC_ENTRY(start_phytec_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5c9a311c5f8a..e8dca0b8513c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -52,7 +52,7 @@ lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am33
am335x-phytec-phycore-som-nand-no-eeprom.dtb.o am335x-phytec-phycore-som-nand-no-spi-no-eeprom.dtb.o \
am335x-phytec-phycore-som-emmc.dtb.o \
am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o
-lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-pbaa03.dtb.o \
+lwl-dtb-$(CONFIG_MACH_PHYTEC_SOM_IMX6) += imx6q-phytec-phycard.dtb.o \
imx6s-phytec-pbab01.dtb.o \
imx6dl-phytec-pbab01.dtb.o \
imx6q-phytec-pbab01.dtb.o \
diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-phycard.dts
similarity index 83%
rename from arch/arm/dts/imx6q-phytec-pbaa03.dts
rename to arch/arm/dts/imx6q-phytec-phycard.dts
index 8034f90804ec..09106f7d4dda 100644
--- a/arch/arm/dts/imx6q-phytec-pbaa03.dts
+++ b/arch/arm/dts/imx6q-phytec-phycard.dts
@@ -5,10 +5,14 @@
*/
/dts-v1/;
+
#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY
#include CONFIG_BOOTM_FITIMAGE_PUBKEY
#endif
-#include "imx6q-phytec-pcaaxl3.dtsi"
+
+#include <arm/imx6q.dtsi>
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycard-som.dtsi"
/ {
model = "PHYTEC phyCARD-i.MX6 Quad";
diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
similarity index 96%
rename from arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
rename to arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index 0dbd5419ba10..6d963f191024 100644
--- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -4,13 +4,7 @@
* Author: Christian Hemp <c.hemp@phytec.de>
*/
-#include <arm/imx6q.dtsi>
-#include "imx6q.dtsi"
-
/ {
- model = "PHYTEC phyCARD-i.MX6 Quad";
- compatible = "phytec,imx6q-pcaaxl3", "fsl,imx6q";
-
chosen {
environment-nand {
compatible = "barebox,environment";
diff --git a/images/Makefile.imx b/images/Makefile.imx
index 53d4ac8202c5..5b60037c0787 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -281,11 +281,11 @@ $(call build_imx_habv4img, CONFIG_MACH_EMBEST_MARSBOARD, start_imx6q_marsboard,
$(call build_imx_habv4img, CONFIG_MACH_EMBEST_RIOTBOARD, start_imx6s_riotboard, embest-riotboard/flash-header-embest-riotboard, embest-imx6s-riotboard)
-$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_pbaa03_1gib, phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib, phytec-pbaa03-1gib)
+$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_phycard_imx6q_1gib, phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib, phytec-phycard-imx6q-1gib)
-$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_pbaa03_1gib_1bank, phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank, phytec-pbaa03-1gib-1bank)
+$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_phycard_imx6q_1gib_1bank, phytec-som-imx6/flash-header-phytec-pcaaxl3-1gib-1bank, phytec-phycard-imx6q-1gib-1bank)
-$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_pbaa03_2gib, phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib, phytec-pbaa03-2gib)
+$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_phycard_imx6q_2gib, phytec-som-imx6/flash-header-phytec-pcaaxl3-2gib, phytec-phycard-imx6q-2gib)
$(call build_imx_habv4img, CONFIG_MACH_PHYTEC_SOM_IMX6, start_phytec_phycore_imx6q_som_nand_1gib, phytec-som-imx6/flash-header-phytec-pcm058-1gib, phytec-phycore-imx6q-som-nand-1gib)
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/7] ARM: dts: imx6: phycard: Make eeprom configurable
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 5/7] ARM: dts: imx6: phycard: Switch to new partitions binding Stefan Riedmueller
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
The EEPROM is a configurable option. So make it configurable from the
dts file.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6q-phytec-phycard.dts | 4 ++++
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 1 +
2 files changed, 5 insertions(+)
diff --git a/arch/arm/dts/imx6q-phytec-phycard.dts b/arch/arm/dts/imx6q-phytec-phycard.dts
index 09106f7d4dda..c06461c2c73d 100644
--- a/arch/arm/dts/imx6q-phytec-phycard.dts
+++ b/arch/arm/dts/imx6q-phytec-phycard.dts
@@ -23,6 +23,10 @@
};
};
+&eeprom {
+ status = "okay";
+};
+
&fec {
status = "okay";
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index 6d963f191024..f1a5e5962362 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -63,6 +63,7 @@
eeprom: m24c32@50 {
compatible = "st,24c32", "at24";
reg = <0x50>;
+ status = "disabled";
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 5/7] ARM: dts: imx6: phycard: Switch to new partitions binding
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (2 preceding siblings ...)
2019-12-11 10:59 ` [PATCH v3 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 6/7] ARM: dts: imx6: phycard: Use gpio binding constants Stefan Riedmueller
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
The SD card interface is still using the legacy partition binding.
Change this by switching to the new bindings.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index f1a5e5962362..f17ba7bf808d 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -158,15 +158,19 @@
cd-gpios = <&gpio5 22 0>;
status = "disabled";
- #address-cells = <1>;
- #size-cells = <1>;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition@0 {
- label = "barebox";
- reg = <0x0 0xe0000>;
- };
- environment_usdhc3: partition@e0000 {
- label = "barebox-environment";
- reg = <0xe0000 0x20000>;
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0xe0000>;
+ };
+
+ environment_usdhc3: partition@e0000 {
+ label = "barebox-environment";
+ reg = <0xe0000 0x20000>;
+ };
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 6/7] ARM: dts: imx6: phycard: Use gpio binding constants
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (3 preceding siblings ...)
2019-12-11 10:59 ` [PATCH v3 5/7] ARM: dts: imx6: phycard: Switch to new partitions binding Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size Stefan Riedmueller
2019-12-12 7:23 ` [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Sascha Hauer
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index f17ba7bf808d..892bce1fc0ab 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -4,6 +4,8 @@
* Author: Christian Hemp <c.hemp@phytec.de>
*/
+#include <dt-bindings/gpio/gpio.h>
+
/ {
chosen {
environment-nand {
@@ -155,7 +157,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio5 22 0>;
+ cd-gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>;
status = "disabled";
partitions {
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (4 preceding siblings ...)
2019-12-11 10:59 ` [PATCH v3 6/7] ARM: dts: imx6: phycard: Use gpio binding constants Stefan Riedmueller
@ 2019-12-11 10:59 ` Stefan Riedmueller
2019-12-12 7:23 ` [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Sascha Hauer
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Riedmueller @ 2019-12-11 10:59 UTC (permalink / raw)
To: barebox
For NAND flash with eraseblock size 1 MB and more the current
barebox partition size is not sufficient. The 4 FCB copies alone occupy
the 4 MB partition size. Increase the partition size to 16 MB to be fit
for the future and leaving some blocks for bad block handling as well.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
Changes in v3:
- Rebased on latest master
---
arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 6 +++---
arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi | 6 +++---
arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 846ebbe6b18b..841ad653b26d 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -98,17 +98,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x100000>;
+ reg = <0x1000000 0x100000>;
};
partition@500000 {
label = "root";
- reg = <0x500000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
index 892bce1fc0ab..5d287258bb6c 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycard-som.dtsi
@@ -42,17 +42,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
environment_nand: partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x20000>;
+ reg = <0x1000000 0x100000>;
};
partition@420000 {
label = "root";
- reg = <0x420000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
index 69f252b42382..918b62f794b3 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -50,17 +50,17 @@
partition@0 {
label = "barebox";
- reg = <0x0 0x400000>;
+ reg = <0x0 0x1000000>;
};
partition@400000 {
label = "barebox-environment";
- reg = <0x400000 0x100000>;
+ reg = <0x1000000 0x100000>;
};
partition@500000 {
label = "root";
- reg = <0x500000 0x0>;
+ reg = <0x1100000 0x0>;
};
};
};
--
2.7.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
` (5 preceding siblings ...)
2019-12-11 10:59 ` [PATCH v3 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size Stefan Riedmueller
@ 2019-12-12 7:23 ` Sascha Hauer
6 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-12-12 7:23 UTC (permalink / raw)
To: Stefan Riedmueller; +Cc: barebox
On Wed, Dec 11, 2019 at 11:59:15AM +0100, Stefan Riedmueller wrote:
> Bring the device tree nodes in alphabetical order and in this context
> also remove the deprecated iomux group.
>
> Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
> ---
> Changes in v3:
> - Rebased on latest master
> ---
Applied, thanks
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-12-12 7:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 10:59 [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 2/7] ARM: dts: imx6: pcaaxl3: Update license and model description Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 3/7] ARM: dts: imx6: pcaaxl3: Make use of the simpler name phycard Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 4/7] ARM: dts: imx6: phycard: Make eeprom configurable Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 5/7] ARM: dts: imx6: phycard: Switch to new partitions binding Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 6/7] ARM: dts: imx6: phycard: Use gpio binding constants Stefan Riedmueller
2019-12-11 10:59 ` [PATCH v3 7/7] ARM: dts: imx6: phytec: Increase NAND barebox partition size Stefan Riedmueller
2019-12-12 7:23 ` [PATCH v3 1/7] ARM: dts: imx6: pcaaxl3: Order nodes alphabetically Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox