Skip to content

Commit 06fc642

Browse files
arndbarndb
committed
Merge tag 'v6.13-rockchip-dts32-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Fixed-regulator nowadays has preferred node-naming scheme set in the binding. This gets all boards on the same state for Rockchip arm32-dts. * tag 'v6.13-rockchip-dts32-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: adapt regulator nodenames to preferred form ARM: dts: rockchip: Add Relfor Saib board dt-bindings: arm: rockchip: Add Relfor Saib board dt-bindings: vendor-prefixes: Add Relfor labs ARM: dts: rockchip: Add watchdog node for RV1126 dt-bindings: watchdog: rockchip: Add rockchip,rv1126-wdt string Link: https://lore.kernel.org/r/6740039.4vTCxPXJkl@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 36255ab + 2c3944d commit 06fc642

46 files changed

Lines changed: 597 additions & 158 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/arm/rockchip.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,11 @@ properties:
907907
- radxa,zero-3w
908908
- const: rockchip,rk3566
909909

910+
- description: Relfor SAIB board
911+
items:
912+
- const: relfor,saib
913+
- const: rockchip,rv1109
914+
910915
- description: Rikomagic MK808 v1
911916
items:
912917
- const: rikomagic,mk808

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,8 @@ patternProperties:
12301230
description: Unisoc Communications, Inc.
12311231
"^realtek,.*":
12321232
description: Realtek Semiconductor Corp.
1233+
"^relfor,.*":
1234+
description: Relfor Labs Pvt. Ltd.
12331235
"^remarkable,.*":
12341236
description: reMarkable AS
12351237
"^renesas,.*":

‎Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- rockchip,rk3576-wdt
3333
- rockchip,rk3588-wdt
3434
- rockchip,rv1108-wdt
35+
- rockchip,rv1126-wdt
3536
- const: snps,dw-wdt
3637

3738
reg:

‎arch/arm/boot/dts/rockchip/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
33
rv1108-elgin-r1.dtb \
44
rv1108-evb.dtb \
5+
rv1109-relfor-saib.dtb \
56
rv1109-sonoff-ihost.dtb \
67
rv1126-edgeble-neu2-io.dtb \
78
rv1126-sonoff-ihost.dtb \

‎arch/arm/boot/dts/rockchip/rk3036-kylin.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
};
8181
};
8282

