diff options
Diffstat (limited to 'arch/arm/dts/imx6q-dmo-edmqmx6.dts')
-rw-r--r-- | arch/arm/dts/imx6q-dmo-edmqmx6.dts | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/arch/arm/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts index 2b9097c482..1280837db6 100644 --- a/arch/arm/dts/imx6q-dmo-edmqmx6.dts +++ b/arch/arm/dts/imx6q-dmo-edmqmx6.dts @@ -11,7 +11,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -#include <arm/imx6q-dmo-edmqmx6.dts> +#include <arm/nxp/imx/imx6q-dmo-edmqmx6.dts> / { chosen { @@ -19,47 +19,36 @@ environment-sd { compatible = "barebox,environment"; - device-path = &usdhc3, "partname:barebox-environment"; + device-path = &env_sd3; status = "disabled"; }; environment-emmc { compatible = "barebox,environment"; - device-path = &usdhc4, "partname:barebox-environment"; + device-path = &env_sd4; status = "disabled"; }; environment-spi { compatible = "barebox,environment"; - device-path = &flash, "partname:barebox-environment"; + device-path = &env_nor; status = "disabled"; }; }; }; -&ecspi5 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi_5_1>; - fsl,spi-num-chipselects = <1>; - cs-gpios = <&gpio1 12 0>; - status = "okay"; - - flash: m25p80@0 { - compatible = "m25p80"; - spi-max-frequency = <40000000>; - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "barebox"; - reg = <0x0 0xe0000>; - }; +&flash { + #address-cells = <1>; + #size-cells = <1>; - partition@e0000 { - label = "barebox-environment"; - reg = <0xe0000 0x20000>; - }; + partition@0 { + label = "barebox"; + reg = <0x0 0xe0000>; + }; + + env_nor: partition@e0000 { + label = "barebox-environment"; + reg = <0xe0000 0x20000>; }; }; @@ -71,17 +60,6 @@ >; }; }; - - ecspi5 { - pinctrl_ecspi_5_1: ecspi5rp-1 { - fsl,pins = < - MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO 0x80000000 - MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI 0x80000000 - MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK 0x80000000 - MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x80000000 - >; - }; - }; }; &i2c2 { @@ -99,7 +77,8 @@ label = "barebox"; reg = <0x0 0xe0000>; }; - partition@e0000 { + + env_sd3: partition@e0000 { label = "barebox-environment"; reg = <0xe0000 0x20000>; }; @@ -113,7 +92,8 @@ label = "barebox"; reg = <0x0 0xe0000>; }; - partition@e0000 { + + env_sd4: partition@e0000 { label = "barebox-environment"; reg = <0xe0000 0x20000>; }; |