Skip to content

Commit 835c0d9

Browse files
arndbarndb
committed
Merge tag 'v5.19-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
New peripherals supported on rk356x: sfc, usb3, sata and the video-decoder on rk3328. RK3399 received some improvements and nodes for the memory controller. Additional peripherals for PineNote, Gru and BananaPi-R2-Pro. New boards are the Firefly Station M2, Pine64 SoQuartz SOM and Quartz64 model B as well as the Radxa Rock3 model A. * tag 'v5.19-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (32 commits) arm64: dts: rockchip: enable otg/drd operation of usb_host0_xhci in rk356x arm64: dts: rockchip: rename HDMI ref clock to 'ref' on rk3399 arm64: dts: rockchip: add dts for Firefly Station M2 rk3566 arm64: dts: rockchip: add SoQuartz CM4IO dts arm64: dts: rockchip: add Pine64 Quartz64-B device tree dt-bindings: arm: rockchip: Add Firefly Station M2 dt-bindings: arm: rockchip: Add Pine64 SoQuartz SoM dt-bindings: arm: rockchip: Add Pine64 Quartz64 Model B arm64: dts: rockchip: enable usb hub on the radxa rock3 model a arm64: dts: rockchip: add usb3 support to the radxa rock3 model a arm64: dts: rockchip: add rk356x sfc support arm64: dts: rockchip: Add USB and TCPC to rk3566-pinenote arm64: dts: rockchip: Add accelerometer to rk3566-pinenote arm64: dts: rockchip: add an input enable pinconf to rk3399 arm64: dts: rockchip: Add vdec support for RK3328 arm64: dts: rockchip: Rename vdec_mmu node for RK3328 arm64: dts: rockchip: Enable dmc and dfi nodes on gru arm64: dts: rockchip: Add dfi and dmc nodes to rk3399 arm64: dts: rockchip: add clocks property to cru nodes rk3399 arm64: dts: rockchip: use generic node name for pmucru on rk3399 ... Link: https://lore.kernel.org/r/7748558.DvuYhMxLoT@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 18176b9 + bc405bb commit 835c0d9

29 files changed

+3096
-18
lines changed

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ properties:
133133
- firefly,roc-rk3399-pc-plus
134134
- const: rockchip,rk3399
135135

136+
- description: Firefly Station M2
137+
items:
138+
- const: firefly,rk3566-roc-pc
139+
- const: rockchip,rk3566
140+
136141
- description: FriendlyElec NanoPi R2S
137142
items:
138143
- const: friendlyarm,nanopi-r2s
@@ -502,9 +507,18 @@ properties:
502507
- const: pine64,rockpro64
503508
- const: rockchip,rk3399
504509

505-
- description: Pine64 Quartz64 Model A
510+
- description: Pine64 Quartz64 Model A/B
506511
items:
507-
- const: pine64,quartz64-a
512+
- enum:
513+
- pine64,quartz64-a
514+
- pine64,quartz64-b
515+
- const: rockchip,rk3566
516+
517+
- description: Pine64 SoQuartz SoM
518+
items:
519+
- enum:
520+
- pine64,soquartz-cm4io
521+
- const: pine64,soquartz
508522
- const: rockchip,rk3566
509523

510524
- description: Radxa Rock
@@ -545,6 +559,11 @@ properties:
545559
- const: radxa,rock2-square
546560
- const: rockchip,rk3288
547561

562+
- description: Radxa ROCK3 Model A
563+
items:
564+
- const: radxa,rock3a
565+
- const: rockchip,rk3568
566+
548567
- description: Rikomagic MK808 v1
549568
items:
550569
- const: rikomagic,mk808

‎arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
5959
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
6060
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
6161
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
62-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
62+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
63+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
64+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
6365
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
66+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
67+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,10 @@
306306
};
307307
power-domain@RK3328_PD_VIDEO {
308308
reg = <RK3328_PD_VIDEO>;
309+
clocks = <&cru ACLK_RKVDEC>,
310+
<&cru HCLK_RKVDEC>,
311+
<&cru SCLK_VDEC_CABAC>,
312+
<&cru SCLK_VDEC_CORE>;
309313
#power-domain-cells = <0>;
310314
};
311315
power-domain@RK3328_PD_VPU {
@@ -660,14 +664,28 @@
660664
power-domains = <&power RK3328_PD_VPU>;
661665
};
662666

