Skip to content

Commit 73d1774

Browse files
olofjolofj
committed
Merge tag 'v5.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
A lot of dt-yaml related fixes; PCIe, USB and pwm-fans for Helios64; Display rotation and audio codec for the Odroid Go Advance; IR, spdif and usb-c support for rk3399-firefly; USB support for rk3308 and some rk3328 boards and setting the PCIe link speed to actually only supported speed on rk3399. * tag 'v5.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (30 commits) arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for rk3399-roc-pc arm64: dts: rockchip: Re-add regulator-boot-on, regulator-always-on for vdd_gpu on rk3399-roc-pc arm64: dts: rockchip: add ir-receiver for rk3399-roc-pc arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly arm64: dts: rockchip: Sort rk3399 firefly pinmux entries arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly arm64: dts: rockchip: add SPDIF node for rk3399-firefly arm64: dts: rockchip: Add Rotation Property for OGA Panel arm64: dts: rockchip: Add support for USB on helios64 arm64: dts: rockchip: add USB support to rk3308.dtsi arm64: dts: rockchip: rename nodename for phy-rockchip-inno-usb2 arm64: dts: rockchip: add rk817 codec to Odroid Go arm64: dts: rename grf-gpio nodename in rk3328.dtsi arm64: dts: rockchip: Add support for PCIe on helios64 arm64: dts: rockchip: Add support for two PWM fans on helios64 arm64: dts: rockchip: fix regulator-gpio states array arm64: dts: rockchip: add #power-domain-cells to power domain nodes arm64: dts: rockchip: Fix power-controller node names for rk3399 arm64: dts: rockchip: Fix power-controller node names for rk3328 arm64: dts: rockchip: Fix power-controller node names for px30 ... Link: https://lore.kernel.org/r/2796982.e9J7NaK4W3@phil Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents f82c6e6 + eb607cd commit 73d1774

20 files changed

Lines changed: 515 additions & 76 deletions

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -244,28 +244,31 @@
244244
#size-cells = <0>;
245245

