Skip to content

Commit f82c6e6

Browse files
olofjolofj
committed
Merge tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
A lot of fixes related to the dt-binding yaml conversion, power-domain additions for rk322x and rk3036 and the missing mmc aliases move to board files on rk3066/rk3188. * tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add power controller for RK322x ARM: dts: rockchip: add power controller for RK3036 ARM: dts: rockchip: add labels to the timer nodes on rk3066a ARM: dts: rockchip: fix supply properties in io-domains nodes ARM: dts: rockchip: remove #phy-cells from usbphy node rk3066/rk3188 ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2 ARM: dts: rockchip: move mmc aliases to board dts on rk3066/rk3188 ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188 ARM: dts: rockchip: rename vcc_stdby node name for rk3066a-rayeager.dts ARM: dts: rockchip: Remove more clock-names from PWM nodes ARM: dts: rockchip: add #power-domain-cells to power domain nodes ARM: dts: rockchip: Fix power-controller node names for rk3288 ARM: dts: rockchip: Fix power-controller node names for rk3188 ARM: dts: rockchip: Fix power-controller node names for rk3066a ARM: dts: rockchip: Remove useless interrupt-names on IOMMU node on rk3036 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x ARM: dts: rockchip: Fix the timer clocks order ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 ARM: dts: rockchip: Fix thermal sensor cells o rk322x Link: https://lore.kernel.org/r/2084346.irdbgypaU6@phil Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 43b3219 + 623ba75 commit f82c6e6

17 files changed

Lines changed: 295 additions & 93 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
};
391391
};
392392