663-
rkvdec_mmu: iommu@ff360480 {
667+
vdec: video-codec@ff360000 {
668+
compatible = "rockchip,rk3328-vdec", "rockchip,rk3399-vdec";
669+
reg = <0x0 0xff360000 0x0 0x400>;
670+
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
671+
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
672+
<&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
673+
clock-names = "axi", "ahb", "cabac", "core";
674+
assigned-clocks = <&cru ACLK_RKVDEC>, <&cru SCLK_VDEC_CABAC>,
675+
<&cru SCLK_VDEC_CORE>;
676+
assigned-clock-rates = <400000000>, <400000000>, <300000000>;
677+
iommus = <&vdec_mmu>;
678+
power-domains = <&power RK3328_PD_VIDEO>;
679+
};
680+
681+
vdec_mmu: iommu@ff360480 {
664682
compatible = "rockchip,iommu";
665683
reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>;
666684
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
667685
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
668686
clock-names = "aclk", "iface";
669687
#iommu-cells = <0>;
670-
status = "disabled";
688+
power-domains = <&power RK3328_PD_VIDEO>;
671689
};
672690

673691
vop: vop@ff370000 {

‎arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/dts-v1/;
77
#include <dt-bindings/input/linux-event-codes.h>
8+
#include <dt-bindings/interrupt-controller/irq.h>
89
#include <dt-bindings/pwm/pwm.h>
910
#include <dt-bindings/usb/pd.h>
1011
#include "rk3399.dtsi"
@@ -786,7 +787,7 @@
786787
reg = <1>;
787788
compatible = "brcm,bcm4329-fmac";
788789
interrupt-parent = <&gpio0>;
789-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
790+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
790791
interrupt-names = "host-wake";
791792
brcm,drive-strength = <5>;
792793
pinctrl-names = "default";

‎arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,13 @@
234234
extcon = <&usbc_extcon0>, <&usbc_extcon1>;
235235
};
236236

237+
&dmc {
238+
center-supply = <&ppvar_centerlogic>;
239+
rockchip,pd-idle-dis-freq-hz = <800000000>;
240+
rockchip,sr-idle-dis-freq-hz = <800000000>;
241+
rockchip,sr-mc-gate-idle-dis-freq-hz = <800000000>;
242+
};
243+
237244
&edp {
238245
status = "okay";
239246

‎arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,18 @@ camera: &i2c7 {
391391
<400000000>;
392392
};
393393

394+
/* The center supply is fixed to .9V on scarlet */
395+
&dmc {
396+
center-supply = <&pp900_s0>;
397+
};
398+
399+
/* We don't need .925 V for 928 MHz on scarlet */
400+
&dmc_opp_table {
401+
opp03 {
402+
opp-microvolt = <900000>;
403+
};
404+
};
405+
394406
&gpio0 {
395407
gpio-line-names = /* GPIO0 A 0-7 */
396408
"CLK_32K_AP",

‎arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,34 @@
373373
<200000000>;
374374
};
375375

376+
&dfi {
377+
status = "okay";
378+
};
379+
380+
&dmc {
381+
status = "okay";
382+
383+
rockchip,pd-idle-ns = <160>;
384+
rockchip,sr-idle-ns = <10240>;
385+
rockchip,sr-mc-gate-idle-ns = <40960>;
386+
rockchip,srpd-lite-idle-ns = <61440>;
387+
rockchip,standby-idle-ns = <81920>;
388+
389+
rockchip,ddr3_odt_dis_freq = <666000000>;
390+
rockchip,lpddr3_odt_dis_freq = <666000000>;
391+
rockchip,lpddr4_odt_dis_freq = <666000000>;
392+
393+
rockchip,sr-mc-gate-idle-dis-freq-hz = <1000000000>;
394+
rockchip,srpd-lite-idle-dis-freq-hz = <0>;
395+
rockchip,standby-idle-dis-freq-hz = <928000000>;
396+
};
397+
398+
&dmc_opp_table {
399+
opp03 {
400+
opp-suspend;
401+
};
402+
};
403+
376404
&emmc_phy {
377405
status = "okay";
378406
};

‎arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/dts-v1/;
33
#include <dt-bindings/pwm/pwm.h>
44
#include <dt-bindings/input/input.h>
5+
#include <dt-bindings/interrupt-controller/irq.h>
56
#include "rk3399.dtsi"
67
#include "rk3399-opp.dtsi"
78

@@ -629,7 +630,7 @@
629630
compatible = "brcm,bcm4329-fmac";
630631
reg = <1>;
631632
interrupt-parent = <&gpio0>;
632-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
633+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
633634
interrupt-names = "host-wake";
634635
pinctrl-names = "default";
635636
pinctrl-0 = <&wifi_host_wake_l>;

‎arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
/dts-v1/;
88
#include <dt-bindings/input/linux-event-codes.h>
9+
#include <dt-bindings/interrupt-controller/irq.h>
910
#include <dt-bindings/pwm/pwm.h>
1011
#include "rk3399.dtsi"
1112
#include "rk3399-opp.dtsi"
@@ -682,7 +683,7 @@
682683
reg = <1>;
683684
compatible = "brcm,bcm4329-fmac";
684685
interrupt-parent = <&gpio0>;
685-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
686+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
686687
interrupt-names = "host-wake";
687688
brcm,drive-strength = <5>;
688689
pinctrl-names = "default";

‎arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/dts-v1/;
77
#include <dt-bindings/input/linux-event-codes.h>
8+
#include <dt-bindings/interrupt-controller/irq.h>
89
#include <dt-bindings/pwm/pwm.h>
910
#include "rk3399.dtsi"
1011
#include "rk3399-opp.dtsi"
@@ -509,7 +510,7 @@
509510
compatible = "brcm,bcm4329-fmac";
510511
reg = <1>;
511512
interrupt-parent = <&gpio0>;
512-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
513+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
513514
interrupt-names = "host-wake";
514515
pinctrl-names = "default";
515516
pinctrl-0 = <&wifi_host_wake_l>;

0 commit comments

Comments
 (0)