diff options
Diffstat (limited to 'arch/arm/dts/imx6qdl-phytec-pfla02.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 126 |
1 files changed, 38 insertions, 88 deletions
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi index 841ad653b2..56b42cd1ef 100644 --- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi @@ -9,87 +9,60 @@ * http://www.gnu.org/copyleft/gpl.html */ -#include <arm/imx6qdl-phytec-pfla02.dtsi> +#include <arm/nxp/imx/imx6qdl-phytec-pfla02.dtsi> / { - memory { - /* let barebox fill the memory node */ - reg = <0 0>; - }; - chosen { environment-nand { compatible = "barebox,environment"; - device-path = &gpmi, "partname:barebox-environment"; + device-path = &env_nand; status = "disabled"; }; environment-spinor { compatible = "barebox,environment"; - device-path = &flash, "partname:barebox-environment"; + device-path = &env_nor; status = "disabled"; }; - environment-sd1 { + environment-sd3 { compatible = "barebox,environment"; - device-path = &usdhc1, "partname:barebox-environment"; + device-path = &env_sd3; status = "disabled"; }; + }; +}; - environment-sd2 { - compatible = "barebox,environment"; - device-path = &usdhc2, "partname:barebox-environment"; - status = "disabled"; +/delete-node/ &{/memory@10000000}; + +&som_flash { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0x100000>; }; - environment-sd3 { - compatible = "barebox,environment"; - device-path = &usdhc3, "partname:barebox-environment"; - status = "disabled"; + env_nor: partition@100000 { + label = "barebox-environment"; + reg = <0x100000 0x20000>; }; - environment-sd4 { - compatible = "barebox,environment"; - device-path = &usdhc4, "partname:barebox-environment"; - status = "disabled"; + partition@120000 { + label = "oftree"; + reg = <0x120000 0x20000>; }; - }; -}; -&ecspi3 { - flash: flash@0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "barebox"; - reg = <0x0 0x100000>; - }; - - partition@100000 { - label = "barebox-environment"; - reg = <0x100000 0x20000>; - }; - - partition@120000 { - label = "oftree"; - reg = <0x120000 0x20000>; - }; - - partition@140000 { - label = "kernel"; - reg = <0x140000 0x0>; - }; + partition@140000 { + label = "kernel"; + reg = <0x140000 0x0>; }; }; }; -&fec { - /delete-property/ phy-supply; -}; - &gpmi { partitions { compatible = "fixed-partitions"; @@ -101,12 +74,12 @@ reg = <0x0 0x1000000>; }; - partition@400000 { + env_nand: partition@1000000 { label = "barebox-environment"; reg = <0x1000000 0x100000>; }; - partition@500000 { + partition@1100000 { label = "root"; reg = <0x1100000 0x0>; }; @@ -115,7 +88,7 @@ &iomuxc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog>, <&pinctrl_rev>; + pinctrl-0 = <&pinctrl_rev>; imx6q-phytec-pfla02 { pinctrl_rev: revgrp { @@ -127,30 +100,6 @@ MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x80000000 >; }; - - pinctrl_gpmi_nand: gpminandgrp { - 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_NANDF_CS2__NAND_CE2_B 0xb0b1 - MX6QDL_PAD_NANDF_CS3__NAND_CE3_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 - >; - }; }; }; @@ -158,6 +107,10 @@ barebox,provide-mac-address = <&fec 0x620>; }; +&som_eeprom { + pagesize = <32>; +}; + &usdhc3 { #address-cells = <1>; #size-cells = <1>; @@ -167,7 +120,7 @@ reg = <0x0 0xe0000>; }; - partition@e0000 { + env_sd3: partition@e0000 { label = "barebox-environment"; reg = <0xe0000 0x20000>; }; @@ -178,15 +131,12 @@ pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; - eeprom: eeprom@50 { - compatible = "atmel,24c32"; - pagesize = <32>; - reg = <0x50>; - }; - pmic@58 { watchdog-priority = <500>; restart-priority = <500>; reset-source-priority = <500>; + regulators { + barebox,allow-dummy-supply; + }; }; }; |