rockchip-lvds for rk3568
Subsystems (5)
cover rockchip-lvds for rk3568
This series adds support for the LVDS controller on the Rockchip RK3566 and RK3568.
Tested on Autogramma Monitor RockChip, custom board based on Radxa Rock 3 Computing Module Plus.
Requires applied DSI DPHY patches by Chris Morgan, as LVDS controller does share PHY controller with MIPI DSI.
Alibek Omarov (3):
drm/rockchip: lvds: add rk3568 support
arm64: dts: rockchip: rk356x: add LVDS bindings
dt-bindings: display: rockchip-lvds: add compatible string for RK3568
.../display/rockchip/rockchip-lvds.txt | 1 + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 25 +++ drivers/gpu/drm/rockchip/rockchip_lvds.c | 144 +++++++++++++++++- drivers/gpu/drm/rockchip/rockchip_lvds.h | 10 ++ 4 files changed, 173 insertions(+), 7 deletions(-)
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
RFC PATCH 1/3 drm/rockchip: lvds: add rk3568 support
One of the ports of RK3568 can be configured as LVDS, re-using the DSI PHY
--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 144 +++++++++++++++++++++-- drivers/gpu/drm/rockchip/rockchip_lvds.h | 10 ++ 2 files changed, 147 insertions(+), 7 deletions(-)
drivers/gpu/drm/rockchip/rockchip_lvds.c +137 -7
@@ -429,6 +429,90 @@ static void px30_lvds_encoder_disable(struct drm_encoder *encoder)drm_panel_unprepare (lvds->panel); } +static int rk3568_lvds_poweron (struct rockchip_lvds *lvds) +{ +int ret; + + ret =clk_enable (lvds->pclk); +if (ret <0 ) { +DRM_DEV_ERROR (lvds->dev,"failed to enable lvds pclk %d\n" , ret); +return ret; + } + + ret =pm_runtime_get_sync (lvds->dev); +if (ret <0 ) { +DRM_DEV_ERROR (lvds->dev,"failed to get pm runtime: %d\n" , ret); +clk_disable (lvds->pclk); +return ret; + } + +/* Enable LVDS mode */ +return regmap_update_bits (lvds->grf,RK3568_GRF_VO_CON2 , +RK3568_LVDS0_MODE_EN (1 ), +RK3568_LVDS0_MODE_EN (1 )); +} + +static void rk3568_lvds_poweroff (struct rockchip_lvds *lvds) +{ +regmap_update_bits (lvds->grf,RK3568_GRF_VO_CON2 , +RK3568_LVDS0_MODE_EN (1 ) |RK3568_LVDS0_P2S_EN (1 ), +RK3568_LVDS0_MODE_EN (0 ) |RK3568_LVDS0_P2S_EN (0 )); + +pm_runtime_put (lvds->dev); +clk_disable (lvds->pclk); +} + +static int rk3568_lvds_grf_config (struct drm_encoder *encoder, +struct drm_display_mode *mode) +{ +struct rockchip_lvds *lvds =encoder_to_lvds (encoder); + +if (lvds->output !=DISPLAY_OUTPUT_LVDS ) { +DRM_DEV_ERROR (lvds->dev,"Unsupported display output %d\n" , + lvds->output); +return -EINVAL ; + } + +/* Set format */ +return regmap_update_bits (lvds->grf,RK3568_GRF_VO_CON0 , +RK3568_LVDS0_SELECT (3 ), +RK3568_LVDS0_SELECT (lvds->format)); +} + +static void rk3568_lvds_encoder_enable (struct drm_encoder *encoder) +{ +struct rockchip_lvds *lvds =encoder_to_lvds (encoder); +struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; +int ret; + +drm_panel_prepare (lvds->panel); + + ret =rk3568_lvds_poweron (lvds); +if (ret) { +DRM_DEV_ERROR (lvds->dev,"failed to power on LVDS: %d\n" , ret); +drm_panel_unprepare (lvds->panel); +return ; + } + + ret =rk3568_lvds_grf_config (encoder, mode); +if (ret) { +DRM_DEV_ERROR (lvds->dev,"failed to configure LVDS: %d\n" , ret); +drm_panel_unprepare (lvds->panel); +return ; + } + +drm_panel_enable (lvds->panel); +} + +static void rk3568_lvds_encoder_disable (struct drm_encoder *encoder) +{ +struct rockchip_lvds *lvds =encoder_to_lvds (encoder); + +drm_panel_disable (lvds->panel); +rk3568_lvds_poweroff (lvds); +drm_panel_unprepare (lvds->panel); +} +static const struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = { .enable = rk3288_lvds_encoder_enable,
@@ -443,6 +527,13 @@ struct drm_encoder_helper_funcs px30_lvds_encoder_helper_funcs = { .atomic_check = rockchip_lvds_encoder_atomic_check, }; +static const +struct drm_encoder_helper_funcs rk3568_lvds_encoder_helper_funcs = { + .enable = rk3568_lvds_encoder_enable, + .disable = rk3568_lvds_encoder_disable, + .atomic_check = rockchip_lvds_encoder_atomic_check, +}; +static int rk3288_lvds_probe (struct platform_device *pdev,struct rockchip_lvds *lvds) {
@@ -487,6 +578,26 @@ static int rk3288_lvds_probe(struct platform_device *pdev,return 0 ; } +static int rockchip_lvds_phy_probe (struct platform_device *pdev, +struct rockchip_lvds *lvds) +{ +int ret; + + lvds->dphy =devm_phy_get (&pdev->dev,"dphy" ); +if (IS_ERR (lvds->dphy)) +return PTR_ERR (lvds->dphy); + + ret =phy_init (lvds->dphy); +if (ret) +return ret; + + ret =phy_set_mode (lvds->dphy,PHY_MODE_LVDS ); +if (ret) +return ret; + +return phy_power_on (lvds->dphy); +} +static int px30_lvds_probe (struct platform_device *pdev,struct rockchip_lvds *lvds) {
@@ -499,20 +610,28 @@ static int px30_lvds_probe(struct platform_device *pdev,if (ret)return ret; -/* PHY */ - lvds->dphy =devm_phy_get (&pdev->dev,"dphy" ); -if (IS_ERR (lvds->dphy)) -return PTR_ERR (lvds->dphy); +return rockchip_lvds_phy_probe (pdev, lvds); +} - ret =phy_init (lvds->dphy); +static int rk3568_lvds_probe (struct platform_device *pdev, +struct rockchip_lvds *lvds) +{ +int ret; + + ret =regmap_update_bits (lvds->grf,RK3568_GRF_VO_CON0 , +RK3568_LVDS0_MSBSEL (1 ), +RK3568_LVDS0_MSBSEL (1 ));if (ret)return ret; - ret =phy_set_mode (lvds->dphy,PHY_MODE_LVDS ); + ret =regmap_update_bits (lvds->grf,RK3568_GRF_VO_CON2 , +RK3568_LVDS0_P2S_EN (1 ), +RK3568_LVDS0_P2S_EN (1 )); +if (ret)return ret; -return phy_power_on (lvds->dphy); +return rockchip_lvds_phy_probe (pdev, lvds); }static const struct rockchip_lvds_soc_data rk3288_lvds_data = {
@@ -525,6 +644,11 @@ static const struct rockchip_lvds_soc_data px30_lvds_data = { .helper_funcs = &px30_lvds_encoder_helper_funcs, }; +static const struct rockchip_lvds_soc_data rk3568_lvds_data = { + .probe = rk3568_lvds_probe, + .helper_funcs = &rk3568_lvds_encoder_helper_funcs, +}; +static const struct of_device_id rockchip_lvds_dt_ids[] = { { .compatible ="rockchip,rk3288-lvds" ,
@@ -534,6 +658,10 @@ static const struct of_device_id rockchip_lvds_dt_ids[] = { .compatible = "rockchip,px30-lvds", .data = &px30_lvds_data }, + { + .compatible = "rockchip,rk3568-lvds", + .data = &rk3568_lvds_data + }, {} };MODULE_DEVICE_TABLE (of, rockchip_lvds_dt_ids);
@@ -608,6 +736,8 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, encoder = &lvds->encoder.encoder; encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dev->of_node); +rockchip_drm_encoder_set_crtc_endpoint_id (&lvds->encoder, + dev->of_node,0 ,0 ); ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_LVDS );if (ret <0 ) {
drivers/gpu/drm/rockchip/rockchip_lvds.h +10 -0
@@ -120,4 +120,14 @@#define PX30_LVDS_P2S_EN (val) HIWORD_UPDATE(val, 6, 6)#define PX30_LVDS_VOP_SEL (val) HIWORD_UPDATE(val, 1, 1) +#define RK3568_GRF_VO_CON0 0x0360 +#define RK3568_LVDS0_SELECT (val) HIWORD_UPDATE(val, 5, 4) +#define RK3568_LVDS0_MSBSEL (val) HIWORD_UPDATE(val, 3, 3) + +#define RK3568_GRF_VO_CON2 0x0368 +#define RK3568_LVDS0_DCLK_INV_SEL (val) HIWORD_UPDATE(val, 9, 9) +#define RK3568_LVDS0_DCLK_DIV2_SEL (val) HIWORD_UPDATE(val, 8, 8) +#define RK3568_LVDS0_MODE_EN (val) HIWORD_UPDATE(val, 1, 1) +#define RK3568_LVDS0_P2S_EN (val) HIWORD_UPDATE(val, 0, 0) +#endif /* _ROCKCHIP_LVDS_ */
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
RFC PATCH 2/3 arm64: dts: rockchip: rk356x: add LVDS bindings
In reply to Alibek OmarovExposes ports for VOP2 and for panel
--- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +25 -0
@@ -787,6 +787,31 @@ hdmi_out: port@1 { }; }; + lvds: lvds { + compatible = "rockchip,rk3568-lvds"; + clocks = <&cru PCLK_DSITX_0>; + clock-names = "pclk_lvds"; + phys = <&dsi_dphy0>; + phy-names = "dphy"; + power-domains = <&power RK3568_PD_VO>; + rockchip,grf = <&grf>; + rockchip,output = "lvds"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + lvds_in: port@0 { + reg = <0>; + }; + + lvds_out: port@1 { + reg = <1>; + }; + }; + }; + qos_gpu: qos@fe128000 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe128000 0x0 0x20>;
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
Hello Alibek!
Quoted 8 lines · Alibek Omarov
Quoted 8 lines
Exposes ports for VOP2 and for panel
Signed-off-by Alibek Omarov <[email protected]>---
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 25 >
++++++++++++++++++++++++1 file changed, 25 insertions(+)
Quoted 14 lines
Quoted 8 lines
> renamed from arch/arm64/boot/dts/rockchip/rk356x.dtsi +0
-0
b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index0473d7ee2668..fea3319a6a4e100644arch/arm64/boot/dts/rockchip/rk356x.dtsi +0
-0@@ -787,6 +787,31 @@ hdmi_out: port@1 { }; };Quoted 6 lines
+ lvds: lvds {
+ compatible = "rockchip,rk3568-lvds"; + clocks = <&cruPCLK_DSITX_0>; + clock-names = "pclk_lvds";
+ phys = <&dsi_dphy0>;
If this patch depends of the
https://lore.kernel.org/all/[email protected]/
patch, then should the phys reference "mipi_dphy0" node?
Quoted 23 lines
Quoted 23 lines
+ phy-names = "dphy";
+ power-domains = <&powerRK3568_PD_VO>; + rockchip,grf = <&grf>;
+ rockchip,output = "lvds";
+ status = "disabled";arch/arm64/boot/dts/rockchip/rk356x.dtsi +15
-0+ + ports { + #address-cells = <1>; + #size-cells = <0>; + + lvds_in: port@0 { + reg = <0>; + }; + + lvds_out: port@1 { + reg = <1>; + }; + }; + }; +qos_gpu: qos@fe128000 {
compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x00xfe1280000x00x20>;
Signature · 7 lines
Alexander Sverdlin Siemens AG www.siemens.com _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
Quoted 1 line
patch, then should the phys reference "
mipi_dphy0" node?
Looks like I just linked the old patch version instead of the one that got merged.
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Sverdlin, Alexander
Tested-byRe: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
Hi!
Quoted 7 lines · Alibek Omarov
Quoted 1 line
patch, then should the phys reference "
mipi_dphy0" node?Looks like I just linked the old patch version instead of the one that
got merged.
No, it's me totally missed v4 and the whole rockchip tree, sorry for that!
You can add my
Your patch works fine and shows some LVDS panel graphics on a custom rk3566-based board, thank you!
Signature · 7 lines
Alexander Sverdlin Siemens AG www.siemens.com _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
Quoted 2 lines
Your patch works fine and shows some LVDS panel graphics on a custom rk3566-based board, thank you!
Awesome, thanks!
I didn't made any significant changes since that but I will probably resend it when I will have free time.
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
In reply to Alibek OmarovQuoted 12 lines · Alibek Omarov
Exposes ports for VOP2 and for panel
Signed-off-by Alibek Omarov <[email protected]>--- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+)arch/arm64/boot/dts/rockchip/rk356x.dtsi +0
-0
arch/arm64/boot/dts/rockchip/rk356x.dtsi hdmi_out: port@1 { · line 793
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk356x.dtsi +2
-0@@ -787,6 +787,31 @@ hdmi_out: port@1 { }; }; + lvds: lvds { + compatible = "rockchip,rk3568-lvds";
Hi Alibek,
1:
In the manufacturer tree they model this node in the grf node. Any particular reason to do that different?
In mainline PX30 already does the same.
2:
There's complete "Acked" serie to be merged by Heiko for a LVDS yaml binding.
[PATCH v6 01/17] dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML
https://lore.kernel.org/linux-rockchip/[email protected]/
Maybe it's better to check this node in a automated way?
Johan
Quoted 24 lines
arch/arm64/boot/dts/rockchip/rk356x.dtsi +23
-0+ clocks = <&cru PCLK_DSITX_0>; + clock-names = "pclk_lvds"; + phys = <&dsi_dphy0>; + phy-names = "dphy"; + power-domains = <&power RK3568_PD_VO>; + rockchip,grf = <&grf>; + rockchip,output = "lvds"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + lvds_in: port@0 { + reg = <0>; + }; + + lvds_out: port@1 { + reg = <1>; + }; + }; + }; + qos_gpu: qos@fe128000 {
arch/arm64/boot/dts/rockchip/rk356x.dtsi hdmi_out: port@1 { · line 817
Quoted 2 lines
arch/arm64/boot/dts/rockchip/rk356x.dtsi +0
-0compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe128000 0x0 0x20>;
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [RFC PATCH 2/3] arm64: dts: rockchip: rk356x: add LVDS bindings
Hi Johan!
1. That's interesting, there is no particular reason for this. I can move it since it makes more sense, as lvds driver only modifies the grf.
2. I haven't noticed this patch. If it's merged to Heiko's branch, I will rebase it on YAML then.
Sorry, I don't have that much free time to finish the v2 yet. Hopefully will send an updated patchset next week or so.
Alibek.
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
RFC PATCH 3/3 dt-bindings: display: rockchip-lvds: add compatible string for RK3568
In reply to Alibek OmarovRK3568 SoCs have a single LVDS output, that use PHY shared by two display
pipelines: LVDS and MIPI DSI.
--- .../devicetree/bindings/display/rockchip/rockchip-lvds.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt +1 -0
@@ -5,6 +5,7 @@ Required properties: - compatible: matching the soc type, one of - "rockchip,rk3288-lvds"; - "rockchip,px30-lvds"; + - "rockchip,rk3568-lvds"; - reg: physical base address of the controller and length of memory mapped region.
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip