diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:49 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:49 +0100 |
commit | 66037e9ed9d7acbd13444f837e8a258dce0deb8d (patch) | |
tree | 39dc4972546b160d317579917dd5932c481b5d64 /arch/arm/dts | |
parent | fbd757cb7f4f53813e37874d52020eb61228526b (diff) | |
parent | 43ab267ee00e64372fc621fc08d82f008bd33ed5 (diff) | |
download | barebox-66037e9ed9d7acbd13444f837e8a258dce0deb8d.tar.gz barebox-66037e9ed9d7acbd13444f837e8a258dce0deb8d.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/dts/imx6dl-tx6u.dts | 12 | ||||
-rw-r--r-- | arch/arm/dts/imx6q-tx6q.dts | 12 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-tx6x.dtsi (renamed from arch/arm/dts/imx6dl-tx6u-801x.dts) | 51 |
4 files changed, 66 insertions, 12 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index bfc1b6176d..b83c1109ef 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -68,7 +68,8 @@ pbl-dtb-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o pbl-dtb-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o pbl-dtb-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o pbl-dtb-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o -pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u-801x.dtb.o +pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o +pbl-dtb-$(CONFIG_MACH_TX6X) += imx6q-tx6q.dtb.o pbl-dtb-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o pbl-dtb-$(CONFIG_MACH_USI_TOPKICK) += kirkwood-topkick-bb.dtb.o pbl-dtb-$(CONFIG_MACH_VARISCITE_MX6) += imx6q-var-custom.dtb.o diff --git a/arch/arm/dts/imx6dl-tx6u.dts b/arch/arm/dts/imx6dl-tx6u.dts new file mode 100644 index 0000000000..77fda6203f --- /dev/null +++ b/arch/arm/dts/imx6dl-tx6u.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include <arm/imx6q.dtsi> +#include <arm/imx6qdl-tx6.dtsi> +#include "imx6qdl.dtsi" +#include "imx6qdl-tx6x.dtsi" + +/ { + model = "Ka-Ro electronics TX6U-801x Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; +}; + diff --git a/arch/arm/dts/imx6q-tx6q.dts b/arch/arm/dts/imx6q-tx6q.dts new file mode 100644 index 0000000000..6063dd4fe5 --- /dev/null +++ b/arch/arm/dts/imx6q-tx6q.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include <arm/imx6q.dtsi> +#include <arm/imx6qdl-tx6.dtsi> +#include "imx6q.dtsi" +#include "imx6qdl-tx6x.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q Module"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; +}; + diff --git a/arch/arm/dts/imx6dl-tx6u-801x.dts b/arch/arm/dts/imx6qdl-tx6x.dtsi index a480408f50..9c5d676a74 100644 --- a/arch/arm/dts/imx6dl-tx6u-801x.dts +++ b/arch/arm/dts/imx6qdl-tx6x.dtsi @@ -1,21 +1,32 @@ -#include <arm/imx6dl-tx6u-801x.dts> -#include "imx6qdl.dtsi" - / { - model = "Ka-Ro electronics TX6U-801x Module"; - compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; - chosen { linux,stdout-path = &uart1; - environment@0 { + environment-nand { + status = "disabled"; compatible = "barebox,environment"; device-path = &gpmi, "partname:barebox-environment"; }; + + environment-emmc { + status = "disabled"; + compatible = "barebox,environment"; + device-path = &usdhc4, "partname:boot1"; + }; }; + + gpio-keys { + status = "disabled"; + }; +}; + +&fec { + phy-reset-duration = <22>; }; &gpmi { + status = "disabled"; + partition@0 { label = "barebox"; reg = <0x0 0x400000>; @@ -53,13 +64,31 @@ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0b0 >; }; - }; -}; -&fec { - phy-reset-duration = <22>; + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x070b1 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x070b1 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x070b1 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x070b1 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x070b1 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x070b1 + MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x0b0b1 + >; + }; + }; }; &ocotp { barebox,provide-mac-address = <&fec 0x620>; }; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <4>; + non-removable; + no-1-8-v; + fsl,wp-controller; + status = "disabled"; +}; |