Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5c36ba authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo
Browse files

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: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 006303d6

arch/arm/boot/dts/imx6ul-14x14-evk.dtsi

+53 −0
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ 
		enable-active-high;

	};



	reg_can_3v3: regulator-can-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "can-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "mx6ul-wm8960";
@@ -64,6 +72,28 @@ 
		};

	};



	spi4 {

		compatible = "spi-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_spi4>;

		status = "okay";

		gpio-sck = <&gpio5 11 0>;

		gpio-mosi = <&gpio5 10 0>;

		cs-gpios = <&gpio5 7 0>;

		num-chipselects = <1>;

		#address-cells = <1>;

		#size-cells = <0>;



		gpio_spi: gpio@0 {

			compatible = "fairchild,74hc595";

			gpio-controller;

			#gpio-cells = <2>;

			reg = <0>;

			registers-number = <1>;

			spi-max-frequency = <100000>;

		};

	};



	panel {

		compatible = "innolux,at043tn24";

		backlight = <&backlight_display>;
@@ -130,6 +160,20 @@ 
	};

};



&can1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_flexcan1>;

	xceiver-supply = <&reg_can_3v3>;

	status = "okay";

};



&can2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_flexcan2>;

	xceiver-supply = <&reg_can_3v3>;

	status = "okay";

};



&i2c1 {

	clock-frequency = <100000>;

	pinctrl-names = "default";
@@ -415,6 +459,15 @@ 
		>;

	};



	pinctrl_spi4: spi4grp {

		fsl,pins = <

			MX6UL_PAD_BOOT_MODE0__GPIO5_IO10	0x70a1

			MX6UL_PAD_BOOT_MODE1__GPIO5_IO11	0x70a1

			MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07	0x70a1

			MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08	0x80000000

		>;

	};



	pinctrl_tsc: tscgrp {

		fsl,pins = <

			MX6UL_PAD_GPIO1_IO01__GPIO1_IO01		0xb0

arch/arm/boot/dts/imx6ulz-14x14-evk.dts

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


/delete-node/ &fec1;

/delete-node/ &fec2;

/delete-node/ &can1;

/delete-node/ &can2;

/delete-node/ &lcdif;

/delete-node/ &tsc;

arch/arm/boot/dts/imx6ulz.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
};



/delete-node/ &adc1;

/delete-node/ &can1;

/delete-node/ &can2;

/delete-node/ &ecspi3;

/delete-node/ &ecspi4;

/delete-node/ &epit2;