From 223c6808baba3af4fde888b5a14196af99ebec4b Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Thu, 20 Feb 2014 17:26:10 +0000 Subject: imx6: update Ventana dts Update the Ventana device-tree to match upstream: - Add IMX6Q/IMX6DL variants for GW54xx/GW53xx/GW52xx/GW51xx - align pinctrl with upstream - consolidate multiple patches into one Signed-off-by: Tim Harvey SVN-Revision: 39644 --- .../imx6/patches-3.10/110-gateworks-ventana.patch | 263 +++++++++++++++++++++ target/linux/imx6/patches-3.10/110-gw5400-a.patch | 135 ----------- target/linux/imx6/patches-3.10/111-gw54xx.patch | 10 - target/linux/imx6/patches-3.10/112-gw51xx.patch | 161 ------------- target/linux/imx6/patches-3.10/113-gw52xx.patch | 57 ----- target/linux/imx6/patches-3.10/114-gw53xx.patch | 10 - 6 files changed, 263 insertions(+), 373 deletions(-) create mode 100644 target/linux/imx6/patches-3.10/110-gateworks-ventana.patch delete mode 100644 target/linux/imx6/patches-3.10/110-gw5400-a.patch delete mode 100644 target/linux/imx6/patches-3.10/111-gw54xx.patch delete mode 100644 target/linux/imx6/patches-3.10/112-gw51xx.patch delete mode 100644 target/linux/imx6/patches-3.10/113-gw52xx.patch delete mode 100644 target/linux/imx6/patches-3.10/114-gw53xx.patch (limited to 'target/linux/imx6/patches-3.10') diff --git a/target/linux/imx6/patches-3.10/110-gateworks-ventana.patch b/target/linux/imx6/patches-3.10/110-gateworks-ventana.patch new file mode 100644 index 0000000000..1385661b04 --- /dev/null +++ b/target/linux/imx6/patches-3.10/110-gateworks-ventana.patch @@ -0,0 +1,263 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -117,6 +117,15 @@ dtb-$(CONFIG_ARCH_MXC) += \ + imx6dl-sabresd.dtb \ + imx6dl-wandboard.dtb \ + imx6q-arm2.dtb \ ++ imx6q-gw51xx.dtb \ ++ imx6q-gw52xx.dtb \ ++ imx6q-gw53xx.dtb \ ++ imx6q-gw54xx.dtb \ ++ imx6q-gw5400-a.dtb \ ++ imx6dl-gw51xx.dtb \ ++ imx6dl-gw52xx.dtb \ ++ imx6dl-gw53xx.dtb \ ++ imx6dl-gw54xx.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabrelite.dtb \ + imx6q-sabresd.dtb \ +--- a/arch/arm/boot/dts/imx6q.dtsi ++++ b/arch/arm/boot/dts/imx6q.dtsi +@@ -212,6 +212,30 @@ + MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1 + >; + }; ++ ++ /* No strobe */ ++ pinctrl_gpmi_nand_2: gpmi-nand-2 { ++ fsl,pins = < ++ MX6Q_PAD_NANDF_CLE__NAND_CLE 0xb0b1 ++ MX6Q_PAD_NANDF_ALE__NAND_ALE 0xb0b1 ++ MX6Q_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 ++ MX6Q_PAD_NANDF_RB0__NAND_READY_B 0xb000 ++ MX6Q_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 ++ MX6Q_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 ++ MX6Q_PAD_NANDF_CS2__NAND_CE2_B 0xb0b1 ++ MX6Q_PAD_NANDF_CS3__NAND_CE3_B 0xb0b1 ++ MX6Q_PAD_SD4_CMD__NAND_RE_B 0xb0b1 ++ MX6Q_PAD_SD4_CLK__NAND_WE_B 0xb0b1 ++ MX6Q_PAD_NANDF_D0__NAND_DATA00 0xb0b1 ++ MX6Q_PAD_NANDF_D1__NAND_DATA01 0xb0b1 ++ MX6Q_PAD_NANDF_D2__NAND_DATA02 0xb0b1 ++ MX6Q_PAD_NANDF_D3__NAND_DATA03 0xb0b1 ++ MX6Q_PAD_NANDF_D4__NAND_DATA04 0xb0b1 ++ MX6Q_PAD_NANDF_D5__NAND_DATA05 0xb0b1 ++ MX6Q_PAD_NANDF_D6__NAND_DATA06 0xb0b1 ++ MX6Q_PAD_NANDF_D7__NAND_DATA07 0xb0b1 ++ >; ++ }; + }; + + i2c1 { +@@ -230,6 +254,12 @@ + MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 + >; + }; ++ pinctrl_i2c2_2: i2c2grp-2 { ++ fsl,pins = < ++ MX6Q_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 ++ MX6Q_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 ++ >; ++ }; + }; + + i2c3 { +@@ -239,6 +269,12 @@ + MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; ++ pinctrl_i2c3_2: i2c3grp-2 { ++ fsl,pins = < ++ MX6Q_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 ++ MX6Q_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 ++ >; ++ }; + }; + + uart1 { +@@ -248,6 +284,12 @@ + MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 + >; + }; ++ pinctrl_uart1_2: uart1grp-2 { ++ fsl,pins = < ++ MX6Q_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 ++ MX6Q_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 ++ >; ++ }; + }; + + uart2 { +@@ -257,6 +299,21 @@ + MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 + >; + }; ++ pinctrl_uart2_3: uart2grp-3 { ++ fsl,pins = < ++ MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 ++ MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 ++ >; ++ }; ++ }; ++ ++ uart3 { ++ pinctrl_uart3_3: uart3grp-3 { ++ fsl,pins = < ++ MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 ++ MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 ++ >; ++ }; + }; + + uart4 { +@@ -267,6 +324,15 @@ + >; + }; + }; ++ ++ uart5 { ++ pinctrl_uart5_1: uart5grp-1 { ++ fsl,pins = < ++ MX6Q_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1 ++ MX6Q_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1 ++ >; ++ }; ++ }; + + usbotg { + pinctrl_usbotg_1: usbotggrp-1 { +--- a/arch/arm/boot/dts/imx6dl.dtsi ++++ b/arch/arm/boot/dts/imx6dl.dtsi +@@ -37,6 +37,18 @@ + compatible = "fsl,imx6dl-iomuxc"; + reg = <0x020e0000 0x4000>; + ++ /* shared pinctrl settings */ ++ audmux { ++ pinctrl_audmux_1: audmux-1 { ++ fsl,pins = < ++ MX6DL_PAD_SD2_DAT0__AUD4_RXD 0x80000000 ++ MX6DL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000 ++ MX6DL_PAD_SD2_DAT2__AUD4_TXD 0x80000000 ++ MX6DL_PAD_SD2_DAT3__AUD4_TXC 0x80000000 ++ >; ++ }; ++ }; ++ + enet { + pinctrl_enet_1: enetgrp-1 { + fsl,pins = < +@@ -105,6 +117,59 @@ + }; + }; + ++ gpmi-nand { ++ /* No strobe */ ++ pinctrl_gpmi_nand_2: gpmi-nand-2 { ++ fsl,pins = < ++ MX6DL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 ++ MX6DL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 ++ MX6DL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 ++ MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000 ++ MX6DL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 ++ MX6DL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 ++ MX6DL_PAD_NANDF_CS2__NAND_CE2_B 0xb0b1 ++ MX6DL_PAD_NANDF_CS3__NAND_CE3_B 0xb0b1 ++ MX6DL_PAD_SD4_CMD__NAND_RE_B 0xb0b1 ++ MX6DL_PAD_SD4_CLK__NAND_WE_B 0xb0b1 ++ MX6DL_PAD_NANDF_D0__NAND_DATA00 0xb0b1 ++ MX6DL_PAD_NANDF_D1__NAND_DATA01 0xb0b1 ++ MX6DL_PAD_NANDF_D2__NAND_DATA02 0xb0b1 ++ MX6DL_PAD_NANDF_D3__NAND_DATA03 0xb0b1 ++ MX6DL_PAD_NANDF_D4__NAND_DATA04 0xb0b1 ++ MX6DL_PAD_NANDF_D5__NAND_DATA05 0xb0b1 ++ MX6DL_PAD_NANDF_D6__NAND_DATA06 0xb0b1 ++ MX6DL_PAD_NANDF_D7__NAND_DATA07 0xb0b1 ++ >; ++ }; ++ }; ++ ++ i2c1 { ++ pinctrl_i2c1_1: i2c1grp-1 { ++ fsl,pins = < ++ MX6DL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 ++ MX6DL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 ++ >; ++ }; ++ }; ++ ++ i2c2 { ++ pinctrl_i2c2_2: i2c2grp-2 { ++ fsl,pins = < ++ MX6DL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 ++ MX6DL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 ++ >; ++ }; ++ }; ++ ++ i2c3 { ++ pinctrl_i2c3_2: i2c3grp-2 { ++ fsl,pins = < ++ MX6DL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 ++ MX6DL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 ++ >; ++ }; ++ }; ++ + uart1 { + pinctrl_uart1_1: uart1grp-1 { + fsl,pins = < +@@ -112,6 +177,30 @@ + MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 + >; + }; ++ pinctrl_uart1_2: uart1grp-2 { ++ fsl,pins = < ++ MX6DL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 ++ MX6DL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 ++ >; ++ }; ++ }; ++ ++ uart2 { ++ pinctrl_uart2_3: uart2grp-3 { ++ fsl,pins = < ++ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 ++ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 ++ >; ++ }; ++ }; ++ ++ uart3 { ++ pinctrl_uart3_3: uart3grp-3 { ++ fsl,pins = < ++ MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 ++ MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 ++ >; ++ }; + }; + + uart4 { +@@ -123,7 +212,22 @@ + }; + }; + ++ uart5 { ++ pinctrl_uart5_1: uart5grp-1 { ++ fsl,pins = < ++ MX6DL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1 ++ MX6DL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1 ++ >; ++ }; ++ }; ++ + usbotg { ++ pinctrl_usbotg_1: usbotggrp-1 { ++ fsl,pins = < ++ MX6DL_PAD_GPIO_1__USB_OTG_ID 0x17059 ++ >; ++ }; ++ + pinctrl_usbotg_2: usbotggrp-2 { + fsl,pins = < + MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 diff --git a/target/linux/imx6/patches-3.10/110-gw5400-a.patch b/target/linux/imx6/patches-3.10/110-gw5400-a.patch deleted file mode 100644 index 5a3d610530..0000000000 --- a/target/linux/imx6/patches-3.10/110-gw5400-a.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -117,6 +117,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6dl-sabresd.dtb \ - imx6dl-wandboard.dtb \ - imx6q-arm2.dtb \ -+ imx6q-gw5400-a.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ ---- a/arch/arm/boot/dts/imx6q.dtsi -+++ b/arch/arm/boot/dts/imx6q.dtsi -@@ -98,6 +98,14 @@ - MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 - >; - }; -+ -+ pinctrl_audmux_3: audmux-3 { -+ fsl,pins = < -+ MX6Q_PAD_DISP0_DAT19__AUD5_RXD 0x80000000 -+ MX6Q_PAD_EIM_D25__AUD5_RXC 0x80000000 -+ MX6Q_PAD_DISP0_DAT18__AUD5_TXFS 0x80000000 -+ >; -+ }; - }; - - ecspi1 { -@@ -212,6 +220,30 @@ - MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1 - >; - }; -+ -+ /* No strobe */ -+ pinctrl_gpmi_nand_2: gpmi-nand-2 { -+ fsl,pins = < -+ MX6Q_PAD_NANDF_CLE__NAND_CLE 0xb0b1 -+ MX6Q_PAD_NANDF_ALE__NAND_ALE 0xb0b1 -+ MX6Q_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 -+ MX6Q_PAD_NANDF_RB0__NAND_READY_B 0xb000 -+ MX6Q_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 -+ MX6Q_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 -+ MX6Q_PAD_NANDF_CS2__NAND_CE2_B 0xb0b1 -+ MX6Q_PAD_NANDF_CS3__NAND_CE3_B 0xb0b1 -+ MX6Q_PAD_SD4_CMD__NAND_RE_B 0xb0b1 -+ MX6Q_PAD_SD4_CLK__NAND_WE_B 0xb0b1 -+ MX6Q_PAD_NANDF_D0__NAND_DATA00 0xb0b1 -+ MX6Q_PAD_NANDF_D1__NAND_DATA01 0xb0b1 -+ MX6Q_PAD_NANDF_D2__NAND_DATA02 0xb0b1 -+ MX6Q_PAD_NANDF_D3__NAND_DATA03 0xb0b1 -+ MX6Q_PAD_NANDF_D4__NAND_DATA04 0xb0b1 -+ MX6Q_PAD_NANDF_D5__NAND_DATA05 0xb0b1 -+ MX6Q_PAD_NANDF_D6__NAND_DATA06 0xb0b1 -+ MX6Q_PAD_NANDF_D7__NAND_DATA07 0xb0b1 -+ >; -+ }; - }; - - i2c1 { -@@ -230,6 +262,12 @@ - MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 - >; - }; -+ pinctrl_i2c2_2: i2c2grp-2 { -+ fsl,pins = < -+ MX6Q_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 -+ MX6Q_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 -+ >; -+ }; - }; - - i2c3 { -@@ -239,6 +277,12 @@ - MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 - >; - }; -+ pinctrl_i2c3_2: i2c3grp-2 { -+ fsl,pins = < -+ MX6Q_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 -+ MX6Q_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 -+ >; -+ }; - }; - - uart1 { -@@ -248,6 +292,12 @@ - MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 - >; - }; -+ pinctrl_uart1_2: uart1grp-2 { -+ fsl,pins = < -+ MX6Q_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 -+ MX6Q_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 -+ >; -+ }; - }; - - uart2 { -@@ -257,6 +307,21 @@ - MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 - >; - }; -+ pinctrl_uart2_2: uart2grp-2 { -+ fsl,pins = < -+ MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 -+ MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 -+ >; -+ }; -+ }; -+ -+ uart3 { -+ pinctrl_uart3_1: uart3grp-1 { -+ fsl,pins = < -+ MX6Q_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1 -+ MX6Q_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1 -+ >; -+ }; - }; - - uart4 { -@@ -267,6 +332,15 @@ - >; - }; - }; -+ -+ uart5 { -+ pinctrl_uart5_1: uart5grp-1 { -+ fsl,pins = < -+ MX6Q_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1 -+ MX6Q_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1 -+ >; -+ }; -+ }; - - usbotg { - pinctrl_usbotg_1: usbotggrp-1 { diff --git a/target/linux/imx6/patches-3.10/111-gw54xx.patch b/target/linux/imx6/patches-3.10/111-gw54xx.patch deleted file mode 100644 index fa212ad711..0000000000 --- a/target/linux/imx6/patches-3.10/111-gw54xx.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6dl-wandboard.dtb \ - imx6q-arm2.dtb \ - imx6q-gw5400-a.dtb \ -+ imx6q-gw54xx.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ diff --git a/target/linux/imx6/patches-3.10/112-gw51xx.patch b/target/linux/imx6/patches-3.10/112-gw51xx.patch deleted file mode 100644 index e222984920..0000000000 --- a/target/linux/imx6/patches-3.10/112-gw51xx.patch +++ /dev/null @@ -1,161 +0,0 @@ ---- a/arch/arm/boot/dts/imx6dl.dtsi -+++ b/arch/arm/boot/dts/imx6dl.dtsi -@@ -105,6 +105,95 @@ - }; - }; - -+ gpmi-nand { -+ pinctrl_gpmi_nand_1: gpmi-nand-1 { -+ fsl,pins = < -+ MX6DL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 -+ MX6DL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 -+ MX6DL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 -+ MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000 -+ MX6DL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS2__NAND_CE2_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS3__NAND_CE3_B 0xb0b1 -+ MX6DL_PAD_SD4_CMD__NAND_RE_B 0xb0b1 -+ MX6DL_PAD_SD4_CLK__NAND_WE_B 0xb0b1 -+ MX6DL_PAD_NANDF_D0__NAND_DATA00 0xb0b1 -+ MX6DL_PAD_NANDF_D1__NAND_DATA01 0xb0b1 -+ MX6DL_PAD_NANDF_D2__NAND_DATA02 0xb0b1 -+ MX6DL_PAD_NANDF_D3__NAND_DATA03 0xb0b1 -+ MX6DL_PAD_NANDF_D4__NAND_DATA04 0xb0b1 -+ MX6DL_PAD_NANDF_D5__NAND_DATA05 0xb0b1 -+ MX6DL_PAD_NANDF_D6__NAND_DATA06 0xb0b1 -+ MX6DL_PAD_NANDF_D7__NAND_DATA07 0xb0b1 -+ MX6DL_PAD_SD4_DAT0__NAND_DQS 0x00b1 -+ >; -+ }; -+ -+ /* No strobe */ -+ pinctrl_gpmi_nand_2: gpmi-nand-2 { -+ fsl,pins = < -+ MX6DL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 -+ MX6DL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 -+ MX6DL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 -+ MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000 -+ MX6DL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS2__NAND_CE2_B 0xb0b1 -+ MX6DL_PAD_NANDF_CS3__NAND_CE3_B 0xb0b1 -+ MX6DL_PAD_SD4_CMD__NAND_RE_B 0xb0b1 -+ MX6DL_PAD_SD4_CLK__NAND_WE_B 0xb0b1 -+ MX6DL_PAD_NANDF_D0__NAND_DATA00 0xb0b1 -+ MX6DL_PAD_NANDF_D1__NAND_DATA01 0xb0b1 -+ MX6DL_PAD_NANDF_D2__NAND_DATA02 0xb0b1 -+ MX6DL_PAD_NANDF_D3__NAND_DATA03 0xb0b1 -+ MX6DL_PAD_NANDF_D4__NAND_DATA04 0xb0b1 -+ MX6DL_PAD_NANDF_D5__NAND_DATA05 0xb0b1 -+ MX6DL_PAD_NANDF_D6__NAND_DATA06 0xb0b1 -+ MX6DL_PAD_NANDF_D7__NAND_DATA07 0xb0b1 -+ >; -+ }; -+ }; -+ -+ i2c1 { -+ pinctrl_i2c1_1: i2c1grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 -+ MX6DL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 -+ >; -+ }; -+ }; -+ -+ i2c2 { -+ pinctrl_i2c2_1: i2c2grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 -+ MX6DL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 -+ >; -+ }; -+ pinctrl_i2c2_2: i2c2grp-2 { -+ fsl,pins = < -+ MX6DL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 -+ MX6DL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 -+ >; -+ }; -+ }; -+ -+ i2c3 { -+ pinctrl_i2c3_1: i2c3grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 -+ MX6DL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 -+ >; -+ }; -+ pinctrl_i2c3_2: i2c3grp-2 { -+ fsl,pins = < -+ MX6DL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 -+ MX6DL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 -+ >; -+ }; -+ }; -+ - uart1 { - pinctrl_uart1_1: uart1grp-1 { - fsl,pins = < -@@ -112,6 +201,36 @@ - MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 - >; - }; -+ pinctrl_uart1_2: uart1grp-2 { -+ fsl,pins = < -+ MX6DL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 -+ MX6DL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 -+ >; -+ }; -+ }; -+ -+ uart2 { -+ pinctrl_uart2_1: uart2grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 -+ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 -+ >; -+ }; -+ pinctrl_uart2_2: uart2grp-2 { -+ fsl,pins = < -+ MX6DL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1 -+ MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1 -+ >; -+ }; -+ }; -+ -+ uart3 { -+ pinctrl_uart3_1: uart3grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 -+ MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 -+ >; -+ }; - }; - - uart4 { -@@ -122,6 +241,15 @@ - >; - }; - }; -+ -+ uart5 { -+ pinctrl_uart5_1: uart5grp-1 { -+ fsl,pins = < -+ MX6DL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1 -+ MX6DL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1 -+ >; -+ }; -+ }; - - usbotg { - pinctrl_usbotg_2: usbotggrp-2 { ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -119,6 +119,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6q-arm2.dtb \ - imx6q-gw5400-a.dtb \ - imx6q-gw54xx.dtb \ -+ imx6dl-gw51xx.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ diff --git a/target/linux/imx6/patches-3.10/113-gw52xx.patch b/target/linux/imx6/patches-3.10/113-gw52xx.patch deleted file mode 100644 index 6e48d30272..0000000000 --- a/target/linux/imx6/patches-3.10/113-gw52xx.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -120,6 +120,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6q-gw5400-a.dtb \ - imx6q-gw54xx.dtb \ - imx6dl-gw51xx.dtb \ -+ imx6dl-gw52xx.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ ---- a/arch/arm/boot/dts/imx6dl.dtsi -+++ b/arch/arm/boot/dts/imx6dl.dtsi -@@ -37,6 +37,18 @@ - compatible = "fsl,imx6dl-iomuxc"; - reg = <0x020e0000 0x4000>; - -+ /* shared pinctrl settings */ -+ audmux { -+ pinctrl_audmux_1: audmux-1 { -+ fsl,pins = < -+ MX6DL_PAD_SD2_DAT0__AUD4_RXD 0x80000000 -+ MX6DL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000 -+ MX6DL_PAD_SD2_DAT2__AUD4_TXD 0x80000000 -+ MX6DL_PAD_SD2_DAT3__AUD4_TXC 0x80000000 -+ >; -+ }; -+ }; -+ - enet { - pinctrl_enet_1: enetgrp-1 { - fsl,pins = < -@@ -222,6 +234,12 @@ - MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1 - >; - }; -+ pinctrl_uart2_3: uart2grp-3 { -+ fsl,pins = < -+ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 -+ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 -+ >; -+ }; - }; - - uart3 { -@@ -252,6 +270,12 @@ - }; - - usbotg { -+ pinctrl_usbotg_1: usbotggrp-1 { -+ fsl,pins = < -+ MX6DL_PAD_GPIO_1__USB_OTG_ID 0x17059 -+ >; -+ }; -+ - pinctrl_usbotg_2: usbotggrp-2 { - fsl,pins = < - MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 diff --git a/target/linux/imx6/patches-3.10/114-gw53xx.patch b/target/linux/imx6/patches-3.10/114-gw53xx.patch deleted file mode 100644 index 9c31204640..0000000000 --- a/target/linux/imx6/patches-3.10/114-gw53xx.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -121,6 +121,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6q-gw54xx.dtb \ - imx6dl-gw51xx.dtb \ - imx6dl-gw52xx.dtb \ -+ imx6dl-gw53xx.dtb \ - imx6q-sabreauto.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb \ -- cgit v1.2.3