target/linux/imx6/patches-3.10/0060-flexcan.patch

   1 --- a/arch/arm/boot/dts/imx6q.dtsi
   2 +++ b/arch/arm/boot/dts/imx6q.dtsi
   3 @@ -163,6 +163,31 @@
   4                                         };
   5                                 };
   6
   7 +                               flexcan1 {
   8 +                                       pinctrl_flexcan1_1: flexcan1grp-1 {
   9 +                                               fsl,pins = <
  10 +                                                       MX6Q_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
  11 +                                                       MX6Q_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
  12 +                                               >;
  13 +                                       };
  14 +
  15 +                                       pinctrl_flexcan1_2: flexcan1grp-2 {
  16 +                                               fsl,pins = <
  17 +                                                       MX6Q_PAD_GPIO_7__FLEXCAN1_TX   0x80000000
  18 +                                                       MX6Q_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
  19 +                                               >;
  20 +                                       };
  21 +                               };
  22 +
  23 +                               flexcan2 {
  24 +                                       pinctrl_flexcan2_1: flexcan2grp-1 {
  25 +                                               fsl,pins = <
  26 +                                                       MX6Q_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
  27 +                                                       MX6Q_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
  28 +                                               >;
  29 +                                       };
  30 +                               };
  31 +
  32                                 gpmi-nand {
  33                                         pinctrl_gpmi_nand_1: gpmi-nand-1 {
  34                                                 fsl,pins = <
  35 --- a/arch/arm/boot/dts/imx6qdl.dtsi
  36 +++ b/arch/arm/boot/dts/imx6qdl.dtsi
  37 @@ -292,13 +292,21 @@
  38                         };
  39
  40                         can1: flexcan@02090000 {
  41 +                               compatible = "fsl,imx6q-flexcan";
  42                                 reg = <0x02090000 0x4000>;
  43                                 interrupts = <0 110 0x04>;
  44 +                               clocks = <&clks 108>, <&clks 109>;
  45 +                               clock-names = "ipg", "per";
  46 +                               status = "disabled";
  47                         };
  48
  49                         can2: flexcan@02094000 {
  50 +                               compatible = "fsl,imx6q-flexcan";
  51                                 reg = <0x02094000 0x4000>;
  52                                 interrupts = <0 111 0x04>;
  53 +                               clocks = <&clks 110>, <&clks 111>;
  54 +                               clock-names = "ipg", "per";
  55 +                               status = "disabled";
  56                         };
  57
  58                         gpt: gpt@02098000 {
  59 --- a/arch/arm/boot/dts/imx6dl.dtsi
  60 +++ b/arch/arm/boot/dts/imx6dl.dtsi
  61 @@ -80,6 +80,31 @@
  62                                         };
  63                                 };
  64
  65 +                               flexcan1 {
  66 +                                       pinctrl_flexcan1_1: flexcan1grp-1 {
  67 +                                               fsl,pins = <
  68 +                                                       MX6DL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
  69 +                                                       MX6DL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
  70 +                                               >;
  71 +                                       };
  72 +
  73 +                                       pinctrl_flexcan1_2: flexcan1grp-2 {
  74 +                                               fsl,pins = <
  75 +                                                       MX6DL_PAD_GPIO_7__FLEXCAN1_TX   0x80000000
  76 +                                                       MX6DL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
  77 +                                               >;
  78 +                                       };
  79 +                               };
  80 +
  81 +                               flexcan2 {
  82 +                                       pinctrl_flexcan2_1: flexcan2grp-1 {
  83 +                                               fsl,pins = <
  84 +                                                       MX6DL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
  85 +                                                       MX6DL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
  86 +                                               >;
  87 +                                       };
  88 +                               };
  89 +
  90                                 uart1 {
  91                                         pinctrl_uart1_1: uart1grp-1 {
  92                                                 fsl,pins = <