Skip to content

Commit bb4544c

Browse files
arndbarndb
committed
Merge tag 'v5.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
io-domains for rk3188 and rv1108, sfc (flash) support fpr rv1108 and some cleanups. * tag 'v5.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: Add SFC to RV1108 ARM: dts: rockchip: add io-domains nodes to rv1108.dtsi ARM: dts: rockchip: add io-domains node to rk3188.dtsi ARM: dts: rockchip: remove interrupt-names from iommu nodes ARM: dts: rockchip: rename timer compatible strings for rk3066a ARM: dts: rockchip: add space after &grf on rk3188 ARM: dts: rockchip: rename pcfg_* nodenames for rk3066/rk3188 Link: https://lore.kernel.org/r/4142796.VLH7GnMWUR@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents c4d3928 + 9d50882 commit bb4544c

4 files changed

Lines changed: 62 additions & 16 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
};
219219

220220
timer2: timer@2000e000 {
221-
compatible = "snps,dw-apb-timer-osc";
221+
compatible = "snps,dw-apb-timer";
222222
reg = <0x2000e000 0x100>;
223223
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
224224
clocks = <&cru SCLK_TIMER2>, <&cru PCLK_TIMER2>;
@@ -239,15 +239,15 @@
239239
};
240240

241241
timer0: timer@20038000 {
242-
compatible = "snps,dw-apb-timer-osc";
242+
compatible = "snps,dw-apb-timer";
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

249249
timer1: timer@2003a000 {
250-
compatible = "snps,dw-apb-timer-osc";
250+
compatible = "snps,dw-apb-timer";
251251
reg = <0x2003a000 0x100>;
252252
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
253253
clocks = <&cru SCLK_TIMER1>, <&cru PCLK_TIMER1>;
@@ -351,11 +351,11 @@
351351
#interrupt-cells = <2>;
352352
};
353353

354-
pcfg_pull_default: pcfg_pull_default {
354+
pcfg_pull_default: pcfg-pull-default {
355355
bias-pull-pin-default;
356356
};
357357

358-
pcfg_pull_none: pcfg_pull_none {
358+
pcfg_pull_none: pcfg-pull-none {
359359
bias-disable;
360360
};
361361

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@
275275
#interrupt-cells = <2>;
276276
};
277277

278-
pcfg_pull_up: pcfg_pull_up {
278+
pcfg_pull_up: pcfg-pull-up {
279279
bias-pull-up;
280280
};
281281

282-
pcfg_pull_down: pcfg_pull_down {
282+
pcfg_pull_down: pcfg-pull-down {
283283
bias-pull-down;
284284
};
285285

286-
pcfg_pull_none: pcfg_pull_none {
286+
pcfg_pull_none: pcfg-pull-none {
287287
bias-disable;
288288
};
289289

@@ -638,9 +638,14 @@
638638
power-domains = <&power RK3188_PD_GPU>;
639639
};
640640

641-
&grf{
641+
&grf {
642642
compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd";
643643

644+
io_domains: io-domains {
645+
compatible = "rockchip,rk3188-io-voltage-domain";
646+
status = "disabled";
647+
};
648+
644649
usbphy: usbphy {
645650
compatible = "rockchip,rk3188-usb-phy",
646651
"rockchip,rk3288-usb-phy";

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,6 @@
987987
compatible = "rockchip,iommu";
988988
reg = <0x0 0xff900800 0x0 0x40>;
989989
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
990-
interrupt-names = "iep_mmu";
991990
clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
992991
clock-names = "aclk", "iface";
993992
#iommu-cells = <0>;
@@ -998,7 +997,6 @@
998997
compatible = "rockchip,iommu";
999998
reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
1000999
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
1001-
interrupt-names = "isp_mmu";
10021000
clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
10031001
clock-names = "aclk", "iface";
10041002
#iommu-cells = <0>;
@@ -1059,7 +1057,6 @@
10591057
compatible = "rockchip,iommu";
10601058
reg = <0x0 0xff930300 0x0 0x100>;
10611059
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
1062-
interrupt-names = "vopb_mmu";
10631060
clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
10641061
clock-names = "aclk", "iface";
10651062
power-domains = <&power RK3288_PD_VIO>;
@@ -1109,7 +1106,6 @@
11091106
compatible = "rockchip,iommu";
11101107
reg = <0x0 0xff940300 0x0 0x100>;
11111108
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
1112-
interrupt-names = "vopl_mmu";
11131109
clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
11141110
clock-names = "aclk", "iface";
11151111
power-domains = <&power RK3288_PD_VIO>;
@@ -1252,7 +1248,6 @@
12521248
compatible = "rockchip,iommu";
12531249
reg = <0x0 0xff9a0800 0x0 0x100>;
12541250
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
1255-
interrupt-names = "vpu_mmu";
12561251
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
12571252
clock-names = "aclk", "iface";
12581253
#iommu-cells = <0>;
@@ -1263,7 +1258,6 @@
12631258
compatible = "rockchip,iommu";
12641259
reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
12651260
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
1266-
interrupt-names = "hevc_mmu";
12671261
clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
12681262
clock-names = "aclk", "iface";
12691263
#iommu-cells = <0>;

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
#address-cells = <1>;
266266
#size-cells = <1>;
267267

268+
io_domains: io-domains {
269+
compatible = "rockchip,rv1108-io-voltage-domain";
270+
status = "disabled";
271+
};
272+
268273
u2phy: usb2phy@100 {
269274
compatible = "rockchip,rv1108-usb2phy";
270275
reg = <0x100 0x0c>;
@@ -434,8 +439,13 @@
434439
};
435440

436441
pmugrf: syscon@20060000 {
437-
compatible = "rockchip,rv1108-pmugrf", "syscon";
442+
compatible = "rockchip,rv1108-pmugrf", "syscon", "simple-mfd";
438443
reg = <0x20060000 0x1000>;
444+
445+
pmu_io_domains: io-domains {
446+
compatible = "rockchip,rv1108-pmu-io-voltage-domain";
447+
status = "disabled";
448+
};
439449
};
440450

441451
usbgrf: syscon@202a0000 {
@@ -536,6 +546,17 @@
536546
status = "disabled";
537547
};
538548

549+
sfc: spi@301c0000 {
550+
compatible = "rockchip,sfc";
551+
reg = <0x301c0000 0x4000>;
552+
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
553+
clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>;
554+
clock-names = "clk_sfc", "hclk_sfc";
555+
pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus4>;
556+
pinctrl-names = "default";
557+
status = "disabled";
558+
};
559+
539560
gmac: eth@30200000 {
540561
compatible = "rockchip,rv1108-gmac";
541562
reg = <0x30200000 0x10000>;
@@ -704,6 +725,32 @@
704725
};
705726
};
706727

728+
sfc {
729+
sfc_bus4: sfc-bus4 {
730+
rockchip,pins =
731+
<2 RK_PA0 3 &pcfg_pull_none>,
732+
<2 RK_PA1 3 &pcfg_pull_none>,
733+
<2 RK_PA2 3 &pcfg_pull_none>,
734+
<2 RK_PA3 3 &pcfg_pull_none>;
735+
};
736+
737+
sfc_bus2: sfc-bus2 {
738+
rockchip,pins =
739+
<2 RK_PA0 3 &pcfg_pull_none>,
740+
<2 RK_PA1 3 &pcfg_pull_none>;
741+
};
742+
743+
sfc_cs0: sfc-cs0 {
744+
rockchip,pins =
745+
<2 RK_PB4 3 &pcfg_pull_none>;
746+
};
747+
748+
sfc_clk: sfc-clk {
749+
rockchip,pins =
750+
<2 RK_PB7 2 &pcfg_pull_none>;
751+
};
752+
};
753+
707754
gmac {
708755
rmii_pins: rmii-pins {
709756
rockchip,pins = <1 RK_PC5 2 &pcfg_pull_none>,

0 commit comments

Comments
 (0)