drm/panel: jh057n0090: Add regulators and drop magic value in init
Subsystems (4)
cover drm/panel: jh057n0090: Add regulators and drop magic value in init
Fix the omission of regulators for the recently added panel and make sure all dsi commands start with a command instead of one having a magic constant (which already caused confusion).
Also adds a mail alias to the panel's MAINTAINER entry to reduce the bus factor.
To: Thierry Reding <[email protected]>,Sam Ravnborg <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,Rob Herring <[email protected]>,Mark Rutland <[email protected]>,Mauro Carvalho Chehab <[email protected]>,"David S. Miller" <[email protected]>,Greg Kroah-Hartman <[email protected]>,Nicolas Ferre <[email protected]>,"Paul E. McKenney" <[email protected]>,[email protected],[email protected],[email protected],Purism Kernel Team <[email protected]>
Guido Günther (4):
MAINTAINERS: Add Purism mail alias as reviewer for their devkit's
panel
drm/panel: jh057n0090: Don't use magic constant
dt-bindings: display/panel: jh057n0090: Document power supply
properties
drm/panel: jh057n0090: Add regulator support
.../display/panel/rocktech,jh057n00900.txt | 5 +++++ MAINTAINERS | 1 + .../drm/panel/panel-rocktech-jh057n00900.c | 22 ++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
Signature · 1 line
2.20.1
PATCH 1/4 MAINTAINERS: Add Purism mail alias as reviewer for their devkit's panel
Add a mail alias as reviewer for the rocktech jh057n00900 panel driver.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -5133,6 +5133,7 @@ F: include/uapi/drm/r128_drm.h DRM DRIVER FOR ROCKTECH JH057N00900 PANELS M: Guido Günther <[email protected]> +R: Purism Kernel Team <[email protected]> S: Maintained F: drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c F: Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
Signature · 1 line
2.20.1
PATCH 2/4 drm/panel: jh057n0090: Don't use magic constant
In reply to Guido Günther0xBF isn't in any ST7703 data sheet so mark it as unknown. This avoids confusion on whether there is a missing command in that dsi_generic_write_seq() call.
--- drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +2 -1
@@ -33,6 +33,7 @@#define ST7703_CMD_SETEXTC 0xB9#define ST7703_CMD_SETMIPI 0xBA#define ST7703_CMD_SETVDC 0xBC +#define ST7703_CMD_UNKNOWN0 0xBF#define ST7703_CMD_SETSCR 0xC0#define ST7703_CMD_SETPOWER 0xC1#define ST7703_CMD_SETPANEL 0xCC
@@ -94,7 +95,7 @@ static int jh057n_init_sequence(struct jh057n *ctx)msleep (20 );dsi_generic_write_seq (dsi,ST7703_CMD_SETVCOM ,0x3F ,0x3F ); -dsi_generic_write_seq (dsi,0xBF ,0x02 ,0x11 ,0x00 ); +dsi_generic_write_seq (dsi,ST7703_CMD_UNKNOWN0 ,0x02 ,0x11 ,0x00 ); dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1, 0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12, 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/4] drm/panel: jh057n0090: Don't use magic constant
Quoted 5 lines · Guido Günther
0xBFisn't in any ST7703 data sheet so mark it as unknown. This avoids confusion on whether there is a missing command in thatdsi_generic_write_seq()call.Signed-off-by Guido Günther <[email protected]>
Quoted 27 lines
--- drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +2
-1@@ -33,6 +33,7 @@#define ST7703_CMD_SETEXTC 0xB9#define ST7703_CMD_SETMIPI 0xBA#define ST7703_CMD_SETVDC 0xBC +#define ST7703_CMD_UNKNOWN0 0xBF#define ST7703_CMD_SETSCR 0xC0#define ST7703_CMD_SETPOWER 0xC1#define ST7703_CMD_SETPANEL 0xCC@@ -94,7 +95,7 @@ static int jh057n_init_sequence(struct jh057n *ctx)msleep (20 );dsi_generic_write_seq (dsi,ST7703_CMD_SETVCOM ,0x3F ,0x3F ); -dsi_generic_write_seq (dsi,0xBF ,0x02 ,0x11 ,0x00 ); +dsi_generic_write_seq (dsi,ST7703_CMD_UNKNOWN0 ,0x02 ,0x11 ,0x00 ); dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1, 0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12, 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,Signature · 1 line
2.20.1
PATCH 3/4 dt-bindings: display/panel: jh057n0090: Document power supply properties
In reply to Guido GüntherDocument the vcc-supply and iovcc-supply propertes of the Rocktech jh057n0090 panel.
--- .../bindings/display/panel/rocktech,jh057n00900.txt | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt +5 -0
@@ -5,6 +5,9 @@ Required properties: - reg: DSI virtual channel of the peripheral - reset-gpios: panel reset gpio - backlight: phandle of the backlight device attached to the panel +- vcc-supply: phandle of the regulator that provides the vcc supply voltage. +- iovcc-supply: phandle of the regulator that provides the iovcc supply + voltage. Example:
@@ -14,5 +17,7 @@ Example: reg = <0>; backlight = <&backlight>; reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; + vcc-supply = <®_2v8_p>; + iovcc-supply = <®_1v8_p>; }; };
Signature · 1 line
2.20.1
Re: [PATCH 3/4] dt-bindings: display/panel: jh057n0090: Document power supply properties
Quoted 2 lines · Guido Günther
Document the vcc-supply and iovcc-supply propertes of the Rocktech jh057n0090 panel.
s/propertes/properties
s/jh057n0090/jh057n00900
With these fixed:
Quoted 30 lines
Signed-off-by Guido Günther <[email protected]>--- .../bindings/display/panel/rocktech,jh057n00900.txt | 5 +++++ 1 file changed, 5 insertions(+)Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt +5
-0@@ -5,6 +5,9 @@ Required properties: - reg: DSI virtual channel of the peripheral - reset-gpios: panel reset gpio - backlight: phandle of the backlight device attached to the panel +- vcc-supply: phandle of the regulator that provides the vcc supply voltage. +- iovcc-supply: phandle of the regulator that provides the iovcc supply + voltage. Example:@@ -14,5 +17,7 @@ Example: reg = <0>; backlight = <&backlight>; reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; + vcc-supply = <®_2v8_p>; + iovcc-supply = <®_1v8_p>; }; };Signature · 1 line
2.20.1
PATCH 4/4 drm/panel: jh057n0090: Add regulator support
In reply to Guido GüntherAllow to specify regulators for vcc and iovcc. According to the data sheet the panel wants vcc (2.8V) and iovcc (1.8V) and there's no startup dependency between the two.
--- .../drm/panel/panel-rocktech-jh057n00900.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +19 -0
@@ -15,6 +15,7 @@#include <linux/gpio/consumer.h> #include <linux/media-bus-format.h> #include <linux/module.h> +#include <linux/regulator/consumer.h> #include <video/display_timing.h> #include <video/mipi_display.h>
@@ -47,6 +48,8 @@ struct jh057n {struct drm_panel panel;struct gpio_desc *reset_gpio;struct backlight_device *backlight; +struct regulator *vcc; +struct regulator *iovcc;bool prepared;struct dentry *debugfs;
@@ -160,6 +163,8 @@ static int jh057n_unprepare(struct drm_panel *panel)return 0 ;mipi_dsi_dcs_set_display_off (dsi); +regulator_disable (ctx->iovcc); +regulator_disable (ctx->vcc); ctx->prepared = false;return 0 ;
@@ -174,6 +179,13 @@ static int jh057n_prepare(struct drm_panel *panel)return 0 ;DRM_DEV_DEBUG_DRIVER (ctx->dev,"Resetting the panel\n" ); + ret =regulator_enable (ctx->vcc); +if (ret <0 ) +return ret; + ret =regulator_enable (ctx->iovcc); +if (ret <0 ) +return ret; +gpiod_set_value_cansleep (ctx->reset_gpio,1 );usleep_range (20 ,40 );gpiod_set_value_cansleep (ctx->reset_gpio,0 );
@@ -301,6 +313,13 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)if (IS_ERR (ctx->backlight))return PTR_ERR (ctx->backlight); + ctx->vcc =devm_regulator_get (dev,"vcc" ); +if (IS_ERR (ctx->vcc)) +return PTR_ERR (ctx->vcc); + ctx->iovcc =devm_regulator_get (dev,"iovcc" ); +if (IS_ERR (ctx->iovcc)) +return PTR_ERR (ctx->iovcc); +drm_panel_init (&ctx->panel); ctx->panel.dev = dev; ctx->panel.funcs = &jh057n_drm_funcs;
Signature · 1 line
2.20.1
Re: [PATCH 4/4] drm/panel: jh057n0090: Add regulator support
Quoted 3 lines · Guido Günther
Allow to specify regulators for vcc and iovcc. According to the data sheet the panel wants vcc (2.8V) and iovcc (1.8V) and there's no startup dependency between the two.
s/jh057n0090/jh057n00900
Quoted 51 lines
Signed-off-by Guido Günther <[email protected]>--- .../drm/panel/panel-rocktech-jh057n00900.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +12
-0@@ -15,6 +15,7 @@#include <linux/gpio/consumer.h> #include <linux/media-bus-format.h> #include <linux/module.h> +#include <linux/regulator/consumer.h> #include <video/display_timing.h> #include <video/mipi_display.h> @@ -47,6 +48,8 @@ struct jh057n {struct drm_panel panel;struct gpio_desc *reset_gpio;struct backlight_device *backlight; +struct regulator *vcc; +struct regulator *iovcc;bool prepared;struct dentry *debugfs;@@ -160,6 +163,8 @@ static int jh057n_unprepare(struct drm_panel *panel)return 0 ;mipi_dsi_dcs_set_display_off (dsi); +regulator_disable (ctx->iovcc); +regulator_disable (ctx->vcc); ctx->prepared = false;return 0 ;@@ -174,6 +179,13 @@ static int jh057n_prepare(struct drm_panel *panel)return 0 ;DRM_DEV_DEBUG_DRIVER (ctx->dev,"Resetting the panel\n" ); + ret =regulator_enable (ctx->vcc); +if (ret <0 ) +return ret; + ret =regulator_enable (ctx->iovcc); +if (ret <0 ) +return ret; +gpiod_set_value_cansleep (ctx->reset_gpio,1 );usleep_range (20 ,40 );gpiod_set_value_cansleep (ctx->reset_gpio,0 );
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c static int jh057n_probe(struct mipi_dsi_device *dsi) · line 322
Quoted 10 lines
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +7
-0@@ -301,6 +313,13 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)if (IS_ERR (ctx->backlight))return PTR_ERR (ctx->backlight); + ctx->vcc =devm_regulator_get (dev,"vcc" ); +if (IS_ERR (ctx->vcc)) +return PTR_ERR (ctx->vcc); + ctx->iovcc =devm_regulator_get (dev,"iovcc" ); +if (IS_ERR (ctx->iovcc)) +return PTR_ERR (ctx->iovcc); +
Consider to write an error message.
The regulators are now mandatory, but they be missing in some device trees. So it would be good to help them to understand why it fails.
With this considered:
Sam
Re: [PATCH 4/4] drm/panel: jh057n0090: Add regulator support
Hi Sam,
Quoted 60 lines · Sam Ravnborg
Quoted 3 lines · Guido Günther
Allow to specify regulators for vcc and iovcc. According to the data sheet the panel wants vcc (2.8V) and iovcc (1.8V) and there's no startup dependency between the two.
s/jh057n0090/jh057n00900
Quoted 54 lines
Signed-off-by Guido Günther <[email protected]>--- .../drm/panel/panel-rocktech-jh057n00900.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +12
-0@@ -15,6 +15,7 @@#include <linux/gpio/consumer.h> #include <linux/media-bus-format.h> #include <linux/module.h> +#include <linux/regulator/consumer.h> #include <video/display_timing.h> #include <video/mipi_display.h> @@ -47,6 +48,8 @@ struct jh057n {struct drm_panel panel;struct gpio_desc *reset_gpio;struct backlight_device *backlight; +struct regulator *vcc; +struct regulator *iovcc;bool prepared;struct dentry *debugfs;@@ -160,6 +163,8 @@ static int jh057n_unprepare(struct drm_panel *panel)return 0 ;mipi_dsi_dcs_set_display_off (dsi); +regulator_disable (ctx->iovcc); +regulator_disable (ctx->vcc); ctx->prepared = false;return 0 ;@@ -174,6 +179,13 @@ static int jh057n_prepare(struct drm_panel *panel)return 0 ;DRM_DEV_DEBUG_DRIVER (ctx->dev,"Resetting the panel\n" ); + ret =regulator_enable (ctx->vcc); +if (ret <0 ) +return ret; + ret =regulator_enable (ctx->iovcc); +if (ret <0 ) +return ret; +gpiod_set_value_cansleep (ctx->reset_gpio,1 );usleep_range (20 ,40 );gpiod_set_value_cansleep (ctx->reset_gpio,0 );@@ -301,6 +313,13 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)if (IS_ERR (ctx->backlight))return PTR_ERR (ctx->backlight);
Quoted 10 lines
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c static int jh057n_probe(struct mipi_dsi_device *dsi) · line 322
Quoted 7 lines
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +7
-0+ ctx->vcc =devm_regulator_get (dev,"vcc" ); +if (IS_ERR (ctx->vcc)) +return PTR_ERR (ctx->vcc); + ctx->iovcc =devm_regulator_get (dev,"iovcc" ); +if (IS_ERR (ctx->iovcc)) +return PTR_ERR (ctx->iovcc); +Consider to write an error message.
The regulators are now mandatory, but they be missing in some device trees. So it would be good to help them to understand why it fails.
I've fixed this and your other comments in v2.
Quoted 3 lines
With this considered:
Reviewed-by Sam Ravnborg <[email protected]>
Thanks! I've not added this yet since I made two more changes:
- also print an error when regulator_enable() fails
- disable vcc if enabling iovcc fails afterwards
Hope this looks sane now.
Cheers,
-- Guido
Quoted 3 lines
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel