From 54eb8d446e710b5f77969bd34f0a162cf86b8d29 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 11 May 2022 10:21:07 +0200 Subject: dt-bindings: display: rockchip: make reg-names mandatory for VOP2 The VOP2 driver relies on reg-names properties, but these are not documented. Add the missing documentation and make reg-names mandatory. Signed-off-by: Sascha Hauer Reviewed-by: Rob Herring Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20220511082109.1110043-2-s.hauer@pengutronix.de --- .../devicetree/bindings/display/rockchip/rockchip-vop2.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml index 655d9b327f7d..fba45091d909 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml @@ -22,7 +22,6 @@ properties: - rockchip,rk3568-vop reg: - minItems: 1 items: - description: Must contain one entry corresponding to the base address and length @@ -31,6 +30,11 @@ properties: Can optionally contain a second entry corresponding to the CRTC gamma LUT address. + reg-names: + items: + - const: vop + - const: gamma-lut + interrupts: maxItems: 1 description: @@ -86,6 +90,7 @@ properties: required: - compatible - reg + - reg-names - interrupts - clocks - clock-names @@ -104,6 +109,7 @@ examples: vop: vop@fe040000 { compatible = "rockchip,rk3568-vop"; reg = <0x0 0xfe040000 0x0 0x3000>, <0x0 0xfe044000 0x0 0x1000>; + reg-names = "vop", "gamma-lut"; interrupts = ; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>, -- cgit From 5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 11 May 2022 10:21:08 +0200 Subject: drm/rockchip: Change register space names in vop2 "regs" seems to generic when there are multiple register spaces, so rename that one to "vop". Also change "gamma_lut" to better looking "gamma-lut". Signed-off-by: Sascha Hauer Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20220511082109.1110043-3-s.hauer@pengutronix.de --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 0b49fed16535..26ac91db0f35 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2620,7 +2620,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(dev, vop2); - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vop"); if (!res) { drm_err(vop2->drm, "failed to get vop2 register byname\n"); return -EINVAL; @@ -2637,7 +2637,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma_lut"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma-lut"); if (res) { vop2->lut_regs = devm_ioremap_resource(dev, res); if (IS_ERR(vop2->lut_regs)) -- cgit