diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-02-03 14:11:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-02-03 14:11:08 +0100 |
| commit | eacef7cc523a1ae10053dd82748c87c8c6a60f80 (patch) | |
| tree | e0d3f672b38e127291567f3fa93ce79e8df346b1 /Documentation/devicetree/bindings/soc | |
| parent | Merge tag 'v6.3-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | dt-bindings: phy: rename phy-rockchip-inno-usb2.yaml (diff) | |
| download | linux-eacef7cc523a1ae10053dd82748c87c8c6a60f80.tar.xz linux-eacef7cc523a1ae10053dd82748c87c8c6a60f80.zip | |
Merge tag 'v6.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Two new 32bit SoC were added, the rv1126 and rk3128.
New boards are thr rk3128-eval-board, and a number of rv1126-based compute
modules from Edgeble AI.
Also included are some dt-binding improvements with relevant Acks from
maintainers when the changes touch these areas.
* tag 'v6.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
dt-bindings: phy: rename phy-rockchip-inno-usb2.yaml
dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml
dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
ARM: dts: rockchip: Enable Ethernet on rv1126 Neu2-IO
ARM: dts: rockchip: Add Ethernet GMAC node for RV1126
ARM: dts: rockchip: Add ethernet rgmiim1 pin-control for rv1126
dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 6
ARM: dts: rockchip: add brcmf node to rk3066a-mk808
ARM: dts: rockchip: add space between label and nodename nfc pinctrl on rk3128
ARM: dts: rockchip: add rk3128-evb
ARM: dts: rockchip: add rk3128 soc dtsi
dt-bindings: arm: rockchip: Add Rockchip RK3128 Evaluation board
ARM: dts: rockchip: Add Edgeble Neural Compute Module 2(Neu2) IO board
ARM: dts: rockchip: Add Edgeble RV1126 Neural Compute Module 2(Neu2)
dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 2
dt-bindings: vendor-prefixes: Add Edgeble AI Technologies Pvt. Ltd.
ARM: dts: rockchip: Add Rockchip RV1126 SoC
ARM: dts: rockchip: Add Rockchip RV1126 pinctrl
dt-bindings: arm: rockchip: Add pmu compatible for rv1126
Link: https://lore.kernel.org/r/5651506.31r3eYUQgx@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/soc')
| -rw-r--r-- | Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index e682b407a383..e697c928900d 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -97,8 +97,9 @@ allOf: then: properties: edp-phy: - description: - Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt + type: object + $ref: /schemas/phy/rockchip,rk3288-dp-phy.yaml# + unevaluatedProperties: false - if: properties: @@ -205,7 +206,7 @@ allOf: "usb2phy@[0-9a-f]+$": type: object - $ref: "/schemas/phy/phy-rockchip-inno-usb2.yaml#" + $ref: /schemas/phy/rockchip,inno-usb2phy.yaml# unevaluatedProperties: false |