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

Commit 4e65e1b6 authored by Wolfram Sang's avatar Wolfram Sang Committed by Simon Horman
Browse files

ARM: dts: lager: use demuxer for IIC2/I2C2 



Create a separate bus for HDMI related I2C slaves.

Based on work by Wolfram Sang.

Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
[wsa: rebased, removed typo in comment, fixed aliases, switched to
named GPIOS, sort SCL pins first]
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 76a2577d

arch/arm/boot/dts/r8a7790-lager.dts

+124 −89
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ 
		serial0 = &scif0;

		serial1 = &scifa1;

		i2c8 = &gpioi2c1;

		i2c9 = &gpioi2c2;

		i2c10 = &i2cexio0;

		i2c11 = &i2cexio1;

		i2c12 = &i2chdmi;

	};



	chosen {
@@ -272,8 +274,18 @@ 
		#size-cells = <0>;

		compatible = "i2c-gpio";

		status = "disabled";

		sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpio1 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		i2c-gpio,delay-us = <5>;

	};



	gpioi2c2: i2c-9 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		status = "disabled";

		scl-gpios = <&gpio5 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		sda-gpios = <&gpio5 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		i2c-gpio,delay-us = <5>;

	};
@@ -308,6 +320,104 @@ 
		#address-cells = <1>;

		#size-cells = <0>;

	};



        /*

         * IIC2 and I2C2 may be switched using pinmux.

         * A fallback to GPIO is also provided.

         */

	i2chdmi: i2c-12 {

		compatible = "i2c-demux-pinctrl";

		i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;

		i2c-bus-name = "i2c-hdmi";

		#address-cells = <1>;

		#size-cells = <0>;



		ak4643: codec@12 {

			compatible = "asahi-kasei,ak4643";

			#sound-dai-cells = <0>;

			reg = <0x12>;

		};



		composite-in@20 {

			compatible = "adi,adv7180";

			reg = <0x20>;

			remote = <&vin1>;



			port {

				adv7180: endpoint {

					bus-width = <8>;

					remote-endpoint = <&vin1ep0>;

				};

			};

		};



		cec_clock: cec-clock {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <12000000>;

		};



		hdmi@39 {

			compatible = "adi,adv7511w";

			reg = <0x39>;

			interrupt-parent = <&gpio1>;

			interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&cec_clock>;

			clock-names = "cec";



			adi,input-depth = <8>;

			adi,input-colorspace = "rgb";

			adi,input-clock = "1x";

			adi,input-style = <1>;

			adi,input-justification = "evenly";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					adv7511_in: endpoint {

						remote-endpoint = <&du_out_lvds0>;

					};

				};



				port@1 {

					reg = <1>;

					adv7511_out: endpoint {

						remote-endpoint = <&hdmi_con_out>;

					};

				};

			};

		};



		hdmi-in@4c {

			compatible = "adi,adv7612";

			reg = <0x4c>;

			interrupt-parent = <&gpio1>;

			interrupts = <20 IRQ_TYPE_LEVEL_LOW>;

			default-input = <0>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					adv7612_in: endpoint {

						remote-endpoint = <&hdmi_con_in>;

					};

				};



				port@2 {

					reg = <2>;

					adv7612_out: endpoint {

						remote-endpoint = <&vin0ep2>;

					};

				};

			};

		};

	};

};



&du {
@@ -437,6 +547,11 @@ 
		function = "iic1";

	};



	i2c2_pins: i2c2 {

		groups = "i2c2";

		function = "i2c2";

	};



	iic2_pins: iic2 {

		groups = "iic2";

		function = "iic2";
@@ -643,98 +758,18 @@ 
	pinctrl-names = "i2c-exio1";

};



&iic2	{

	status = "okay";

	pinctrl-0 = <&iic2_pins>;

	pinctrl-names = "default";

&i2c2	{

	pinctrl-0 = <&i2c2_pins>;

	pinctrl-names = "i2c-hdmi";



	clock-frequency = <100000>;



	ak4643: codec@12 {

		compatible = "asahi-kasei,ak4643";

		#sound-dai-cells = <0>;

		reg = <0x12>;

};



	composite-in@20 {

		compatible = "adi,adv7180";

		reg = <0x20>;

		remote = <&vin1>;



		port {

			adv7180: endpoint {

				bus-width = <8>;

				remote-endpoint = <&vin1ep0>;

			};

		};

	};



	cec_clock: cec-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <12000000>;

	};



	hdmi@39 {

		compatible = "adi,adv7511w";

		reg = <0x39>;

		interrupt-parent = <&gpio1>;

		interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&cec_clock>;

		clock-names = "cec";



		adi,input-depth = <8>;

		adi,input-colorspace = "rgb";

		adi,input-clock = "1x";

		adi,input-style = <1>;

		adi,input-justification = "evenly";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				adv7511_in: endpoint {

					remote-endpoint = <&du_out_lvds0>;

				};

			};



			port@1 {

				reg = <1>;

				adv7511_out: endpoint {

					remote-endpoint = <&hdmi_con_out>;

				};

			};

		};

	};



	hdmi-in@4c {

		compatible = "adi,adv7612";

		reg = <0x4c>;

		interrupt-parent = <&gpio1>;

		interrupts = <20 IRQ_TYPE_LEVEL_LOW>;

		default-input = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				adv7612_in: endpoint {

					remote-endpoint = <&hdmi_con_in>;

				};

			};

&iic2	{

	pinctrl-0 = <&iic2_pins>;

	pinctrl-names = "i2c-hdmi";



			port@2 {

				reg = <2>;

				adv7612_out: endpoint {

					remote-endpoint = <&vin0ep2>;

				};

			};

		};

	};

	clock-frequency = <100000>;

};



&iic3 {