diff options
| author | Arnd Bergmann <[email protected]> | 2022-09-28 22:36:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2022-09-28 22:36:24 +0200 |
| commit | f8acc844c9eca88a47fd7106a64c817fac4955a6 (patch) | |
| tree | ce476efb97f5752a7816fd455e0e72d040173ccf | |
| parent | 3919d905351f279593dd7ec35a23a417963f44a3 (diff) | |
| parent | adc4f190260a6c004f950992d8c9ee3aec8da38b (diff) | |
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: Arnd Bergmann <[email protected]>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip/pmu.yaml | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml index 4c645049c15b..8c73bc7f4009 100644 --- a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml @@ -21,6 +21,7 @@ select: enum: - rockchip,px30-pmu - rockchip,rk3066-pmu + - rockchip,rk3128-pmu - rockchip,rk3288-pmu - rockchip,rk3368-pmu - rockchip,rk3399-pmu @@ -36,6 +37,7 @@ properties: - enum: - rockchip,px30-pmu - rockchip,rk3066-pmu + - rockchip,rk3128-pmu - rockchip,rk3288-pmu - rockchip,rk3368-pmu - rockchip,rk3399-pmu diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 97301c470173..2ed8cca79b59 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -31,6 +31,7 @@ properties: - rockchip,px30-usb2phy-grf - rockchip,rk3036-grf - rockchip,rk3066-grf + - rockchip,rk3128-grf - rockchip,rk3188-grf - rockchip,rk3228-grf - rockchip,rk3288-grf @@ -48,6 +49,8 @@ properties: - rockchip,rk3568-pmugrf - rockchip,rv1108-grf - rockchip,rv1108-pmugrf + - rockchip,rv1126-grf + - rockchip,rv1126-pmugrf - const: syscon - const: simple-mfd @@ -181,6 +184,7 @@ allOf: contains: enum: - rockchip,px30-usb2phy-grf + - rockchip,rk3128-grf - rockchip,rk3228-grf - rockchip,rk3308-usb2phy-grf - rockchip,rk3328-usb2phy-grf |