393-
sleep {
393+
suspend {
394394
global_pwroff: global-pwroff {
395395
rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;
396396
};

‎arch/arm/boot/dts/rk3036.dtsi‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/pinctrl/rockchip.h>
77
#include <dt-bindings/clock/rk3036-cru.h>
88
#include <dt-bindings/soc/rockchip,boot-mode.h>
9+
#include <dt-bindings/power/rk3036-power.h>
910

1011
/ {
1112
#address-cells = <1>;
@@ -111,6 +112,7 @@
111112
assigned-clock-rates = <100000000>;
112113
clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
113114
clock-names = "bus", "core";
115+
power-domains = <&power RK3036_PD_GPU>;
114116
resets = <&cru SRST_GPU>;
115117
status = "disabled";
116118
};
@@ -124,6 +126,7 @@
124126
resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;
125127
reset-names = "axi", "ahb", "dclk";
126128
iommus = <&vop_mmu>;
129+
power-domains = <&power RK3036_PD_VIO>;
127130
status = "disabled";
128131

129132
vop_out: port {
@@ -140,13 +143,28 @@
140143
compatible = "rockchip,iommu";
141144
reg = <0x10118300 0x100>;
142145
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
143-
interrupt-names = "vop_mmu";
144146
clocks = <&cru ACLK_LCDC>, <&cru HCLK_LCDC>;
145147
clock-names = "aclk", "iface";
148+
power-domains = <&power RK3036_PD_VIO>;
146149
#iommu-cells = <0>;
147150
status = "disabled";
148151
};
149152

153+
qos_gpu: qos@1012d000 {
154+
compatible = "rockchip,rk3036-qos", "syscon";
155+
reg = <0x1012d000 0x20>;
156+
};
157+
158+
qos_vpu: qos@1012e000 {
159+
compatible = "rockchip,rk3036-qos", "syscon";
160+
reg = <0x1012e000 0x20>;
161+
};
162+
163+
qos_vio: qos@1012f000 {
164+
compatible = "rockchip,rk3036-qos", "syscon";
165+
reg = <0x1012f000 0x20>;
166+
};
167+
150168
gic: interrupt-controller@10139000 {
151169
compatible = "arm,gic-400";
152170
interrupt-controller;
@@ -302,6 +320,37 @@
302320
compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd";
303321
reg = <0x20008000 0x1000>;
304322

323+
power: power-controller {
324+
compatible = "rockchip,rk3036-power-controller";
325+
#power-domain-cells = <1>;
326+
#address-cells = <1>;
327+
#size-cells = <0>;
328+
329+
power-domain@RK3036_PD_VIO {
330+
reg = <RK3036_PD_VIO>;
331+
clocks = <&cru ACLK_LCDC>,
332+
<&cru HCLK_LCDC>,
333+
<&cru SCLK_LCDC>;
334+
pm_qos = <&qos_vio>;
335+
#power-domain-cells = <0>;
336+
};
337+
338+
power-domain@RK3036_PD_VPU {
339+
reg = <RK3036_PD_VPU>;
340+
clocks = <&cru ACLK_VCODEC>,
341+
<&cru HCLK_VCODEC>;
342+
pm_qos = <&qos_vpu>;
343+
#power-domain-cells = <0>;
344+
};
345+
346+
power-domain@RK3036_PD_GPU {
347+
reg = <RK3036_PD_GPU>;
348+
clocks = <&cru SCLK_GPU>;
349+
pm_qos = <&qos_gpu>;
350+
#power-domain-cells = <0>;
351+
};
352+
};
353+
305354
reboot-mode {
306355
compatible = "syscon-reboot-mode";
307356
offset = <0x1d8>;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
model = "bq Curie 2";
1313
compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
1414

15+
aliases {
16+
mmc0 = &mmc0;
17+
mmc1 = &mmc1;
18+
};
19+
1520
memory@60000000 {
1621
device_type = "memory";
1722
reg = <0x60000000 0x40000000>;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
model = "MarsBoard RK3066";
1111
compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
1212

13+
aliases {
14+
mmc0 = &mmc0;
15+
};
16+
1317
memory@60000000 {
1418
device_type = "memory";
1519
reg = <0x60000000 0x40000000>;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
model = "Rikomagic MK808";
1111
compatible = "rikomagic,mk808", "rockchip,rk3066a";
1212

13+
aliases {
14+
mmc0 = &mmc0;
15+
mmc1 = &mmc1;
16+
};
17+
1318
chosen {
1419
stdout-path = "serial2:115200n8";
1520
};

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
model = "Rayeager PX2";
1212
compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
1313

14+
aliases {
15+
mmc0 = &mmc0;
16+
mmc1 = &mmc1;
17+
mmc2 = &emmc;
18+
};
19+
1420
memory@60000000 {
1521
device_type = "memory";
1622
reg = <0x60000000 0x40000000>;
@@ -58,7 +64,7 @@
5864
};
5965

6066
/* input for 5V_STDBY is VSYS or DC5V, selectable by jumper J4 */
61-
vcc_stdby: 5v-stdby-regulator {
67+
vcc_stdby: stdby-regulator {
6268
compatible = "regulator-fixed";
6369
regulator-name = "5v_stdby";
6470
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rk3066a.dtsi‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<150000000>, <75000000>;
218218
};
219219

220-
timer@2000e000 {
220+
timer2: timer@2000e000 {
221221
compatible = "snps,dw-apb-timer-osc";
222222
reg = <0x2000e000 0x100>;
223223
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -238,15 +238,15 @@
238238
};
239239
};
240240

241-
timer@20038000 {
241+
timer0: timer@20038000 {
242242
compatible = "snps,dw-apb-timer-osc";
243243
reg = <0x20038000 0x100>;
244244
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
245245
clocks = <&cru SCLK_TIMER0>, <&cru PCLK_TIMER0>;
246246
clock-names = "timer", "pclk";
247247
};
248248

249-
timer@2003a000 {
249+
timer1: timer@2003a000 {
250250
compatible = "snps,dw-apb-timer-osc";
251251
reg = <0x2003a000 0x100>;
252252
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -266,30 +266,6 @@
266266
status = "disabled";
267267
};
268268

269-
usbphy: phy {
270-
compatible = "rockchip,rk3066a-usb-phy", "rockchip,rk3288-usb-phy";
271-
rockchip,grf = <&grf>;
272-
#address-cells = <1>;
273-
#size-cells = <0>;
274-
status = "disabled";
275-
276-
usbphy0: usb-phy@17c {
277-
#phy-cells = <0>;
278-
reg = <0x17c>;
279-
clocks = <&cru SCLK_OTGPHY0>;
280-
clock-names = "phyclk";
281-
#clock-cells = <0>;
282-
};
283-
284-
usbphy1: usb-phy@188 {
285-
#phy-cells = <0>;
286-
reg = <0x188>;
287-
clocks = <&cru SCLK_OTGPHY1>;
288-
clock-names = "phyclk";
289-
#clock-cells = <0>;
290-
};
291-
};
292-
293269
pinctrl: pinctrl {
294270
compatible = "rockchip,rk3066a-pinctrl";
295271
rockchip,grf = <&grf>;
@@ -702,6 +678,34 @@
702678
power-domains = <&power RK3066_PD_GPU>;
703679
};
704680

681+
&grf {
682+
compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd";
683+
684+
usbphy: usbphy {
685+
compatible = "rockchip,rk3066a-usb-phy",
686+
"rockchip,rk3288-usb-phy";
687+
#address-cells = <1>;
688+
#size-cells = <0>;
689+
status = "disabled";
690+
691+
usbphy0: usb-phy@17c {
692+
reg = <0x17c>;
693+
clocks = <&cru SCLK_OTGPHY0>;
694+
clock-names = "phyclk";
695+
#clock-cells = <0>;
696+
#phy-cells = <0>;
697+
};
698+
699+
usbphy1: usb-phy@188 {
700+
reg = <0x188>;
701+
clocks = <&cru SCLK_OTGPHY1>;
702+
clock-names = "phyclk";
703+
#clock-cells = <0>;
704+
#phy-cells = <0>;
705+
};
706+
};
707+
};
708+
705709
&i2c0 {
706710
pinctrl-names = "default";
707711
pinctrl-0 = <&i2c0_xfer>;
@@ -755,7 +759,7 @@
755759
#address-cells = <1>;
756760
#size-cells = <0>;
757761

758-
pd_vio@RK3066_PD_VIO {
762+
power-domain@RK3066_PD_VIO {
759763
reg = <RK3066_PD_VIO>;
760764
clocks = <&cru ACLK_LCDC0>,
761765
<&cru ACLK_LCDC1>,
@@ -780,21 +784,24 @@
780784
<&qos_cif1>,
781785
<&qos_ipp>,
782786
<&qos_rga>;
787+
#power-domain-cells = <0>;
783788
};
784789

785-
pd_video@RK3066_PD_VIDEO {
790+
power-domain@RK3066_PD_VIDEO {
786791
reg = <RK3066_PD_VIDEO>;
787792
clocks = <&cru ACLK_VDPU>,
788793
<&cru ACLK_VEPU>,
789794
<&cru HCLK_VDPU>,
790795
<&cru HCLK_VEPU>;
791796
pm_qos = <&qos_vpu>;
797+
#power-domain-cells = <0>;
792798
};
793799

794-
pd_gpu@RK3066_PD_GPU {
800+
power-domain@RK3066_PD_GPU {
795801
reg = <RK3066_PD_GPU>;
796802
clocks = <&cru ACLK_GPU>;
797803
pm_qos = <&qos_gpu>;
804+
#power-domain-cells = <0>;
798805
};
799806
};
800807
};

‎arch/arm/boot/dts/rk3188-bqedison2qc.dts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
model = "BQ Edison2 Quad-Core";
1414
compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188";
1515

16+
aliases {
17+
mmc0 = &mmc0;
18+
mmc1 = &mmc1;
19+
mmc2 = &emmc;
20+
};
21+
1622
memory@60000000 {
1723
device_type = "memory";
1824
reg = <0x60000000 0x80000000>;

‎arch/arm/boot/dts/rk3188-px3-evb.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
model = "Rockchip PX3-EVB";
1212
compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";
1313

14+
aliases {
15+
mmc0 = &mmc0;
16+
mmc1 = &emmc;
17+
};
18+
1419
chosen {
1520
stdout-path = "serial2:115200n8";
1621
};

‎arch/arm/boot/dts/rk3188-radxarock.dts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
model = "Radxa Rock";
1212
compatible = "radxa,rock", "rockchip,rk3188";
1313

14+
aliases {
15+
mmc0 = &mmc0;
16+
};
17+
1418
memory@60000000 {
1519
device_type = "memory";
1620
reg = <0x60000000 0x80000000>;

0 commit comments

Comments
 (0)