Commit 66ccd1d1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2022-05-19' of... 

Merge tag 'drm-misc-next-fixes-2022-05-19' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

A device tree binding change for Rockchip VOP2

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220519080556.42p52cya4u6y3kps@houat
parents 00df0514 5ee8c8f9

Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml

+7 −1
Original line number Diff line number Diff line
@@ -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 = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;

                clocks = <&cru ACLK_VOP>,

                         <&cru HCLK_VOP>,

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

+2 −2
Original line number Diff line number Diff line
@@ -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))