246246
/* These power domains are grouped by VD_LOGIC */
247-
pd_usb@PX30_PD_USB {
247+
power-domain@PX30_PD_USB {
248248
reg = <PX30_PD_USB>;
249249
clocks = <&cru HCLK_HOST>,
250250
<&cru HCLK_OTG>,
251251
<&cru SCLK_OTG_ADP>;
252252
pm_qos = <&qos_usb_host>, <&qos_usb_otg>;
253+
#power-domain-cells = <0>;
253254
};
254-
pd_sdcard@PX30_PD_SDCARD {
255+
power-domain@PX30_PD_SDCARD {
255256
reg = <PX30_PD_SDCARD>;
256257
clocks = <&cru HCLK_SDMMC>,
257258
<&cru SCLK_SDMMC>;
258259
pm_qos = <&qos_sdmmc>;
260+
#power-domain-cells = <0>;
259261
};
260-
pd_gmac@PX30_PD_GMAC {
262+
power-domain@PX30_PD_GMAC {
261263
reg = <PX30_PD_GMAC>;
262264
clocks = <&cru ACLK_GMAC>,
263265
<&cru PCLK_GMAC>,
264266
<&cru SCLK_MAC_REF>,
265267
<&cru SCLK_GMAC_RX_TX>;
266268
pm_qos = <&qos_gmac>;
269+
#power-domain-cells = <0>;
267270
};
268-
pd_mmc_nand@PX30_PD_MMC_NAND {
271+
power-domain@PX30_PD_MMC_NAND {
269272
reg = <PX30_PD_MMC_NAND>;
270273
clocks = <&cru HCLK_NANDC>,
271274
<&cru HCLK_EMMC>,
@@ -277,15 +280,17 @@
277280
<&cru SCLK_SFC>;
278281
pm_qos = <&qos_emmc>, <&qos_nand>,
279282
<&qos_sdio>, <&qos_sfc>;
283+
#power-domain-cells = <0>;
280284
};
281-
pd_vpu@PX30_PD_VPU {
285+
power-domain@PX30_PD_VPU {
282286
reg = <PX30_PD_VPU>;
283287
clocks = <&cru ACLK_VPU>,
284288
<&cru HCLK_VPU>,
285289
<&cru SCLK_CORE_VPU>;
286290
pm_qos = <&qos_vpu>, <&qos_vpu_r128>;
291+
#power-domain-cells = <0>;
287292
};
288-
pd_vo@PX30_PD_VO {
293+
power-domain@PX30_PD_VO {
289294
reg = <PX30_PD_VO>;
290295
clocks = <&cru ACLK_RGA>,
291296
<&cru ACLK_VOPB>,
@@ -300,8 +305,9 @@
300305
<&cru SCLK_VOPB_PWM>;
301306
pm_qos = <&qos_rga_rd>, <&qos_rga_wr>,
302307
<&qos_vop_m0>, <&qos_vop_m1>;
308+
#power-domain-cells = <0>;
303309
};
304-
pd_vi@PX30_PD_VI {
310+
power-domain@PX30_PD_VI {
305311
reg = <PX30_PD_VI>;
306312
clocks = <&cru ACLK_CIF>,
307313
<&cru ACLK_ISP>,
@@ -311,11 +317,13 @@
311317
pm_qos = <&qos_isp_128>, <&qos_isp_rd>,
312318
<&qos_isp_wr>, <&qos_isp_m1>,
313319
<&qos_vip>;
320+
#power-domain-cells = <0>;
314321
};
315-
pd_gpu@PX30_PD_GPU {
322+
power-domain@PX30_PD_GPU {
316323
reg = <PX30_PD_GPU>;
317324
clocks = <&cru SCLK_GPU>;
318325
pm_qos = <&qos_gpu>;
326+
#power-domain-cells = <0>;
319327
};
320328
};
321329
};
@@ -814,7 +822,7 @@
814822
#address-cells = <1>;
815823
#size-cells = <1>;
816824

817-
u2phy: usb2-phy@100 {
825+
u2phy: usb2phy@100 {
818826
compatible = "rockchip,px30-usb2phy";
819827
reg = <0x100 0x20>;
820828
clocks = <&pmucru SCLK_USBPHY_REF>;
@@ -1087,7 +1095,6 @@
10871095
compatible = "rockchip,iommu";
10881096
reg = <0x0 0xff460f00 0x0 0x100>;
10891097
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
1090-
interrupt-names = "vopb_mmu";
10911098
clocks = <&cru ACLK_VOPB>, <&cru HCLK_VOPB>;
10921099
clock-names = "aclk", "iface";
10931100
power-domains = <&power PX30_PD_VO>;
@@ -1128,7 +1135,6 @@
11281135
compatible = "rockchip,iommu";
11291136
reg = <0x0 0xff470f00 0x0 0x100>;
11301137
interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
1131-
interrupt-names = "vopl_mmu";
11321138
clocks = <&cru ACLK_VOPL>, <&cru HCLK_VOPL>;
11331139
clock-names = "aclk", "iface";
11341140
power-domains = <&power PX30_PD_VO>;

‎arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
regulator-min-microvolt = <1800000>;
8585
regulator-max-microvolt = <3300000>;
8686
gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
87-
states = <1800000 0x0
88-
3300000 0x1>;
87+
states = <1800000 0x0>,
88+
<3300000 0x1>;
8989
vin-supply = <&vcc5v0_sys>;
9090
};
9191

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

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164

165165
grf: grf@ff000000 {
166166
compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd";
167-
reg = <0x0 0xff000000 0x0 0x10000>;
167+
reg = <0x0 0xff000000 0x0 0x08000>;
168168

169169
reboot-mode {
170170
compatible = "syscon-reboot-mode";
@@ -177,6 +177,42 @@
177177
};
178178
};
179179

180+
usb2phy_grf: syscon@ff008000 {
181+
compatible = "rockchip,rk3308-usb2phy-grf", "syscon", "simple-mfd";
182+
reg = <0x0 0xff008000 0x0 0x4000>;
183+
#address-cells = <1>;
184+
#size-cells = <1>;
185+
186+
u2phy: usb2phy@100 {
187+
compatible = "rockchip,rk3308-usb2phy";
188+
reg = <0x100 0x10>;
189+
assigned-clocks = <&cru USB480M>;
190+
assigned-clock-parents = <&u2phy>;
191+
clocks = <&cru SCLK_USBPHY_REF>;
192+
clock-names = "phyclk";
193+
clock-output-names = "usb480m_phy";
194+
#clock-cells = <0>;
195+
status = "disabled";
196+
197+
u2phy_otg: otg-port {
198+
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
199+
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
200+
<GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
201+
interrupt-names = "otg-bvalid", "otg-id",
202+
"linestate";
203+
#phy-cells = <0>;
204+
status = "disabled";
205+
};
206+
207+
u2phy_host: host-port {
208+
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
209+
interrupt-names = "linestate";
210+
#phy-cells = <0>;
211+
status = "disabled";
212+
};
213+
};
214+
};
215+
180216
detect_grf: syscon@ff00b000 {
181217
compatible = "rockchip,rk3308-detect-grf", "syscon", "simple-mfd";
182218
reg = <0x0 0xff00b000 0x0 0x1000>;
@@ -579,6 +615,42 @@
579615
status = "disabled";
580616
};
581617

618+
usb20_otg: usb@ff400000 {
619+
compatible = "rockchip,rk3308-usb", "rockchip,rk3066-usb",
620+
"snps,dwc2";
621+
reg = <0x0 0xff400000 0x0 0x40000>;
622+
interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
623+
clocks = <&cru HCLK_OTG>;
624+
clock-names = "otg";
625+
dr_mode = "otg";
626+
g-np-tx-fifo-size = <16>;
627+
g-rx-fifo-size = <280>;
628+
g-tx-fifo-size = <256 128 128 64 32 16>;
629+
phys = <&u2phy_otg>;
630+
phy-names = "usb2-phy";
631+
status = "disabled";
632+
};
633+
634+
usb_host_ehci: usb@ff440000 {
635+
compatible = "generic-ehci";
636+
reg = <0x0 0xff440000 0x0 0x10000>;
637+
interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
638+
clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>;
639+
phys = <&u2phy_host>;
640+
phy-names = "usb";
641+
status = "disabled";
642+
};
643+
644+
usb_host_ohci: usb@ff450000 {
645+
compatible = "generic-ohci";
646+
reg = <0x0 0xff450000 0x0 0x10000>;
647+
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
648+
clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>;
649+
phys = <&u2phy_host>;
650+
phy-names = "usb";
651+
status = "disabled";
652+
};
653+
582654
sdmmc: mmc@ff480000 {
583655
compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
584656
reg = <0x0 0xff480000 0x0 0x4000>;

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,31 @@
165165
};
166166
};
167167

168+
rk817-sound {
169+
compatible = "simple-audio-card";
170+
simple-audio-card,name = "Analog";
171+
simple-audio-card,format = "i2s";
172+
simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
173+
simple-audio-card,mclk-fs = <256>;
174+
simple-audio-card,widgets =
175+
"Microphone", "Mic Jack",
176+
"Headphone", "Headphones",
177+
"Speaker", "Speaker";
178+
simple-audio-card,routing =
179+
"MICL", "Mic Jack",
180+
"Headphones", "HPOL",
181+
"Headphones", "HPOR",
182+
"Speaker", "SPKO";
183+
184+
simple-audio-card,codec {
185+
sound-dai = <&rk817>;
186+
};
187+
188+
simple-audio-card,cpu {
189+
sound-dai = <&i2s1_2ch>;
190+
};
191+
};
192+
168193
vccsys: vccsys {
169194
compatible = "regulator-fixed";
170195
regulator-name = "vcc3v8_sys";
@@ -239,6 +264,7 @@
239264
backlight = <&backlight>;
240265
iovcc-supply = <&vcc_lcd>;
241266
reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
267+
rotation = <270>;
242268
vdd-supply = <&vcc_lcd>;
243269

244270
port {
@@ -269,11 +295,14 @@
269295
reg = <0x20>;
270296
interrupt-parent = <&gpio0>;
271297
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
298+
clock-output-names = "rk808-clkout1", "xin32k";
299+
clock-names = "mclk";
300+
clocks = <&cru SCLK_I2S1_OUT>;
272301
pinctrl-names = "default";
273-
pinctrl-0 = <&pmic_int>;
302+
pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
274303
wakeup-source;
275304
#clock-cells = <1>;
276-
clock-output-names = "rk808-clkout1", "xin32k";
305+
#sound-dai-cells = <0>;
277306

278307
vcc1-supply = <&vccsys>;
279308
vcc2-supply = <&vccsys>;
@@ -432,6 +461,10 @@
432461
};
433462
};
434463
};
464+
465+
rk817_codec: codec {
466+
rockchip,mic-in-differential;
467+
};
435468
};
436469
};
437470

‎arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
1515

1616
aliases {
17+
ethernet1 = &rtl8153;
1718
mmc0 = &sdmmc;
1819
};
1920

@@ -76,8 +77,8 @@
7677
regulator-settling-time-us = <5000>;
7778
regulator-type = "voltage";
7879
startup-delay-us = <2000>;
79-
states = <1800000 0x1
80-
3300000 0x0>;
80+
states = <1800000 0x1>,
81+
<3300000 0x0>;
8182
vin-supply = <&vcc_io_33>;
8283
};
8384

@@ -101,6 +102,18 @@
101102
regulator-min-microvolt = <5000000>;
102103
regulator-max-microvolt = <5000000>;
103104
};
105+
106+
vdd_5v_lan: vdd-5v-lan {
107+
compatible = "regulator-fixed";
108+
enable-active-high;
109+
gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
110+
pinctrl-0 = <&lan_vdd_pin>;
111+
pinctrl-names = "default";
112+
regulator-name = "vdd_5v_lan";
113+
regulator-always-on;
114+
regulator-boot-on;
115+
vin-supply = <&vdd_5v>;
116+
};
104117
};
105118

