diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 21:58:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 21:58:18 +0100 |
| commit | 20d9c47b8070eaba4d3b7ee3cc4e0b8c7fe2845b (patch) | |
| tree | bec69af67186bfd6586b0a0bfdec9fefddf7bd1d /Documentation/devicetree | |
| parent | e4a78fd21a8682145381e747bbfcae6c4ebe571c (diff) | |
| parent | 9b505cf5499071ad4eb2b992d6b42a330b00a3ff (diff) | |
| download | linux-20d9c47b8070eaba4d3b7ee3cc4e0b8c7fe2845b.tar.gz | |
Merge tag 'v5.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Improvements for the rk3288-vyasa board and a lot of cleanups from
verifying devicetrees against new yaml bindings.
* tag 'v5.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (25 commits)
ARM: dts: rockchip: remove #address-cells and #size-cells from i2s nodes
ARM: dts: rockchip: swap clocks and clock-names values for i2s nodes
ARM: dts: rockchip: remove clock-names property from 'generic-ohci' nodes
ARM: dts: rockchip: remove clock-names property from 'generic-ehci' nodes
ARM: dts: rockchip: swap clocks and clock-names values for spdif nodes
ARM: dts: rockchip: Keep rk3288-tinker SD card IO powered during reboot
ARM: dts: rockchip: remove clock-frequency from saradc node rv1108
ARM: dts: rockchip: fix vref-supply for &saradc node rk3288 firefly reload
ARM: dts: rockchip: use DMA channels for UARTs for RK3288
ARM: dts: rockchip: rk3xxx: fix L2 cache-controller nodename
ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc
ARM: dts: add bus to rockchip amba nodenames
ARM: dts: rockchip: remove #dma-cells from dma client nodes for rv1108
ARM: dts: rockchip: fix rockchip,default-sample-phase property names
ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc
dt-bindings: arm: add Rockchip rk3036-evb board
dt-bindings: arm: fix Rockchip Kylin board bindings
ARM: dts: rockchip: add missing model properties
ARM: dts: rockchip: Add vcc50_hdmi for rk3288-vyasa
ARM: dts: rockchip: Fix ddc-i2c-bus for rk3288-vyasa
...
Link: https://lore.kernel.org/r/7846023.TtVhTo4ACP@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 874b0eaa2a75..d303790f5d22 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -443,7 +443,7 @@ properties: - description: Rockchip Kylin items: - - const: rockchip,kylin-rk3036 + - const: rockchip,rk3036-kylin - const: rockchip,rk3036 - description: Rockchip PX3 Evaluation board @@ -468,6 +468,11 @@ properties: - const: rockchip,r88 - const: rockchip,rk3368 + - description: Rockchip RK3036 Evaluation board + items: + - const: rockchip,rk3036-evb + - const: rockchip,rk3036 + - description: Rockchip RK3228 Evaluation board items: - const: rockchip,rk3228-evb |