MLK-10392-1 dts: imx7d-arm2: add flexcan support

New dts file imx7d-12x12-lpddr3-arm2-flexcan.dts introduced due to pin conflict
with enet1 and sai1.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6e74e04..e755a1f 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -474,6 +474,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-12x12-lpddr3-arm2-m4.dtb \
        imx7d-12x12-lpddr3-arm2-ecspi.dtb \
        imx7d-12x12-lpddr3-arm2-enet2.dtb \
+       imx7d-12x12-lpddr3-arm2-flexcan.dtb \
        imx7d-12x12-lpddr3-arm2-mipi_dsi.dtb \
        imx7d-12x12-lpddr3-arm2-sai.dtb \
        imx7d-12x12-lpddr3-arm2-mqs.dtb \

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts
new file mode 100644 (file)
index 0000000..1888c87
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts
@@ -0,0 +1,25 @@
+/*
+* Copyright (C) 2015 Freescale Semiconductor, Inc.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*/
+
+#include "imx7d-12x12-lpddr3-arm2.dts"
+
+&fec1 {
+       status = "disabled";
+};
+
+&flexcan1 {
+       status = "okay";
+};
+
+&flexcan2 {
+       status = "okay";
+};
+
+&sai1 {
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index f82336d..3bd426a 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -60,6 +60,22 @@
                        enable-active-high;
                };
 
+               reg_can1_3v3: can1-3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "can1-3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio1 10 GPIO_ACTIVE_LOW>;
+               };
+
+               reg_can2_3v3: can2-3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "can2-3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio1 11 GPIO_ACTIVE_LOW>;
+               };
+
                reg_coedc_5v: coedc_5v {
                        compatible = "regulator-fixed";
                        regulator-name = "CODEC_5V";
@@ -198,6 +214,20 @@
        status = "disabled";
 };
 
+&flexcan1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1>;
+       xceiver-supply = <&reg_can1_3v3>;
+       status = "disabled";
+};
+
+&flexcan2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       xceiver-supply = <&reg_can2_3v3>;
+       status = "disabled";
+};
+
 &i2c1 {
        clock-frequency = <100000>;
        pinctrl-names = "default";
@@ -490,6 +520,22 @@
                        >;
                };
 
+               pinctrl_flexcan1: flexcan1grp {
+                       fsl,pins = <
+                               MX7D_PAD_SAI1_RX_DATA__FLEXCAN1_RX      0x59
+                               MX7D_PAD_SAI1_TX_BCLK__FLEXCAN1_TX      0x59
+                               MX7D_PAD_GPIO1_IO10__GPIO1_IO10         0x59 /* STBY */
+                       >;
+               };
+
+               pinctrl_flexcan2: flexcan2grp {
+                       fsl,pins = <
+                               MX7D_PAD_SAI1_TX_SYNC__FLEXCAN2_RX      0x59
+                               MX7D_PAD_SAI1_TX_DATA__FLEXCAN2_TX      0x59
+                               MX7D_PAD_GPIO1_IO11__GPIO1_IO11         0x59  /* STBY */
+                       >;
+               };
+
                pinctrl_gpio_keys: gpio_keysgrp {
                        fsl,pins = <
                                MX7D_PAD_GPIO1_IO14__GPIO1_IO14 0x32