Unverified Commit f8acc844 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.1-rockchip-drivers2' of... 

Merge tag 'v6.1-rockchip-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers

Some binding additions for rk3128 and rv1126

* tag 'v6.1-rockchip-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  dt-bindings: soc: rockchip: grf: add rockchip,rk3128-grf
  dt-bindings: arm: rockchip: pmu: add rockchip,rk3128-pmu
  dt-bindings: soc: rockchip: Document RV1126 pmugrf
  dt-bindings: soc: rockchip: Document RV1126 grf

Link: https://lore.kernel.org/r/3790767.LM0AJKV5NW@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3919d905 adc4f190

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ select: 
        enum:

        enum:

          - rockchip,px30-pmu

          - rockchip,px30-pmu

          - rockchip,rk3066-pmu

          - rockchip,rk3066-pmu

          - rockchip,rk3128-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3368-pmu

          - rockchip,rk3368-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3399-pmu
@@ -36,6 +37,7 @@ properties: 
      - enum:

      - enum:

          - rockchip,px30-pmu

          - rockchip,px30-pmu

          - rockchip,rk3066-pmu

          - rockchip,rk3066-pmu

          - rockchip,rk3128-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3288-pmu

          - rockchip,rk3368-pmu

          - rockchip,rk3368-pmu

          - rockchip,rk3399-pmu

          - rockchip,rk3399-pmu

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+4 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
              - rockchip,px30-usb2phy-grf

              - rockchip,px30-usb2phy-grf

              - rockchip,rk3036-grf

              - rockchip,rk3036-grf

              - rockchip,rk3066-grf

              - rockchip,rk3066-grf

              - rockchip,rk3128-grf

              - rockchip,rk3188-grf

              - rockchip,rk3188-grf

              - rockchip,rk3228-grf

              - rockchip,rk3228-grf

              - rockchip,rk3288-grf

              - rockchip,rk3288-grf
@@ -48,6 +49,8 @@ properties: 
              - rockchip,rk3568-pmugrf

              - rockchip,rk3568-pmugrf

              - rockchip,rv1108-grf

              - rockchip,rv1108-grf

              - rockchip,rv1108-pmugrf

              - rockchip,rv1108-pmugrf

              - rockchip,rv1126-grf

              - rockchip,rv1126-pmugrf

          - const: syscon

          - const: syscon

          - const: simple-mfd

          - const: simple-mfd
@@ -181,6 +184,7 @@ allOf: 
          contains:

          contains:

            enum:

            enum:

              - rockchip,px30-usb2phy-grf

              - rockchip,px30-usb2phy-grf

              - rockchip,rk3128-grf

              - rockchip,rk3228-grf

              - rockchip,rk3228-grf

              - rockchip,rk3308-usb2phy-grf

              - rockchip,rk3308-usb2phy-grf

              - rockchip,rk3328-usb2phy-grf

              - rockchip,rk3328-usb2phy-grf