Merge "mdss: mhl3: rename "sil,i2c_port#" DT property to "sil,i2c-port"" (5ae58dc8) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/i2c/sii8620-i2c.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -7,10 +7,12 @@ Required properties:
		- sil,fw-wake: MHL fw wake gpio going into sii8620
		- sil,reset-gpio: MHL reset gpio going into sii8620 for toggling reset pin
		- sil,irq-gpio: MHL interrupt gpio coming out of sii8620
		- sil,i2c_port#: Port number of i2c device
		- pinctrl-0: Pin control group to be used for this controller.
		- pinctrl-names: Should contain only one value - "mhl_active".

		Optional properties:
		- sil,i2c-port: Port number of i2c device

		Example:
		i2c@f9923000 {
		sil,sii-8620@72 {
		@@ -20,7 +22,7 @@ Example:
		sil,fw-wake = <&msm_gpio 38 0>;
		sil,reset-gpio = <&msm_gpio 58 0>;
		sil,irq-gpio = <&msm_gpio 57 0>;
		sil,i2c_port# = <1>;
		sil,i2c-port = <1>;
		pinctrl-names = "mhl_active";
		pinctrl-0 = <&mhl_intr_active &mhl_reset_active>;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@
		sil,fw-wake = <&msm_gpio 38 0>;
		sil,reset-gpio = <&msm_gpio 58 0>;
		sil,irq-gpio = <&msm_gpio 57 0>;
		sil,i2c_port# = <1>;
		sil,i2c-port = <1>;
		pinctrl-names = "mhl_active";
		pinctrl-0 = <&mhl_intr_active &mhl_reset_active>;
		};

+2 −2

Original line number	Diff line number	Diff line
		/*
		* SiI8620 Linux Driver
		*
		* Copyright (C) 2013-2014 Silicon Image, Inc.
		* Copyright (C) 2013-2015 Silicon Image, Inc.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License as
		@@ -1564,7 +1564,7 @@ static int si_8620_parse_dt(struct device *dev)
		* Need this for I/O expander in case we're using SPI as
		* the register I/O.
		*/
		if (!of_property_read_u32(np, "sil,i2c_port#", &value))
		if (!of_property_read_u32(np, "sil,i2c-port", &value))
		i2c_adapter_num = value;

		MHL_TX_DBG_INFO("Resources assigned to driver...\n");