Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6ul: add flexcan support

Add flexcan support for i.MX6UL board. Change the place of CAN node delete
due to i.MX6ULZ include i.MX6UL dts but not support flexcan.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Dong Aisheng and committed by
Shawn Guo
ca5c36ba 006303d6

+55 -2
+53
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
··· 30 30 enable-active-high; 31 31 }; 32 32 33 + reg_can_3v3: regulator-can-3v3 { 34 + compatible = "regulator-fixed"; 35 + regulator-name = "can-3v3"; 36 + regulator-min-microvolt = <3300000>; 37 + regulator-max-microvolt = <3300000>; 38 + gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>; 39 + }; 40 + 33 41 sound { 34 42 compatible = "simple-audio-card"; 35 43 simple-audio-card,name = "mx6ul-wm8960"; ··· 69 61 dailink_master: simple-audio-card,codec { 70 62 sound-dai = <&codec>; 71 63 clocks = <&clks IMX6UL_CLK_SAI2>; 64 + }; 65 + }; 66 + 67 + spi4 { 68 + compatible = "spi-gpio"; 69 + pinctrl-names = "default"; 70 + pinctrl-0 = <&pinctrl_spi4>; 71 + status = "okay"; 72 + gpio-sck = <&gpio5 11 0>; 73 + gpio-mosi = <&gpio5 10 0>; 74 + cs-gpios = <&gpio5 7 0>; 75 + num-chipselects = <1>; 76 + #address-cells = <1>; 77 + #size-cells = <0>; 78 + 79 + gpio_spi: gpio@0 { 80 + compatible = "fairchild,74hc595"; 81 + gpio-controller; 82 + #gpio-cells = <2>; 83 + reg = <0>; 84 + registers-number = <1>; 85 + spi-max-frequency = <100000>; 72 86 }; 73 87 }; 74 88 ··· 158 128 clock-names = "rmii-ref"; 159 129 }; 160 130 }; 131 + }; 132 + 133 + &can1 { 134 + pinctrl-names = "default"; 135 + pinctrl-0 = <&pinctrl_flexcan1>; 136 + xceiver-supply = <&reg_can_3v3>; 137 + status = "okay"; 138 + }; 139 + 140 + &can2 { 141 + pinctrl-names = "default"; 142 + pinctrl-0 = <&pinctrl_flexcan2>; 143 + xceiver-supply = <&reg_can_3v3>; 144 + status = "okay"; 161 145 }; 162 146 163 147 &i2c1 { ··· 456 412 MX6UL_PAD_CSI_DATA06__SIM2_PORT1_SVEN 0xb808 457 413 MX6UL_PAD_CSI_DATA07__SIM2_PORT1_TRXD 0xb809 458 414 MX6UL_PAD_CSI_DATA02__GPIO4_IO23 0x3008 415 + >; 416 + }; 417 + 418 + pinctrl_spi4: spi4grp { 419 + fsl,pins = < 420 + MX6UL_PAD_BOOT_MODE0__GPIO5_IO10 0x70a1 421 + MX6UL_PAD_BOOT_MODE1__GPIO5_IO11 0x70a1 422 + MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x70a1 423 + MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x80000000 459 424 >; 460 425 }; 461 426
+2
arch/arm/boot/dts/imx6ulz-14x14-evk.dts
··· 9 9 10 10 /delete-node/ &fec1; 11 11 /delete-node/ &fec2; 12 + /delete-node/ &can1; 13 + /delete-node/ &can2; 12 14 /delete-node/ &lcdif; 13 15 /delete-node/ &tsc; 14 16
-2
arch/arm/boot/dts/imx6ulz.dtsi
··· 20 20 }; 21 21 22 22 /delete-node/ &adc1; 23 - /delete-node/ &can1; 24 - /delete-node/ &can2; 25 23 /delete-node/ &ecspi3; 26 24 /delete-node/ &ecspi4; 27 25 /delete-node/ &epit2;