83-
vcc_sys: vsys-regulator {
83+
vcc_sys: regulator-vsys {
8484
compatible = "regulator-fixed";
8585
regulator-name = "vcc_sys";
8686
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
reg = <0x60000000 0x40000000>;
2323
};
2424

25-
vdd_log: vdd-log {
25+
vdd_log: regulator-vdd-log {
2626
compatible = "pwm-regulator";
2727
pwms = <&pwm3 0 1000>;
2828
regulator-name = "vdd_log";
@@ -34,7 +34,7 @@
3434
status = "okay";
3535
};
3636

37-
vcc_sd0: fixed-regulator {
37+
vcc_sd0: regulator-fixed {
3838
compatible = "regulator-fixed";
3939
regulator-name = "sdmmc-supply";
4040
regulator-min-microvolt = <3000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
reg = <0x60000000 0x40000000>;
2020
};
2121

22-
vdd_log: vdd-log {
22+
vdd_log: regulator-vdd-log {
2323
compatible = "pwm-regulator";
2424
pwms = <&pwm3 0 1000>;
2525
regulator-name = "vdd_log";
@@ -31,7 +31,7 @@
3131
status = "okay";
3232
};
3333

34-
vcc_sd0: sdmmc-regulator {
34+
vcc_sd0: regulator-sdmmc {
3535
compatible = "regulator-fixed";
3636
regulator-name = "sdmmc-supply";
3737
regulator-min-microvolt = <3000000>;
@@ -41,7 +41,7 @@
4141
vin-supply = <&vcc_io>;
4242
};
4343

44-
vsys: vsys-regulator {
44+
vsys: regulator-vsys {
4545
compatible = "regulator-fixed";
4646
regulator-name = "vsys";
4747
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-mk808.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@
6161
};
6262
};
6363

64-
vcc_2v5: vcc-2v5 {
64+
vcc_2v5: regulator-vcc-2v5 {
6565
compatible = "regulator-fixed";
6666
regulator-name = "vcc_2v5";
6767
regulator-min-microvolt = <2500000>;
6868
regulator-max-microvolt = <2500000>;
6969
};
7070

71-
vcc_io: vcc-io {
71+
vcc_io: regulator-vcc-io {
7272
compatible = "regulator-fixed";
7373
regulator-name = "vcc_io";
7474
regulator-min-microvolt = <3300000>;
7575
regulator-max-microvolt = <3300000>;
7676
};
7777

78-
vcc_host: usb-host-regulator {
78+
vcc_host: regulator-usb-host {
7979
compatible = "regulator-fixed";
8080
enable-active-high;
8181
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
8989
vin-supply = <&vcc_io>;
9090
};
9191

92-
vcc_otg: usb-otg-regulator {
92+
vcc_otg: regulator-usb-otg {
9393
compatible = "regulator-fixed";
9494
enable-active-high;
9595
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -103,7 +103,7 @@
103103
vin-supply = <&vcc_io>;
104104
};
105105

106-
vcc_sd: sdmmc-regulator {
106+
vcc_sd: regulator-sdmmc {
107107
compatible = "regulator-fixed";
108108
gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
109109
pinctrl-0 = <&sdmmc_pwr>;
@@ -115,7 +115,7 @@
115115
vin-supply = <&vcc_io>;
116116
};
117117

118-
vcc_wifi: sdio-regulator {
118+
vcc_wifi: regulator-sdio {
119119
compatible = "regulator-fixed";
120120
enable-active-high;
121121
gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;

‎arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
};
4343
};
4444

45-
vdd_log: vdd-log {
45+
vdd_log: regulator-vdd-log {
4646
compatible = "pwm-regulator";
4747
pwms = <&pwm3 0 1000>;
4848
regulator-name = "vdd_log";
@@ -54,7 +54,7 @@
5454
status = "okay";
5555
};
5656

57-
vsys: vsys-regulator {
57+
vsys: regulator-vsys {
5858
compatible = "regulator-fixed";
5959
regulator-name = "vsys";
6060
regulator-min-microvolt = <5000000>;
@@ -64,7 +64,7 @@
6464
};
6565

6666
/* input for 5V_STDBY is VSYS or DC5V, selectable by jumper J4 */
67-
vcc_stdby: stdby-regulator {
67+
vcc_stdby: regulator-stdby {
6868
compatible = "regulator-fixed";
6969
regulator-name = "5v_stdby";
7070
regulator-min-microvolt = <5000000>;
@@ -73,15 +73,15 @@
7373
regulator-boot-on;
7474
};
7575

76-
vcc_emmc: emmc-regulator {
76+
vcc_emmc: regulator-emmc {
7777
compatible = "regulator-fixed";
7878
regulator-name = "emmc_vccq";
7979
regulator-min-microvolt = <3000000>;
8080
regulator-max-microvolt = <3000000>;
8181
vin-supply = <&vsys>;
8282
};
8383

84-
vcc_sata: sata-regulator {
84+
vcc_sata: regulator-sata {
8585
compatible = "regulator-fixed";
8686
enable-active-high;
8787
gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -94,7 +94,7 @@
9494
vin-supply = <&vcc_stdby>;
9595
};
9696

97-
vcc_sd: sdmmc-regulator {
97+
vcc_sd: regulator-sdmmc {
9898
compatible = "regulator-fixed";
9999
gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
100100
pinctrl-names = "default";
@@ -106,7 +106,7 @@
106106
vin-supply = <&vcc_io>;
107107
};
108108

109-
vcc_host: usb-host-regulator {
109+
vcc_host: regulator-usb-host {
110110
compatible = "regulator-fixed";
111111
enable-active-high;
112112
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -119,7 +119,7 @@
119119
vin-supply = <&vcc_stdby>;
120120
};
121121

122-
vcc_otg: usb-otg-regulator {
122+
vcc_otg: regulator-usb-otg {
123123
compatible = "regulator-fixed";
124124
enable-active-high;
125125
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

‎arch/arm/boot/dts/rockchip/rk3128-evb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
reg = <0x60000000 0x40000000>;
2525
};
2626

27-
vcc5v0_otg: vcc5v0-otg-regulator {
27+
vcc5v0_otg: regulator-vcc5v0-otg {
2828
compatible = "regulator-fixed";
2929
gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
3030
pinctrl-names = "default";
@@ -34,7 +34,7 @@
3434
regulator-max-microvolt = <5000000>;
3535
};
3636

37-
vcc5v0_host: vcc5v0-host-regulator {
37+
vcc5v0_host: regulator-vcc5v0-host {
3838
compatible = "regulator-fixed";
3939
gpio = <&gpio2 23 GPIO_ACTIVE_HIGH>;
4040
pinctrl-names = "default";

0 commit comments

Comments
 (0)