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

Commit 2d2da6b7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: mhl3: update sil vendor prefix to correct value"

parents 46ff9a21 434a5bcb

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

+9 −9
Original line number Diff line number Diff line 
* Silicon Image-8620 MHL Tx



Required properties:

- compatible: must be "simg,sii-8620"

- compatible: must be "sil,sii-8620"

- reg: i2c slave address

- simg,reset-gpio: MHL reset gpio going into sii8620 for toggling reset pin

- simg,irq-gpio: MHL interrupt gpio coming out of sii8620

- simg,i2c_port#: Port number of i2c device

- 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



Example:

	i2c@f9923000 {

		simg,sii-8620@72 {

			compatible = "simg,sii-8620";

		sil,sii-8620@72 {

			compatible = "sil,sii-8620";

			reg = <0x72>;

			simg,reset-gpio = <&msm_gpio 58 0>;

			simg,irq-gpio = <&msm_gpio 57 0>;

			simg,i2c_port# = <1>;

			sil,reset-gpio = <&msm_gpio 58 0>;

			sil,irq-gpio = <&msm_gpio 57 0>;

			sil,i2c_port# = <1>;

		};

	};

drivers/video/msm/mdss/mhl3/platform.c

+4 −4
Original line number Diff line number Diff line
@@ -1413,11 +1413,11 @@ static int si_8620_parse_dt(struct device *dev) 
	struct device_node *np = dev->of_node;

	int value;



	value = of_get_named_gpio_flags(np, "simg,reset-gpio", 0, NULL);

	value = of_get_named_gpio_flags(np, "sil,reset-gpio", 0, NULL);

	if (value >= 0)

		starter_kit_control_gpios[MHL_RESET_INDEX].gpio = value;



	value = of_get_named_gpio_flags(np, "simg,irq-gpio", 0, NULL);

	value = of_get_named_gpio_flags(np, "sil,irq-gpio", 0, NULL);

	if (value >= 0)

		starter_kit_control_gpios[MHL_INT_INDEX].gpio = value;
@@ -1425,7 +1425,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, "simg,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");
@@ -1660,7 +1660,7 @@ static const struct dev_pm_ops si_8620_tx_pm_ops = { 
#ifdef SIMG_USE_DTS

static struct of_device_id si_8620_of_match_table[] = {

	{

		.compatible = "simg,sii-8620",

		.compatible = "sil,sii-8620",

	},

	{}

};