diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-12-21 15:56:00 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-12-21 15:56:04 +0000 |
| commit | 965c83326e18d060a8da3da8f8130437e9845e7b (patch) | |
| tree | 75450581793bb16cb47aeb49a5602e6ae6987924 /Documentation | |
| parent | 16e6e974d17b7b49b354f263145fb0573702f260 (diff) | |
| parent | 569b26af7919c15a8ce231b4fae29cfbd811f144 (diff) | |
Merge tag 'v6.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards are the Geniatech XPI-3128 (RK3128), Sonoff iHost (rv1109)
One "new" soc is the rv1109 which is a two-core variant of the rv1126
and everything else is identical.
Lots of love for the old rk3128 (power-domains, gpu, gmac, usb) and
rv1126 (uart pins, i2c2 special case) and rework of aliases to have
core busses that are hard-numbered in boards and documentation centrally
in the dtsi, but the per board aliases in the boards (ethernet).
Plus the rk3036 got a yaml hdmi binding which required some small fixes.
* tag 'v6.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (24 commits)
ARM: dts: rockchip: add hdmi-connector node to rk3036-kylin
ARM: dts: rockchip: fix rk3036 hdmi ports node
ARM: dts: rockchip: add gpio alias for gpio dt nodes
ARM: dts: rockchip: Move uart aliases to SoC dtsi for RK3128
ARM: dts: rockchip: Move i2c aliases to SoC dtsi for RK3128
ARM: dts: rockchip: Move gpio aliases to SoC dtsi for RK3128
ARM: dts: rockchip: Add Sonoff iHost Smart Home Hub
dt-bindings: arm: rockchip: Add Sonoff iHost
ARM: dts: rockchip: Add rv1109 SoC
ARM: dts: rockchip: Split up rgmii1 pinctrl on rv1126
ARM: dts: rockchip: Add i2c2 node to rv1126
ARM: dts: rockchip: Serial aliases for rv1126
ARM: dts: rockchip: Add alternate UART pins to rv1126
ARM: dts: rockchip: Enable GPU for XPI-3128
ARM: dts: rockchip: Add GPU node for RK3128
ARM: dts: rockchip: Add power-controller for RK3128
ARM: dts: rockchip: Enable gmac for XPI-3128
ARM: dts: rockchip: Add gmac node for RK3128
ARM: dts: rockchip: Make usbphy the parent of SCLK_USB480M for RK3128
ARM: dts: rockchip: Add dwc2 otg fifo siztes for RK3128
...
Link: https://lore.kernel.org/r/3197878.5fSG56mABF@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index ee92f0535f27..2158d0a9f573 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -235,6 +235,11 @@ properties: - const: geekbuying,geekbox - const: rockchip,rk3368 + - description: Geniatech XPI-3128 + items: + - const: geniatech,xpi-3128 + - const: rockchip,rk3128 + - description: Google Bob (Asus Chromebook Flip C101PA) items: - const: google,bob-rev13 @@ -928,6 +933,13 @@ properties: - const: rockchip,rk3568-bpi-r2pro - const: rockchip,rk3568 + - description: Sonoff iHost Smart Home Hub + items: + - const: itead,sonoff-ihost + - enum: + - rockchip,rv1126 + - rockchip,rv1109 + additionalProperties: true ... |