Skip to content

Commit dd9f821

Browse files
committed
Merge tag 'v6.17-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New board: FriendlyElec NanoPi M5 Camera support for the PinePhone Pro. A bunch of cleanups to make DTC happier, fix ordering of DMA uart channels on rk3528 and some video output enablement as well as some button definitions. An interesting tidbit is the reset behaviour addition in that some boards have specific requirements as to how the PMIC needs to do the restart. DT-maintainers did not consider the header with helper-constants as part of the binding, so that header ended up in the Rockchip directory * tag 'v6.17-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (29 commits) arm64: dts: rockchip: Add maskrom button to NanoPi R5S + R5C arm64: dts: rockchip: Drop regulator-compatible property on rk3399 arm64: dts: rockchip: Drop unneeded address+size-cells on px30 arm64: dts: rockchip: Fix LCD panel port on rk3566-pinetab2 arm64: dts: rockchip: Move mipi_out node on rk3399 haikou demo dtso arm64: dts: rockchip: Simplify mipi_out endpoint on rk3399 RP64 dtso arm64: dts: rockchip: Simplify edp endpoints on several rk3399 boards arm64: dts: rockchip: Simplify VOP port definition on rk3328 arm64: dts: rockchip: Move dsi address+size-cells from SoC to rk3399 boards arm64: dts: rockchip: Move dsi address+size-cells from SoC to px30 boards arm64: dts: rockchip: Fix UART DMA support for RK3528 arm64: dts: rockchip: Add reset button to NanoPi R5S arm64: dts: rockchip: Add rtc0 alias for NanoPi R5S + R5C arm64: dts: rockchip: describe the OV8858 user camera on PinePhone Pro arm64: dts: rockchip: describe I2c Bus 1 and IMX258 world camera on PinePhone Pro arm64: dts: rockchip: Fix pinctrl node names for RK3528 arm64: dts: rockchip: Add FriendlyElec NanoPi M5 support dt-bindings: arm: rockchip: add FriendlyElec NanoPi M5 board arm64: dts: rockchip: force PMIC reset behavior to restart PMU on RK3588 Tiger arm64: dts: rockchip: force PMIC reset behavior to restart PMU on RK3588 Jaguar ... Link: https://lore.kernel.org/r/11552292.NyiUUSuA9g@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents dda1d84 + 07e04c0 commit dd9f821

36 files changed

+1387
-108
lines changed

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,12 @@ properties:
300300
- friendlyarm,nanopi-r4s-enterprise
301301
- const: rockchip,rk3399
302302

303+
- description: FriendlyElec NanoPi M5 series boards
304+
items:
305+
- enum:
306+
- friendlyarm,nanopi-m5
307+
- const: rockchip,rk3576
308+
303309
- description: FriendlyElec NanoPi R5 series boards
304310
items:
305311
- enum:

arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5.dtb
148148
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtbo
149149
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10.dtb
150150
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-luckfox-omni3576.dtb
151+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-m5.dtb
151152
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-roc-pc.dtb
152153
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-rock-4d.dtb
153154
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3582-radxa-e52c.dtb

arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w-a2.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
};
1313

1414
&dsi {
15+
#address-cells = <1>;
16+
#size-cells = <0>;
1517
status = "okay";
1618

1719
panel@0 {

arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
};
1313

1414
&dsi {
15+
#address-cells = <1>;
16+
#size-cells = <0>;
1517
status = "okay";
1618

1719
panel@0 {

arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3148w.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
};
1313

1414
&dsi {
15+
#address-cells = <1>;
16+
#size-cells = <0>;
1517
status = "okay";
1618

1719
panel@0 {

arch/arm64/boot/dts/rockchip/px30-cobra-ltk500hd1829.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
};
1717

1818
&dsi {
19+
#address-cells = <1>;
20+
#size-cells = <0>;
1921
status = "okay";
2022

2123
panel@0 {

arch/arm64/boot/dts/rockchip/px30-evb.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
};
125125

126126
&dsi {
127+
#address-cells = <1>;
128+
#size-cells = <0>;
127129
status = "okay";
128130

129131
ports {

arch/arm64/boot/dts/rockchip/px30-pp1516-ltk050h3146w-a2.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
};
1313

1414
&dsi {
15+
#address-cells = <1>;
16+
#size-cells = <0>;
1517
status = "okay";
1618

1719
panel@0 {

arch/arm64/boot/dts/rockchip/px30-pp1516-ltk050h3148w.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
};
1313

1414
&dsi {
15+
#address-cells = <1>;
16+
#size-cells = <0>;
1517
status = "okay";
1618

1719
panel@0 {

arch/arm64/boot/dts/rockchip/px30.dtsi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@
351351
pmugrf: syscon@ff010000 {
352352
compatible = "rockchip,px30-pmugrf", "syscon", "simple-mfd";
353353
reg = <0x0 0xff010000 0x0 0x1000>;
354-
#address-cells = <1>;
355-
#size-cells = <1>;
356354

357355
pmu_io_domains: io-domains {
358356
compatible = "rockchip,px30-pmu-io-voltage-domain";
@@ -453,8 +451,6 @@
453451
grf: syscon@ff140000 {
454452
compatible = "rockchip,px30-grf", "syscon", "simple-mfd";
455453
reg = <0x0 0xff140000 0x0 0x1000>;
456-
#address-cells = <1>;
457-
#size-cells = <1>;
458454

459455
io_domains: io-domains {
460456
compatible = "rockchip,px30-io-voltage-domain";
@@ -1137,8 +1133,6 @@
11371133
resets = <&cru SRST_MIPIDSI_HOST_P>;
11381134
reset-names = "apb";
11391135
rockchip,grf = <&grf>;
1140-
#address-cells = <1>;
1141-
#size-cells = <0>;
11421136
status = "disabled";
11431137

11441138
ports {

0 commit comments

Comments
 (0)