aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.10/0060-flexcan.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-08-08 13:38:31 +0000
committerLuka Perkov <luka@openwrt.org>2014-08-08 13:38:31 +0000
commitc84876702bd726ec9fd58ffa3a21c95173d2ea6b (patch)
treeae7b5252454a565bf1789b4c80c76fe81aad69a2 /target/linux/imx6/patches-3.10/0060-flexcan.patch
parent4c2c390a239d005aadf5629e4b8b09717e1e5df5 (diff)
downloadupstream-c84876702bd726ec9fd58ffa3a21c95173d2ea6b.tar.gz
upstream-c84876702bd726ec9fd58ffa3a21c95173d2ea6b.tar.bz2
upstream-c84876702bd726ec9fd58ffa3a21c95173d2ea6b.zip
imx6: drop 3.10 support
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42075
Diffstat (limited to 'target/linux/imx6/patches-3.10/0060-flexcan.patch')
-rw-r--r--target/linux/imx6/patches-3.10/0060-flexcan.patch92
1 files changed, 0 insertions, 92 deletions
diff --git a/target/linux/imx6/patches-3.10/0060-flexcan.patch b/target/linux/imx6/patches-3.10/0060-flexcan.patch
deleted file mode 100644
index 11a66c538a..0000000000
--- a/target/linux/imx6/patches-3.10/0060-flexcan.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/arch/arm/boot/dts/imx6q.dtsi
-+++ b/arch/arm/boot/dts/imx6q.dtsi
-@@ -163,6 +163,31 @@
- };
- };
-
-+ flexcan1 {
-+ pinctrl_flexcan1_1: flexcan1grp-1 {
-+ fsl,pins = <
-+ MX6Q_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ MX6Q_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_flexcan1_2: flexcan1grp-2 {
-+ fsl,pins = <
-+ MX6Q_PAD_GPIO_7__FLEXCAN1_TX 0x80000000
-+ MX6Q_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ >;
-+ };
-+ };
-+
-+ flexcan2 {
-+ pinctrl_flexcan2_1: flexcan2grp-1 {
-+ fsl,pins = <
-+ MX6Q_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
-+ MX6Q_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
-+ >;
-+ };
-+ };
-+
- gpmi-nand {
- pinctrl_gpmi_nand_1: gpmi-nand-1 {
- fsl,pins = <
---- a/arch/arm/boot/dts/imx6qdl.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -292,13 +292,21 @@
- };
-
- can1: flexcan@02090000 {
-+ compatible = "fsl,imx6q-flexcan";
- reg = <0x02090000 0x4000>;
- interrupts = <0 110 0x04>;
-+ clocks = <&clks 108>, <&clks 109>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
- };
-
- can2: flexcan@02094000 {
-+ compatible = "fsl,imx6q-flexcan";
- reg = <0x02094000 0x4000>;
- interrupts = <0 111 0x04>;
-+ clocks = <&clks 110>, <&clks 111>;
-+ clock-names = "ipg", "per";
-+ status = "disabled";
- };
-
- gpt: gpt@02098000 {
---- a/arch/arm/boot/dts/imx6dl.dtsi
-+++ b/arch/arm/boot/dts/imx6dl.dtsi
-@@ -80,6 +80,31 @@
- };
- };
-
-+ flexcan1 {
-+ pinctrl_flexcan1_1: flexcan1grp-1 {
-+ fsl,pins = <
-+ MX6DL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ MX6DL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_flexcan1_2: flexcan1grp-2 {
-+ fsl,pins = <
-+ MX6DL_PAD_GPIO_7__FLEXCAN1_TX 0x80000000
-+ MX6DL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
-+ >;
-+ };
-+ };
-+
-+ flexcan2 {
-+ pinctrl_flexcan2_1: flexcan2grp-1 {
-+ fsl,pins = <
-+ MX6DL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
-+ MX6DL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
-+ >;
-+ };
-+ };
-+
- uart1 {
- pinctrl_uart1_1: uart1grp-1 {
- fsl,pins = <