Skip to contentSkip to conversation

drm/bridge: sii902x: Enable I/O and core VCC supplies if present

PATCH Superseded Alexandru Gagniuc 5 participants 20 messages Sep 24, 2020 – Nov 8, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/bridge: sii902x: Enable I/O and core VCC supplies if present

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

---
 drivers/gpu/drm/bridge/sii902x.c | 54 ++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/sii902x.c +48 -6
index 33fd33f953ec..a5558d83e4c5 100644
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/clk.h>
 
 #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
 	struct drm_connector connector;
 	struct gpio_desc *reset_gpio;
 	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
 	/*
 	 * Mutex protects audio and video functions from interfering
 	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
 		 | DRM_BUS_FLAG_DE_HIGH,
 };
 
+static int sii902x_init(struct sii902x *sii902x);
+
 static int sii902x_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct device *dev = &client->dev;
-	unsigned int status = 0;
 	struct sii902x *sii902x;
-	u8 chipid[4];
 	int ret;
 
 	ret = i2c_check_functionality(client->adapter,
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
 
 	mutex_init(&sii902x->mutex);
 
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err(dev, "Failed to enable iovcc supply: %d\n", ret);
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err(dev, "Failed to enable cvcc12 supply: %d\n", ret);
+		regulator_disable(sii902x->iovcc);
+		return PTR_ERR(sii902x->cvcc12);
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
 	sii902x_reset(sii902x);
 
 	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
 	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
 	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
 		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
 			     SII902X_HOTPLUG_EVENT);
 
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
 						sii902x_interrupt,
 						IRQF_ONESHOT, dev_name(dev),
 						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
 
 	sii902x_audio_codec_init(sii902x, dev);
 
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
 
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
 					1, 0, I2C_MUX_GATE,
 					sii902x_i2c_bypass_select,
 					sii902x_i2c_bypass_deselect);
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
 
 	i2c_mux_del_adapters(sii902x->i2cmux);
 	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
+	regulator_disable(sii902x->iovcc);
 
 	return 0;
 }
Signature · 1 line
2.25.4
#1 lore raw

PATCH 2/2 dt-bindings: display: sii902x: Add supply bindings

The sii902x chip family requires IO and core voltages to reach the correct voltage before chip initialization. Add binding for describing the two supplies.

---
 Documentation/devicetree/bindings/display/bridge/sii902x.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/display/bridge/sii902x.txt +4 -0
index 0d1db3f9da84..02c21b584741 100644
@@ -8,6 +8,8 @@ Optional properties:
 	- interrupts: describe the interrupt line used to inform the host
 	  about hotplug events.
 	- reset-gpios: OF device-tree gpio specification for RST_N pin.
+	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)
+	- cvcc12-supply: Digital Core Supply Voltage (1.2V)
 
 	HDMI audio properties:
 	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example:
 		compatible = "sil,sii9022";
 		reg = <0x39>;
 		reset-gpios = <&pioA 1 0>;
+		iovcc-supply = <&v3v3_hdmi>;
+		cvcc12-supply = <&v1v2_hdmi>;
 
 		#sound-dai-cells = <0>;
 		sil,i2s-data-lanes = < 0 1 2 >;
Signature · 1 line
2.25.4
#2 lore raw

Re: [PATCH 2/2] dt-bindings: display: sii902x: Add supply bindings

Hi Alexandru

Quoted 5 lines · Alexandru Gagniuc

The sii902x chip family requires IO and core voltages to reach the correct voltage before chip initialization. Add binding for describing the two supplies.

It is not mandatory but encouraged to convert a binding to DT schema format before updating it. This is in order to reach a point in time where all bindings are in DT Schema format thus allowing much better verification of the DT files.

Sam

Quoted 33 lines
---
 Documentation/devicetree/bindings/display/bridge/sii902x.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/display/bridge/sii902x.txt +4 -0
index 0d1db3f9da84..02c21b584741 100644
@@ -8,6 +8,8 @@ Optional properties:
 	- interrupts: describe the interrupt line used to inform the host
 	  about hotplug events.
 	- reset-gpios: OF device-tree gpio specification for RST_N pin.
+	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)
+	- cvcc12-supply: Digital Core Supply Voltage (1.2V)
 
 	HDMI audio properties:
 	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example:
 		compatible = "sil,sii9022";
 		reg = <0x39>;
 		reset-gpios = <&pioA 1 0>;
+		iovcc-supply = <&v3v3_hdmi>;
+		cvcc12-supply = <&v1v2_hdmi>;
 
 		#sound-dai-cells = <0>;
 		sil,i2s-data-lanes = < 0 1 2 >;
Signature · 6 lines
2.25.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw
In reply to Alexandru Gagniuc

Hi Alexandre,

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1013

Quoted 5 lines · Alexandru Gagniuc
drivers/gpu/drm/bridge/sii902x.c +5 -0
+       ret = regulator_enable(sii902x->cvcc12);
+       if (ret < 0) {
+               dev_err(dev, "Failed to enable cvcc12 supply: %d\n", ret);
+               regulator_disable(sii902x->iovcc);
+               return PTR_ERR(sii902x->cvcc12);

return ret;

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1055

Quoted 8 lines
        ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
drivers/gpu/drm/bridge/sii902x.c +1 -1
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
        regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
        regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-       if (client->irq > 0) {
+       if (sii902x->i2c->irq > 0) {

Unrelated change.

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1059

Quoted 5 lines
drivers/gpu/drm/bridge/sii902x.c +1 -1
                regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
                             SII902X_HOTPLUG_EVENT);
 
-               ret = devm_request_threaded_irq(dev, client->irq, NULL,
+               ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,

Unrelated change.

                                                 sii902x_interrupt,

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1074

Quoted 8 lines
drivers/gpu/drm/bridge/sii902x.c +1 -1
                                                IRQF_ONESHOT, dev_name(dev),
                                                sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
 
        sii902x_audio_codec_init(sii902x, dev);
 
-       i2c_set_clientdata(client, sii902x);
+       i2c_set_clientdata(sii902x->i2c, sii902x);

Unrelated change.

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1076

Quoted 2 lines
drivers/gpu/drm/bridge/sii902x.c +1 -1
-       sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+       sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,

Unrelated change.

author
#4 lore raw

On 9/24/20 3:22 PM, Fabio Estevam wrote:
Hi Fabio,

Quoted 9 lines · Alexandru Gagniuc

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1013

Quoted 6 lines
drivers/gpu/drm/bridge/sii902x.c +5 -0
+       ret = regulator_enable(sii902x->cvcc12);
+       if (ret < 0) {
+               dev_err(dev, "Failed to enable cvcc12 supply: %d\n", ret);
+               regulator_disable(sii902x->iovcc);
+               return PTR_ERR(sii902x->cvcc12);

return ret;

Thank you for catching that. I will fix it in v2.

Quoted 10 lines

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1055

Quoted 8 lines
         ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
drivers/gpu/drm/bridge/sii902x.c +1 -1
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
         regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
         regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-       if (client->irq > 0) {
+       if (sii902x->i2c->irq > 0) {

Unrelated change.

[snip]

Quoted 1 line

Unrelated change.

[snip]

Quoted 1 line

Unrelated change.

[snip]

Quoted 1 line

Unrelated change.

The i2c initialization is moved into a separate function. Hence 'client' is no longer available. Instead, it can be accessed via 'sii902x->i2c'.

Alex

#5 lore raw
In reply to Alexandru Gagniuc

Hi Alexandru,

url:    https://github.com/0day-ci/linux/commits/Alexandru-Gagniuc/drm-bridge-sii902x-Enable-I-O-and-core-VCC-supplies-if-present/20200925-041504
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-m001-20200925 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0

If you fix the issue, kindly add following tag as appropriate

smatch warnings:
drivers/gpu/drm/bridge/sii902x.c:1013 sii902x_probe() warn: passing zero to 'PTR_ERR'

vim +/PTR_ERR +1013 drivers/gpu/drm/bridge/sii902x.c

6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24   999  	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1000  	if (IS_ERR(sii902x->cvcc12))
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1001  		return PTR_ERR(sii902x->cvcc12);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1002  
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1003  	ret = regulator_enable(sii902x->iovcc);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1004  	if (ret < 0) {
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1005  		dev_err(dev, "Failed to enable iovcc supply: %d\n", ret);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1006  		return ret;
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1007  	}
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1008  
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1009  	ret = regulator_enable(sii902x->cvcc12);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1010  	if (ret < 0) {
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1011  		dev_err(dev, "Failed to enable cvcc12 supply: %d\n", ret);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1012  		regulator_disable(sii902x->iovcc);

6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24 @1013 return PTR_ERR(sii902x->cvcc12);

return ret;

6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1014  	}
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1015  
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1016  	ret = sii902x_init(sii902x);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1017  	if (ret < 0) {
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1018  		regulator_disable(sii902x->cvcc12);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1019  		regulator_disable(sii902x->iovcc);
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1020  	}
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1021  
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1022  	return ret;
6f6c7f7bbe3f177 Alexandru Gagniuc 2020-09-24  1023  }

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#6 lore raw
In reply to Alexandru Gagniuc

Hi Alexandru

Quoted 13 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

Quoted 5 lines

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

One nitpick here. The binding should be present in the tree before you start using it. So this patch should be applied after the binding.

One detail below - I think others have already commented on the rest.

Sam

Quoted 42 lines
---
 drivers/gpu/drm/bridge/sii902x.c | 54 ++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/sii902x.c +5 -2
index 33fd33f953ec..a5558d83e4c5 100644
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/clk.h>
 
 #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
 	struct drm_connector connector;
 	struct gpio_desc *reset_gpio;
 	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
 	/*
 	 * Mutex protects audio and video functions from interfering
 	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
 		 | DRM_BUS_FLAG_DE_HIGH,
 };
 
+static int sii902x_init(struct sii902x *sii902x);
+
 static int sii902x_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct device *dev = &client->dev;
-	unsigned int status = 0;
 	struct sii902x *sii902x;
-	u8 chipid[4];
 	int ret;
 
 	ret = i2c_check_functionality(client->adapter,

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 997

Quoted 6 lines
drivers/gpu/drm/bridge/sii902x.c +3 -0
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
 
 	mutex_init(&sii902x->mutex);
 
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);

Consider using dev_err_probe() here.

drivers/gpu/drm/bridge/sii902x.c static int sii902x_probe(struct i2c_client *client, · line 1001

Quoted 4 lines
drivers/gpu/drm/bridge/sii902x.c +4 -0
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);

Consider using dev_err_probe() here.

Quoted 75 lines
drivers/gpu/drm/bridge/sii902x.c +36 -4
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err(dev, "Failed to enable iovcc supply: %d\n", ret);
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err(dev, "Failed to enable cvcc12 supply: %d\n", ret);
+		regulator_disable(sii902x->iovcc);
+		return PTR_ERR(sii902x->cvcc12);
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
 	sii902x_reset(sii902x);
 
 	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
 	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
 	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
 		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
 			     SII902X_HOTPLUG_EVENT);
 
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
 						sii902x_interrupt,
 						IRQF_ONESHOT, dev_name(dev),
 						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
 
 	sii902x_audio_codec_init(sii902x, dev);
 
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
 
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
 					1, 0, I2C_MUX_GATE,
 					sii902x_i2c_bypass_select,
 					sii902x_i2c_bypass_deselect);
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
 
 	i2c_mux_del_adapters(sii902x->i2cmux);
 	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
+	regulator_disable(sii902x->iovcc);
 
 	return 0;
 }
Signature · 6 lines
2.25.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#7 lore raw
Quoted 16 lines · Sam Ravnborg

Hi Alexandru

Quoted 13 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

Quoted 8 lines
Quoted 5 lines

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

One nitpick here. The binding should be present in the tree before you start using it. So this patch should be applied after the binding.

It is :)
* arch/arm/boot/dts/stm32mp15xx-dkx.dtsi

Alex

Quoted 1 line

One detail below - I think others have already commented on the rest.

[snip]

#8 lore raw

Hi Alex.

Quoted 21 lines · Alex G.
Quoted 20 lines · Sam Ravnborg

Hi Alexandru

Quoted 17 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

One nitpick here. The binding should be present in the tree before you start using it. So this patch should be applied after the binding.

It is :)
* arch/arm/boot/dts/stm32mp15xx-dkx.dtsi

This is the device tree. So essentially there is part of the device tree that is not yet documented - so in a perfect world all parts of the device tree is documented in bindings (Documentation/devicetree/bindings/* ) before the device tree is committed.

Sam

#9 lore raw

PATCH v2 1/2 drm/bridge: sii902x: Enable I/O and core VCC supplies if present

In reply to Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

---
Changes since v1:
* Fix return code after regulator_enable(sii902x->iovcc) fails (Fabio Estevam)
* Use dev_err_probe() instead of dev_err() where appropriate (Sam Ravnborg)

 drivers/gpu/drm/bridge/sii902x.c | 54 ++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/sii902x.c +48 -6
index 33fd33f953ec..d15e9f2c0d8a 100644
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/clk.h>
 
 #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
 	struct drm_connector connector;
 	struct gpio_desc *reset_gpio;
 	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
 	/*
 	 * Mutex protects audio and video functions from interfering
 	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
 		 | DRM_BUS_FLAG_DE_HIGH,
 };
 
+static int sii902x_init(struct sii902x *sii902x);
+
 static int sii902x_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct device *dev = &client->dev;
-	unsigned int status = 0;
 	struct sii902x *sii902x;
-	u8 chipid[4];
 	int ret;
 
 	ret = i2c_check_functionality(client->adapter,
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
 
 	mutex_init(&sii902x->mutex);
 
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable iovcc supply");
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable cvcc12 supply");
+		regulator_disable(sii902x->iovcc);
+		return ret;
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
 	sii902x_reset(sii902x);
 
 	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
 	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
 	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
 		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
 			     SII902X_HOTPLUG_EVENT);
 
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
 						sii902x_interrupt,
 						IRQF_ONESHOT, dev_name(dev),
 						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
 
 	sii902x_audio_codec_init(sii902x, dev);
 
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
 
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
 					1, 0, I2C_MUX_GATE,
 					sii902x_i2c_bypass_select,
 					sii902x_i2c_bypass_deselect);
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
 
 	i2c_mux_del_adapters(sii902x->i2cmux);
 	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
+	regulator_disable(sii902x->iovcc);
 
 	return 0;
 }
Signature · 1 line
2.25.4
#10 lore raw

PATCH v2 2/2 dt-bindings: display: sii902x: Add supply bindings

The sii902x chip family requires IO and core voltages to reach the correct voltage before chip initialization. Add binding for describing the two supplies.

---
Changes since v1:
* Nothing. version incremented to stay in sync with sii902x regulator patch

 Documentation/devicetree/bindings/display/bridge/sii902x.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/display/bridge/sii902x.txt +4 -0
index 0d1db3f9da84..02c21b584741 100644
@@ -8,6 +8,8 @@ Optional properties:
 	- interrupts: describe the interrupt line used to inform the host
 	  about hotplug events.
 	- reset-gpios: OF device-tree gpio specification for RST_N pin.
+	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)
+	- cvcc12-supply: Digital Core Supply Voltage (1.2V)
 
 	HDMI audio properties:
 	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example:
 		compatible = "sil,sii9022";
 		reg = <0x39>;
 		reset-gpios = <&pioA 1 0>;
+		iovcc-supply = <&v3v3_hdmi>;
+		cvcc12-supply = <&v1v2_hdmi>;
 
 		#sound-dai-cells = <0>;
 		sil,i2s-data-lanes = < 0 1 2 >;
Signature · 1 line
2.25.4
maintainer Acked-by on v2 2/2
#11 lore raw

Re: [PATCH v2 2/2] dt-bindings: display: sii902x: Add supply bindings

Quoted 4 lines · Alexandru Gagniuc

The sii902x chip family requires IO and core voltages to reach the correct voltage before chip initialization. Add binding for describing the two supplies.

Quoted 8 lines

---
Changes since v1:
* Nothing. version incremented to stay in sync with sii902x regulator patch

 Documentation/devicetree/bindings/display/bridge/sii902x.txt | 4 ++++
 1 file changed, 4 insertions(+)
author
#12 lore raw
In reply to Alexandru Gagniuc
Quoted 17 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

Quoted 8 lines

---
Changes since v1:
* Fix return code after regulator_enable(sii902x->iovcc) fails (Fabio Estevam)
* Use dev_err_probe() instead of dev_err() where appropriate (Sam Ravnborg)

  drivers/gpu/drm/bridge/sii902x.c | 54 ++++++++++++++++++++++++++++----
  1 file changed, 48 insertions(+), 6 deletions(-)

This patch seems to have entered fall dormancy. Did I miss somebody in the CC field?

Alex

Quoted 117 lines
drivers/gpu/drm/bridge/sii902x.c +48 -6
index 33fd33f953ec..d15e9f2c0d8a 100644
@@ -17,6 +17,7 @@
  #include <linux/i2c.h>
  #include <linux/module.h>
  #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
  #include <linux/clk.h>
 
  #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
  	struct drm_connector connector;
  	struct gpio_desc *reset_gpio;
  	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
  	/*
  	 * Mutex protects audio and video functions from interfering
  	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
  		 | DRM_BUS_FLAG_DE_HIGH,
  };
 
+static int sii902x_init(struct sii902x *sii902x);
+
  static int sii902x_probe(struct i2c_client *client,
  			 const struct i2c_device_id *id)
  {
  	struct device *dev = &client->dev;
-	unsigned int status = 0;
  	struct sii902x *sii902x;
-	u8 chipid[4];
  	int ret;
 
  	ret = i2c_check_functionality(client->adapter,
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
 
  	mutex_init(&sii902x->mutex);
 
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable iovcc supply");
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable cvcc12 supply");
+		regulator_disable(sii902x->iovcc);
+		return ret;
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
  	sii902x_reset(sii902x);
 
  	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
  	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
  	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
  		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
  			     SII902X_HOTPLUG_EVENT);
 
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
  						sii902x_interrupt,
  						IRQF_ONESHOT, dev_name(dev),
  						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
 
  	sii902x_audio_codec_init(sii902x, dev);
 
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
 
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
  					1, 0, I2C_MUX_GATE,
  					sii902x_i2c_bypass_select,
  					sii902x_i2c_bypass_deselect);
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
 
  	i2c_mux_del_adapters(sii902x->i2cmux);
  	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
+	regulator_disable(sii902x->iovcc);
 
  	return 0;
  }
#13 lore raw

Hi Alex.

Quoted 24 lines · Alex G.
Quoted 23 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

---
Changes since v1:
* Fix return code after regulator_enable(sii902x->iovcc) fails (Fabio Estevam)
* Use dev_err_probe() instead of dev_err() where appropriate (Sam Ravnborg)

Quoted 5 lines
Quoted 2 lines
  drivers/gpu/drm/bridge/sii902x.c | 54 ++++++++++++++++++++++++++++----
  1 file changed, 48 insertions(+), 6 deletions(-)

This patch seems to have entered fall dormancy. Did I miss somebody in the CC field?

I have lost the original mail/patch.
Can you resend with one fix - see below.

Sam

Quoted 20 lines

Alex

Quoted 16 lines
drivers/gpu/drm/bridge/sii902x.c +2 -0
index 33fd33f953ec..d15e9f2c0d8a 100644
@@ -17,6 +17,7 @@
  #include <linux/i2c.h>
  #include <linux/module.h>
  #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
  #include <linux/clk.h>
  #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
  	struct drm_connector connector;
  	struct gpio_desc *reset_gpio;
  	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
Quoted 8 lines

drivers/gpu/drm/bridge/sii902x.c static const struct drm_bridge_timings default_sii902x_timings = { · line 959

Quoted 8 lines
drivers/gpu/drm/bridge/sii902x.c +2 -0
+	struct regulator *cvcc12;
  	/*
  	 * Mutex protects audio and video functions from interfering
  	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
  		 | DRM_BUS_FLAG_DE_HIGH,
  };
+static int sii902x_init(struct sii902x *sii902x);

Please re-arrange the code so this prototype is not needed.

Quoted 76 lines
Quoted 76 lines
drivers/gpu/drm/bridge/sii902x.c +43 -6
+
  static int sii902x_probe(struct i2c_client *client,
  			 const struct i2c_device_id *id)
  {
  	struct device *dev = &client->dev;
-	unsigned int status = 0;
  	struct sii902x *sii902x;
-	u8 chipid[4];
  	int ret;
  	ret = i2c_check_functionality(client->adapter,
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
  	mutex_init(&sii902x->mutex);
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable iovcc supply");
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable cvcc12 supply");
+		regulator_disable(sii902x->iovcc);
+		return ret;
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
  	sii902x_reset(sii902x);
  	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
  	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
  	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
  		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
  			     SII902X_HOTPLUG_EVENT);
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
  						sii902x_interrupt,
  						IRQF_ONESHOT, dev_name(dev),
  						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
  	sii902x_audio_codec_init(sii902x, dev);
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
  					1, 0, I2C_MUX_GATE,
  					sii902x_i2c_bypass_select,
  					sii902x_i2c_bypass_deselect);
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
  	i2c_mux_del_adapters(sii902x->i2cmux);
  	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
Quoted 8 lines

drivers/gpu/drm/bridge/sii902x.c static int sii902x_remove(struct i2c_client *client)

Quoted 4 lines
drivers/gpu/drm/bridge/sii902x.c +1 -0
+	regulator_disable(sii902x->iovcc);
  	return 0;
  }
 

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#14 lore raw
Quoted 1 line · Sam Ravnborg

Hi Alex.

[snip]

Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/bridge/sii902x.c +3 -0
index 33fd33f953ec..d15e9f2c0d8a 100644
@@ -17,6 +17,7 @@
   #include <linux/i2c.h>
   #include <linux/module.h>
   #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
   #include <linux/clk.h>
   #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
   	struct drm_connector connector;
   	struct gpio_desc *reset_gpio;
   	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
Quoted 8 lines
Quoted 7 lines

drivers/gpu/drm/bridge/sii902x.c static const struct drm_bridge_timings default_sii902x_timings = { · line 959

Quoted 7 lines
drivers/gpu/drm/bridge/sii902x.c +1 -0
   	/*
   	 * Mutex protects audio and video functions from interfering
   	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
   		 | DRM_BUS_FLAG_DE_HIGH,
   };
+static int sii902x_init(struct sii902x *sii902x);

Please re-arrange the code so this prototype is not needed.

I'd be happy to re-arrange things. It will make the diff look a lot bigger than what it is. Is that okay?

Alex

Quoted 84 lines
Quoted 84 lines
Quoted 73 lines
drivers/gpu/drm/bridge/sii902x.c +42 -6
+
   static int sii902x_probe(struct i2c_client *client,
   			 const struct i2c_device_id *id)
   {
   	struct device *dev = &client->dev;
-	unsigned int status = 0;
   	struct sii902x *sii902x;
-	u8 chipid[4];
   	int ret;
   	ret = i2c_check_functionality(client->adapter,
@@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
   	mutex_init(&sii902x->mutex);
+	sii902x->iovcc = devm_regulator_get(dev, "iovcc");
+	if (IS_ERR(sii902x->iovcc))
+		return PTR_ERR(sii902x->iovcc);
+
+	sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
+	if (IS_ERR(sii902x->cvcc12))
+		return PTR_ERR(sii902x->cvcc12);
+
+	ret = regulator_enable(sii902x->iovcc);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable iovcc supply");
+		return ret;
+	}
+
+	ret = regulator_enable(sii902x->cvcc12);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable cvcc12 supply");
+		regulator_disable(sii902x->iovcc);
+		return ret;
+	}
+
+	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_disable(sii902x->cvcc12);
+		regulator_disable(sii902x->iovcc);
+	}
+
+	return ret;
+}
+
+static int sii902x_init(struct sii902x *sii902x)
+{
+	struct device *dev = &sii902x->i2c->dev;
+	unsigned int status = 0;
+	u8 chipid[4];
+	int ret;
+
   	sii902x_reset(sii902x);
   	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
   	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
   	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
   		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
   			     SII902X_HOTPLUG_EVENT);
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
   						sii902x_interrupt,
   						IRQF_ONESHOT, dev_name(dev),
   						sii902x);
@@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
   	sii902x_audio_codec_init(sii902x, dev);
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
   					1, 0, I2C_MUX_GATE,
   					sii902x_i2c_bypass_select,
   					sii902x_i2c_bypass_deselect);

drivers/gpu/drm/bridge/sii902x.c static int sii902x_remove(struct i2c_client *client) · line 1097

Quoted 7 lines
drivers/gpu/drm/bridge/sii902x.c +2 -0
@@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
   	i2c_mux_del_adapters(sii902x->i2cmux);
   	drm_bridge_remove(&sii902x->bridge);
+	regulator_disable(sii902x->cvcc12);
+	regulator_disable(sii902x->iovcc);
   	return 0;
   }
 

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#15 lore raw

Hi Alex.

Quoted 35 lines · Alex G.
Quoted 1 line · Sam Ravnborg

Hi Alex.

[snip]

Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/bridge/sii902x.c +3 -0
index 33fd33f953ec..d15e9f2c0d8a 100644
@@ -17,6 +17,7 @@
   #include <linux/i2c.h>
   #include <linux/module.h>
   #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
   #include <linux/clk.h>
   #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,8 @@ struct sii902x {
   	struct drm_connector connector;
   	struct gpio_desc *reset_gpio;
   	struct i2c_mux_core *i2cmux;
+	struct regulator *iovcc;
+	struct regulator *cvcc12;
Quoted 8 lines
Quoted 7 lines

drivers/gpu/drm/bridge/sii902x.c static const struct drm_bridge_timings default_sii902x_timings = { · line 959

Quoted 7 lines
drivers/gpu/drm/bridge/sii902x.c +1 -0
   	/*
   	 * Mutex protects audio and video functions from interfering
   	 * each other, by keeping their i2c command sequences atomic.
@@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
   		 | DRM_BUS_FLAG_DE_HIGH,
   };
+static int sii902x_init(struct sii902x *sii902x);

Please re-arrange the code so this prototype is not needed.

Quoted 2 lines

I'd be happy to re-arrange things. It will make the diff look a lot bigger than what it is. Is that okay?

The best way would be to split it in two patches.
One that is pure code movement and one that does the actula changes.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#16 lore raw

PATCH v3 1/3 drm/bridge: sii902x: Refactor init code into separate function

In reply to Alexandru Gagniuc

Separate the hardware initialization code from setting up the data structures and parsing the device tree. The purpose of this change is to provide a single exit point and avoid a waterfall of 'goto's in the subsequent patch.

---
Changes since v1/and v2:
* Separated this from main patch to better show diff

 drivers/gpu/drm/bridge/sii902x.c | 77 ++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 34 deletions(-)
drivers/gpu/drm/bridge/sii902x.c +43 -34
index 33fd33f953ec..f78c17f49887 100644
@@ -954,41 +954,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
 		 | DRM_BUS_FLAG_DE_HIGH,
 };
 
-static int sii902x_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int sii902x_init(struct sii902x *sii902x)
 {
-	struct device *dev = &client->dev;
+	struct device *dev = &sii902x->i2c->dev;
 	unsigned int status = 0;
-	struct sii902x *sii902x;
 	u8 chipid[4];
 	int ret;
 
-	ret = i2c_check_functionality(client->adapter,
-				      I2C_FUNC_SMBUS_BYTE_DATA);
-	if (!ret) {
-		dev_err(dev, "I2C adapter not suitable\n");
-		return -EIO;
-	}
-
-	sii902x = devm_kzalloc(dev, sizeof(*sii902x), GFP_KERNEL);
-	if (!sii902x)
-		return -ENOMEM;
-
-	sii902x->i2c = client;
-	sii902x->regmap = devm_regmap_init_i2c(client, &sii902x_regmap_config);
-	if (IS_ERR(sii902x->regmap))
-		return PTR_ERR(sii902x->regmap);
-
-	sii902x->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-						      GPIOD_OUT_LOW);
-	if (IS_ERR(sii902x->reset_gpio)) {
-		dev_err(dev, "Failed to retrieve/request reset gpio: %ld\n",
-			PTR_ERR(sii902x->reset_gpio));
-		return PTR_ERR(sii902x->reset_gpio);
-	}
-
-	mutex_init(&sii902x->mutex);
-
 	sii902x_reset(sii902x);
 
 	ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
@@ -1012,11 +984,11 @@ static int sii902x_probe(struct i2c_client *client,
 	regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
 	regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
 
-	if (client->irq > 0) {
+	if (sii902x->i2c->irq > 0) {
 		regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
 			     SII902X_HOTPLUG_EVENT);
 
-		ret = devm_request_threaded_irq(dev, client->irq, NULL,
+		ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
 						sii902x_interrupt,
 						IRQF_ONESHOT, dev_name(dev),
 						sii902x);
@@ -1031,9 +1003,9 @@ static int sii902x_probe(struct i2c_client *client,
 
 	sii902x_audio_codec_init(sii902x, dev);
 
-	i2c_set_clientdata(client, sii902x);
+	i2c_set_clientdata(sii902x->i2c, sii902x);
 
-	sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
 					1, 0, I2C_MUX_GATE,
 					sii902x_i2c_bypass_select,
 					sii902x_i2c_bypass_deselect);
@@ -1044,6 +1016,43 @@ static int sii902x_probe(struct i2c_client *client,
 	return i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);
 }
 
+static int sii902x_probe(struct i2c_client *client,
+			 const struct i2c_device_id *id)
+{
+	struct device *dev = &client->dev;
+	struct sii902x *sii902x;
+	int ret;
+
+	ret = i2c_check_functionality(client->adapter,
+				      I2C_FUNC_SMBUS_BYTE_DATA);
+	if (!ret) {
+		dev_err(dev, "I2C adapter not suitable\n");
+		return -EIO;
+	}
+
+	sii902x = devm_kzalloc(dev, sizeof(*sii902x), GFP_KERNEL);
+	if (!sii902x)
+		return -ENOMEM;
+
+	sii902x->i2c = client;
+	sii902x->regmap = devm_regmap_init_i2c(client, &sii902x_regmap_config);
+	if (IS_ERR(sii902x->regmap))
+		return PTR_ERR(sii902x->regmap);
+
+	sii902x->reset_gpio = devm_gpiod_get_optional(dev, "reset",
+						      GPIOD_OUT_LOW);
+	if (IS_ERR(sii902x->reset_gpio)) {
+		dev_err(dev, "Failed to retrieve/request reset gpio: %ld\n",
+			PTR_ERR(sii902x->reset_gpio));
+		return PTR_ERR(sii902x->reset_gpio);
+	}
+
+	mutex_init(&sii902x->mutex);
+
+	ret = sii902x_init(sii902x);
+	return ret;
+}
+
 static int sii902x_remove(struct i2c_client *client)
 
 {
Signature · 1 line
2.26.2
#17 lore raw

PATCH v3 2/3 drm/bridge: sii902x: Enable I/O and core VCC supplies if present

In reply to Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

---
Changes since v1:
* Fix return code after regulator_enable(sii902x->iovcc) fails (Fabio Estevam)
* Use dev_err_probe() instead of dev_err() where appropriate (Sam Ravnborg)

Changes since v2:
* Eliminate prototype for static functionn sii902x_init (Sam Ravnborg)
* Bundled supplies under regulator_bulk_get/enable/disable()

 drivers/gpu/drm/bridge/sii902x.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
drivers/gpu/drm/bridge/sii902x.c +23 -0
index f78c17f49887..5bab51a6b55c 100644
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/clk.h>
 
 #include <drm/drm_atomic_helper.h>
@@ -168,6 +169,7 @@ struct sii902x {
 	struct drm_connector connector;
 	struct gpio_desc *reset_gpio;
 	struct i2c_mux_core *i2cmux;
+	struct regulator_bulk_data supplies[2];
 	/*
 	 * Mutex protects audio and video functions from interfering
 	 * each other, by keeping their i2c command sequences atomic.
@@ -1049,7 +1051,26 @@ static int sii902x_probe(struct i2c_client *client,
 
 	mutex_init(&sii902x->mutex);
 
+	sii902x->supplies[0].supply = "iovcc";
+	sii902x->supplies[1].supply = "cvcc12";
+	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies),
+				      sii902x->supplies);
+	if (ret < 0)
+		return ret;
+
+	ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies),
+				    sii902x->supplies);
+	if (ret < 0) {
+		dev_err_probe(dev, ret, "Failed to enable supplies");
+		return ret;
+	}
+
 	ret = sii902x_init(sii902x);
+	if (ret < 0) {
+		regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies),
+					sii902x->supplies);
+	}
+
 	return ret;
 }
 
@@ -1060,6 +1081,8 @@ static int sii902x_remove(struct i2c_client *client)
 
 	i2c_mux_del_adapters(sii902x->i2cmux);
 	drm_bridge_remove(&sii902x->bridge);
+	regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies),
+				sii902x->supplies);
 
 	return 0;
 }
Signature · 1 line
2.26.2
Applied
#18 lore raw

Hi Alexandru

Quoted 13 lines · Alexandru Gagniuc

On the SII9022, the IOVCC and CVCC12 supplies must reach the correct voltage before the reset sequence is initiated. On most boards, this assumption is true at boot-up, so initialization succeeds.

However, when we try to initialize the chip with incorrect supply voltages, it will not respond to I2C requests. sii902x_probe() fails with -ENXIO.

To resolve this, look for the "iovcc" and "cvcc12" regulators, and make sure they are enabled before starting the reset sequence. If these supplies are not available in devicetree, then they will default to dummy-regulator. In that case everything will work like before.

Quoted 5 lines

This was observed on a STM32MP157C-DK2 booting in u-boot falcon mode. On this board, the supplies would be set by the second stage bootloader, which does not run in falcon mode.

Thanks, applied series to drm-misc-next. I fixed two checkpatch --strict warnings while applying.

Sam

#19 lore raw

PATCH v3 3/3 dt-bindings: display: sii902x: Add supply bindings

In reply to Alexandru Gagniuc

The sii902x chip family requires IO and core voltages to reach the correct voltage before chip initialization. Add binding for describing the two supplies.

---
Changes since v1, v2:
* Nothing. version incremented to stay in sync with sii902x regulator patch
* Added Rob's acked-by line

 Documentation/devicetree/bindings/display/bridge/sii902x.txt | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/display/bridge/sii902x.txt +4 -0
index 0d1db3f9da84..02c21b584741 100644
@@ -8,6 +8,8 @@ Optional properties:
 	- interrupts: describe the interrupt line used to inform the host
 	  about hotplug events.
 	- reset-gpios: OF device-tree gpio specification for RST_N pin.
+	- iovcc-supply: I/O Supply Voltage (1.8V or 3.3V)
+	- cvcc12-supply: Digital Core Supply Voltage (1.2V)
 
 	HDMI audio properties:
 	- #sound-dai-cells: <0> or <1>. <0> if only i2s or spdif pin
@@ -54,6 +56,8 @@ Example:
 		compatible = "sil,sii9022";
 		reg = <0x39>;
 		reset-gpios = <&pioA 1 0>;
+		iovcc-supply = <&v3v3_hdmi>;
+		cvcc12-supply = <&v1v2_hdmi>;
 
 		#sound-dai-cells = <0>;
 		sil,i2s-data-lanes = < 0 1 2 >;
Signature · 1 line
2.26.2