diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2014-07-11 00:10:56 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2014-07-11 00:10:56 +0100 |
commit | 889d497170e0f8640f42d40245cb1f8fd460b4f6 (patch) | |
tree | 0e337a38746d080e8b0b1a63e77689fb97b612f4 /arm-imx6-utilite.patch | |
parent | 005b64429717cfef012e5567f348efc230c959ed (diff) | |
download | kernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.tar.gz kernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.tar.xz kernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.zip |
Rebase Utilute and BeagleBone patches, Minaor ARM updates
Diffstat (limited to 'arm-imx6-utilite.patch')
-rw-r--r-- | arm-imx6-utilite.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/arm-imx6-utilite.patch b/arm-imx6-utilite.patch new file mode 100644 index 000000000..bb0747202 --- /dev/null +++ b/arm-imx6-utilite.patch @@ -0,0 +1,54 @@ +diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts +index 99b46f8..8b6ddd1 100644 +--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts ++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts +@@ -97,11 +97,49 @@ + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1 + >; + }; ++ ++ pinctrl_usdhc1: usdhc1grp { ++ fsl,pins = < ++ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059 ++ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059 ++ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059 ++ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059 ++ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059 ++ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059 ++ >; ++ }; ++ ++ pinctrl_usdhc3: usdhc3grp { ++ fsl,pins = < ++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 ++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 ++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 ++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 ++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 ++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 ++ >; ++ }; + }; + }; + ++&sata { ++ status = "okay"; ++}; ++ + &uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; + status = "okay"; + }; ++ ++&usdhc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc1>; ++ status = "okay"; ++}; ++ ++&usdhc3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc3>; ++ status = "okay"; ++}; |