106119
&cpu0 {
@@ -309,6 +322,12 @@
309322
};
310323
};
311324

325+
lan {
326+
lan_vdd_pin: lan-vdd-pin {
327+
rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
328+
};
329+
};
330+
312331
pmic {
313332
pmic_int_l: pmic-int-l {
314333
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -368,6 +387,19 @@
368387
dr_mode = "host";
369388
};
370389

390+
&usbdrd3 {
391+
dr_mode = "host";
392+
status = "okay";
393+
#address-cells = <1>;
394+
#size-cells = <0>;
395+
396+
/* Second port is for USB 3.0 */
397+
rtl8153: device@2 {
398+
compatible = "usbbda,8153";
399+
reg = <2>;
400+
};
401+
};
402+
371403
&usb_host0_ehci {
372404
status = "okay";
373405
};

‎arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
vcc_sdio: sdmmcio-regulator {
5151
compatible = "regulator-gpio";
5252
gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
53-
states = <1800000 0x1
54-
3300000 0x0>;
53+
states = <1800000 0x1>,
54+
<3300000 0x0>;
5555
regulator-name = "vcc_sdio";
5656
regulator-type = "voltage";
5757
regulator-min-microvolt = <1800000>;
@@ -363,6 +363,11 @@
363363
status = "okay";
364364
};
365365

366+
&usbdrd3 {
367+
dr_mode = "host";
368+
status = "okay";
369+
};
370+
366371
&usb_host0_ehci {
367372
status = "okay";
368373
};

‎arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@
177177
};
178178

179179
&gmac2phy {
180-
pinctrl-names = "default";
181-
pinctrl-0 = <&fephyled_linkm1>, <&fephyled_rxm1>;
182180
status = "okay";
183181
};
184182

@@ -382,6 +380,11 @@
382380
status = "okay";
383381
};
384382

383+
&usbdrd3 {
384+
dr_mode = "host";
385+
status = "okay";
386+
};
387+
385388
&usb_host0_ehci {
386389
status = "okay";
387390
};

0 commit comments

Comments
 (0)