imx6: add missing patches (r37363)

SVN-Revision: 37364

1 files changed, 190 insertions, 0 deletions

diff --git a/target/linux/imx6/patches-3.10/110-gw5400-a.patch b/target/linux/imx6/patches-3.10/110-gw5400-a.patch
new file mode 100644
index 0000000000..3f7f1fc7f3
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/110-gw5400-a.patch
@@ -0,0 +1,190 @@
+--- 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
+@@ -94,6 +94,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 {
+@@ -201,6 +209,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 {
+@@ -210,6 +224,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 {
+@@ -219,6 +239,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 {
+@@ -228,6 +254,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 {
+@@ -238,6 +279,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/mach-imx/mach-imx6q.c
++++ b/arch/arm/mach-imx/mach-imx6q.c
+@@ -25,6 +25,7 @@
+ #include <linux/of_irq.h>
+ #include <linux/of_platform.h>
+ #include <linux/opp.h>
++#include <linux/pci.h>
+ #include <linux/phy.h>
+ #include <linux/regmap.h>
+ #include <linux/micrel_phy.h>
+@@ -145,6 +146,65 @@ static void __init imx6q_sabrelite_init(
+ 	imx6q_sabrelite_cko1_setup();
+ }
+ 
++/*
++ * fixup for PEX 8909 bridge to configure GPIO1-7 as output High
++ * as they are used for slots1-7 PERST#
++ */
++static void mx6_ventana_pciesw_early_fixup(struct pci_dev *dev)
++{
++	u32 dw;
++
++	if (!of_machine_is_compatible("gw,ventana"))
++		return;
++
++	if (dev->devfn != 0)
++		return;
++
++	pci_read_config_dword(dev, 0x62c, &dw);
++	dw |= 0xaaa8; // GPIO1-7 outputs
++	pci_write_config_dword(dev, 0x62c, dw);
++
++	pci_read_config_dword(dev, 0x644, &dw);
++	dw |= 0xfe;   // GPIO1-7 output high
++	pci_write_config_dword(dev, 0x644, dw);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8609,
++	mx6_ventana_pciesw_early_fixup);
++
++/*
++ * configure PCIe core clock and PCIe ref clock
++ *
++ * TODO: disable CLK1 output and use CLK2 input from si52147 as PCIe ref
++ */
++static void __init imx6q_ventana_pcie_setup(void)
++{
++	struct clk *axi_sel, *axi, *ref;
++
++	axi_sel = clk_get_sys(NULL, "pcie_axi_sel");
++	axi = clk_get_sys(NULL, "axi");
++	ref = clk_get_sys(NULL, "pcie_ref_125m");
++	if (IS_ERR(axi_sel) || IS_ERR(axi) || IS_ERR(ref)) {
++		pr_err("pcie setup failed - can't get clocks\n");
++		goto put_clk;
++	}
++	clk_set_parent(axi_sel, axi);
++	clk_prepare_enable(ref);
++
++put_clk:
++	if (!IS_ERR(axi_sel))
++		clk_put(axi_sel);
++	if (!IS_ERR(axi))
++		clk_put(axi);
++	if (!IS_ERR(ref))
++		clk_put(ref);
++}
++
++static void __init imx6q_ventana_init(void)
++{
++	imx6q_ventana_pcie_setup();
++	imx6q_sabrelite_cko1_setup();
++}
++
+ static void __init imx6q_1588_init(void)
+ {
+ 	struct regmap *gpr;
+@@ -163,6 +223,9 @@ static void __init imx6q_usb_init(void)
+ 
+ static void __init imx6q_init_machine(void)
+ {
++	if (of_machine_is_compatible("gw,ventana"))
++		imx6q_ventana_init();
++
+ 	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
+ 		imx6q_sabrelite_init();
+