Add R-Car V3M (R8A77970) support to the R-Car LVDS driver
Subsystems (5)
v2 cover Add R-Car V3M (R8A77970) support to the R-Car LVDS driver
Hello!
Here's the set of 2 patches against the 'drm-next' branch of David Airlie's 'linux.git' repo plus Laurent Picnahrt's patches creating the R-Car LVDS bridge driver posted recently. The purpose of these patches is to add the R-Car V3M (R8A77970) support to the R-Car LVDS driver.
[1/2] DT: display: renesas,lvds: document R8A77970 bindings [2/2] drm: rcar-du: lvds: add R8A77970 support
MBR, Sergei
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/2 DT: display: renesas,lvds: document R8A77970 bindings
Document the R-Car V3M (R8A77970) SoC in the R-Car LVDS bindings.
---
Changes in version 2:
- added Rob's and Laurent's tags.
Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt +1 -0
@@ -13,6 +13,7 @@ Required properties: - "renesas,r8a7793-lvds" for R8A7791 (R-Car M2-N) compatible LVDS encoders - "renesas,r8a7795-lvds" for R8A7795 (R-Car H3) compatible LVDS encoders - "renesas,r8a7796-lvds" for R8A7796 (R-Car M3-W) compatible LVDS encoders + - "renesas,r8a77970-lvds" for R8A77970 (R-Car V3M) compatible LVDS encoders - reg: Base address and length for the memory-mapped registers - clocks: A phandle + clock-specifier pair for the functional clock
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 drm: rcar-du: lvds: add R8A77970 support
In reply to Sergei ShtylyovAdd support for the R-Car V3M (R8A77970) SoC to the LVDS encoder driver. Note that there are some differences with the other R-Car gen3 SoCs, e.g. LVDPLLCR has the same layout as in the R-Car gen2 SoCs...
---
Changes in version 2:
- shortened the comment to #define RCAR_LVDS_QUIRK_GEN2_PLLCR and applied this quitk to all R-Car gen2 SoCs, thus simplifying the check for the gen2 LVDPLLCR layout;
- renamed RCAR_LVDS_QUIRK_PHY to RCAR_LVDS_QUIRK_GEN3_LVEN, reworded the comment to this #define;
- removed the 'quirks' variable from rcar_lvds_enable();
- resolved rejects atop of the recent version of the LVDS driver.
drivers/gpu/drm/rcar-du/rcar_lvds.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/rcar-du/rcar_lvds.c +18 -2
@@ -32,6 +32,9 @@ enum rcar_lvds_mode { };#define RCAR_LVDS_QUIRK_LANES (1 << 0)/* LVDS lanes 1 and 3 inverted */ +#define RCAR_LVDS_QUIRK_GEN2_PLLCR (1 << 1)/* LVDPLLCR has gen2 layout */ +#define RCAR_LVDS_QUIRK_GEN3_LVEN (1 << 2)/* LVEN bit needs to be set */ +/* on R8A77970/R8A7799x */ struct rcar_lvds_device_info {unsigned int gen;
@@ -191,7 +194,7 @@ static void rcar_lvds_enable(struct drm_rcar_lvds_write (lvds,LVDCHCR , lvdhcr);/* PLL clock configuration. */ -if (lvds->info->gen <3 ) +if (lvds->info->quirks &RCAR_LVDS_QUIRK_GEN2_PLLCR ) lvdpllcr =rcar_lvds_lvdpllcr_gen2 (mode->clock);else lvdpllcr =rcar_lvds_lvdpllcr_gen3 (mode->clock);
@@ -224,6 +227,12 @@ static void rcar_lvds_enable(struct drm_rcar_lvds_write (lvds,LVDCR0 , lvdcr0); } +if (lvds->info->quirks &RCAR_LVDS_QUIRK_GEN3_LVEN ) { +/* Turn on the LVDS PHY. */ + lvdcr0 |=LVDCR0_LVEN ; +rcar_lvds_write (lvds,LVDCR0 , lvdcr0); + } +/* Wait for the startup delay. */ usleep_range (100 ,150 );
@@ -485,17 +494,23 @@ static int rcar_lvds_remove(struct platfstatic const struct rcar_lvds_device_info rcar_lvds_gen2_info = { .gen =2 , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR , };static const struct rcar_lvds_device_info rcar_lvds_r8a7790_info = { .gen =2 , - .quirks =RCAR_LVDS_QUIRK_LANES , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR |RCAR_LVDS_QUIRK_LANES , };static const struct rcar_lvds_device_info rcar_lvds_gen3_info = { .gen =3 , }; +static const struct rcar_lvds_device_info rcar_lvds_r8a77970_info = { + .gen =3 , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR |RCAR_LVDS_QUIRK_GEN3_LVEN , +}; +static const struct of_device_id rcar_lvds_of_table[] = { { .compatible ="renesas,r8a7743-lvds" , .data = &rcar_lvds_gen2_info }, { .compatible ="renesas,r8a7790-lvds" , .data = &rcar_lvds_r8a7790_info },
@@ -503,6 +518,7 @@ static const struct of_device_id rcar_lv { .compatible = "renesas,r8a7793-lvds", .data = &rcar_lvds_gen2_info }, { .compatible = "renesas,r8a7795-lvds", .data = &rcar_lvds_gen3_info }, { .compatible = "renesas,r8a7796-lvds", .data = &rcar_lvds_gen3_info }, + { .compatible = "renesas,r8a77970-lvds", .data = &rcar_lvds_r8a77970_info }, { } };
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 2/2] drm: rcar-du: lvds: add R8A77970 support
Hi Sergei,
Thank you for the patch.
Quoted 5 lines · On Thursday, 1 March 2018 20:10:16 EET Sergei Shtylyov wrote:
Add support for the R-Car V3M (R8A77970) SoC to the LVDS encoder driver. Note that there are some differences with the other R-Car gen3 SoCs, e.g. LVDPLLCR has the same layout as in the R-Car gen2 SoCs...
Signed-off-by Sergei Shtylyov <[email protected]>
and applied to my tree.
Quoted 81 lines
---
Changes in version 2:
- shortened the comment to #defineRCAR_LVDS_QUIRK_GEN2_PLLCRand applied this quitk to all R-Car gen2 SoCs, thus simplifying the check for the gen2 LVDPLLCR layout;
- renamedRCAR_LVDS_QUIRK_PHYtoRCAR_LVDS_QUIRK_GEN3_LVEN, reworded the comment to this #define;
- removed the 'quirks' variable fromrcar_lvds_enable();
- resolved rejects atop of the recent version of the LVDS driver.drivers/gpu/drm/rcar-du/rcar_lvds.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)Index:
linux/drivers/gpu/drm/rcar-du/rcar_lvds.c
===================================================================drivers/gpu/drm/rcar-du/rcar_lvds.c +18
-2@@ -32,6 +32,9 @@ enum rcar_lvds_mode { };#define RCAR_LVDS_QUIRK_LANES (1 << 0)/* LVDS lanes 1 and 3 inverted */ +#define RCAR_LVDS_QUIRK_GEN2_PLLCR (1 << 1)/* LVDPLLCR has gen2 layout */ +#define RCAR_LVDS_QUIRK_GEN3_LVEN (1 << 2)/* LVEN bit needs to be set */ +/* on R8A77970/R8A7799x */ struct rcar_lvds_device_info {unsigned int gen;@@ -191,7 +194,7 @@ static void rcar_lvds_enable(struct drm_rcar_lvds_write (lvds,LVDCHCR , lvdhcr);/* PLL clock configuration. */ -if (lvds->info->gen <3 ) +if (lvds->info->quirks &RCAR_LVDS_QUIRK_GEN2_PLLCR ) lvdpllcr =rcar_lvds_lvdpllcr_gen2 (mode->clock);else lvdpllcr =rcar_lvds_lvdpllcr_gen3 (mode->clock);@@ -224,6 +227,12 @@ static void rcar_lvds_enable(struct drm_rcar_lvds_write (lvds,LVDCR0 , lvdcr0); } +if (lvds->info->quirks &RCAR_LVDS_QUIRK_GEN3_LVEN ) { +/* Turn on the LVDS PHY. */ + lvdcr0 |=LVDCR0_LVEN ; +rcar_lvds_write (lvds,LVDCR0 , lvdcr0); + } +/* Wait for the startup delay. */ usleep_range (100 ,150 );@@ -485,17 +494,23 @@ static int rcar_lvds_remove(struct platfstatic const struct rcar_lvds_device_info rcar_lvds_gen2_info = { .gen =2 , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR , };static const struct rcar_lvds_device_info rcar_lvds_r8a7790_info = { .gen =2 , - .quirks =RCAR_LVDS_QUIRK_LANES , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR |RCAR_LVDS_QUIRK_LANES , };static const struct rcar_lvds_device_info rcar_lvds_gen3_info = { .gen =3 , }; +static const struct rcar_lvds_device_info rcar_lvds_r8a77970_info = { + .gen =3 , + .quirks =RCAR_LVDS_QUIRK_GEN2_PLLCR |RCAR_LVDS_QUIRK_GEN3_LVEN , +}; +static const struct of_device_id rcar_lvds_of_table[] = { { .compatible ="renesas,r8a7743-lvds" , .data = &rcar_lvds_gen2_info }, { .compatible ="renesas,r8a7790-lvds" , .data = &rcar_lvds_r8a7790_info },@@ -503,6 +518,7 @@ static const struct of_device_id rcar_lv { .compatible = "renesas,r8a7793-lvds", .data = &rcar_lvds_gen2_info }, { .compatible = "renesas,r8a7795-lvds", .data = &rcar_lvds_gen3_info }, { .compatible = "renesas,r8a7796-lvds", .data = &rcar_lvds_gen3_info }, + { .compatible = "renesas,r8a77970-lvds", .data = &rcar_lvds_r8a77970_info }, { } };
Signature · 8 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel