Skip to content

Commit 87f89ac

Browse files
arndbarndb
committed
Merge tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Pull "Rockchip dts32 updates for 4.15 part2" from Heiko Stübner: CEC support for the two rk3288-firefly variants and general hdmi support for the firefly-reload. A lot of additions and corrections for the rk3288-vyasa and thermal support for the rv1108. * tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: enable the hdmi output on the rk3288-firefly-reload ARM: dts: rockchip: define the two possible rk3288 CEC pins ARM: dts: rockchip: add the cec clk for dw-hdmi on rk3288 ARM: dts: rockchip: Add io domains for rk3288-vyasa ARM: dts: rockchip: Add usb otg for rk3288-vyasa ARM: dts: rockchip: Add usb host for rk3288-vyasa ARM: dts: rockchip: Add gmac support for rk3288-vyasa board ARM: dts: rockchip: Add regulators for rk3288-vyasa ARM: dts: rockchip: Use vmmc-supply from PMIC on rk3288-vyasa ARM: dts: rockchip: Remove vdd_log from rk808, DCDC_REG1 on rk3288-vyasa ARM: dts: rockchip: enable tsadc module on RV1108 evaluation board ARM: dts: rockchip: add thermal nodes for RV1108 SoC ARM: dts: rockchip: add tsadc node for RV1108 SoC ARM: dts: rockchip: add RGA device node for RK3288
2 parents ea7cdc0 + be84dfa commit 87f89ac

File tree

6 files changed

+270
-16
lines changed

6 files changed

+270
-16
lines changed

‎arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
regulator-name = "vdd10_lcd";
185185
regulator-min-microvolt = <1000000>;
186186
regulator-max-microvolt = <1000000>;
187+
regulator-always-on;
187188
};
188189

189190
vcca_18: REG7 {
@@ -223,6 +224,7 @@
223224
regulator-name = "vcc18_lcd";
224225
regulator-min-microvolt = <1800000>;
225226
regulator-max-microvolt = <1800000>;
227+
regulator-always-on;
226228
};
227229
};
228230
};

‎arch/arm/boot/dts/rk3288-firefly-reload.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,13 @@
226226
};
227227
};
228228

229+
&hdmi {
230+
ddc-i2c-bus = <&i2c5>;
231+
pinctrl-names = "default";
232+
pinctrl-0 = <&hdmi_cec_c0>;
233+
status = "okay";
234+
};
235+
229236
&i2c0 {
230237
hym8563: hym8563@51 {
231238
compatible = "haoyu,hym8563";
@@ -255,6 +262,10 @@
255262
};
256263
};
257264

265+
&i2c5 {
266+
status = "okay";
267+
};
268+
258269
&i2s {
259270
status = "okay";
260271
};

‎arch/arm/boot/dts/rk3288-vyasa.dts

Lines changed: 165 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,121 @@
5656
device_type = "memory";
5757
};
5858

59-
vcc_sd: sdmmc-regulator {
59+
dc12_vbat: dc12-vbat {
6060
compatible = "regulator-fixed";
61-
gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
62-
pinctrl-names = "default";
63-
pinctrl-0 = <&sdmmc_pwr>;
64-
regulator-name = "vcc_sd";
61+
regulator-name = "dc12_vbat";
62+
regulator-min-microvolt = <12000000>;
63+
regulator-max-microvolt = <12000000>;
64+
regulator-always-on;
65+
regulator-boot-on;
66+
};
67+
68+
vboot_3v3: vboot-3v3 {
69+
compatible = "regulator-fixed";
70+
regulator-name = "vboot_3v3";
6571
regulator-min-microvolt = <3300000>;
6672
regulator-max-microvolt = <3300000>;
67-
startup-delay-us = <100000>;
68-
vin-supply = <&vcc_io>;
73+
regulator-always-on;
74+
regulator-boot-on;
75+
vin-supply = <&dc12_vbat>;
6976
};
7077

7178
vcc_sys: vsys-regulator {
7279
compatible = "regulator-fixed";
7380
regulator-name = "vcc_sys";
81+
regulator-min-microvolt = <3700000>;
82+
regulator-max-microvolt = <3700000>;
83+
regulator-always-on;
84+
regulator-boot-on;
85+
vin-supply = <&dc12_vbat>;
86+
};
87+
88+
vboot_5v: vboot-5v {
89+
compatible = "regulator-fixed";
90+
regulator-name = "vboot_sv";
91+
regulator-min-microvolt = <5000000>;
92+
regulator-max-microvolt = <5000000>;
93+
regulator-always-on;
94+
regulator-boot-on;
95+
vin-supply = <&dc12_vbat>;
96+
};
97+
98+
v3g_3v3: v3g-3v3 {
99+
compatible = "regulator-fixed";
100+
regulator-name = "v3g_3v3";
101+
regulator-min-microvolt = <3300000>;
102+
regulator-max-microvolt = <3300000>;
103+
regulator-always-on;
104+
regulator-boot-on;
105+
vin-supply = <&dc12_vbat>;
106+
};
107+
108+
vsus_5v: vsus-5v {
109+
compatible = "regulator-fixed";
110+
regulator-name = "vsus_5v";
74111
regulator-min-microvolt = <5000000>;
75112
regulator-max-microvolt = <5000000>;
76113
regulator-always-on;
77114
regulator-boot-on;
115+
vin-supply = <&vcc_io>;
116+
};
117+
118+
vusb1_5v: vusb1-5v {
119+
compatible = "regulator-fixed";
120+
regulator-name = "vusb1_5v";
121+
enable-active-high;
122+
gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; /* OTG_VBUS_DRV */
123+
pinctrl-names = "default";
124+
pinctrl-0 = <&otg_vbus_drv>;
125+
regulator-min-microvolt = <5000000>;
126+
regulator-max-microvolt = <5000000>;
127+
regulator-always-on;
128+
regulator-boot-on;
129+
vin-supply = <&vsus_5v>;
130+
};
131+
132+
vusb2_5v: vusb2-5v {
133+
compatible = "regulator-fixed";
134+
regulator-name = "vusb2_5v";
135+
enable-active-high;
136+
gpio = <&gpio8 RK_PB1 GPIO_ACTIVE_HIGH>; /* USB2_PWR_EN */
137+
pinctrl-names = "default";
138+
pinctrl-0 = <&usb2_pwr_en>;
139+
regulator-min-microvolt = <5000000>;
140+
regulator-max-microvolt = <5000000>;
141+
regulator-always-on;
142+
regulator-boot-on;
143+
vin-supply = <&vsus_5v>;
144+
};
145+
146+
ext_gmac: external-gmac-clock {
147+
compatible = "fixed-clock";
148+
#clock-cells = <0>;
149+
clock-frequency = <125000000>;
150+
clock-output-names = "ext_gmac";
78151
};
79152
};
80153

81154
&cpu0 {
82155
cpu0-supply = <&vdd_cpu>;
83156
};
84157

158+
&gmac {
159+
assigned-clocks = <&cru SCLK_MAC>;
160+
assigned-clock-parents = <&ext_gmac>;
161+
clock_in_out = "input";
162+
pinctrl-names = "default";
163+
pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>;
164+
phy-supply = <&vcc_lan>;
165+
phy-mode = "rgmii";
166+
snps,reset-active-low;
167+
snps,reset-delays-us = <0 10000 1000000>;
168+
snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
169+
tx_delay = <0x30>;
170+
rx_delay = <0x10>;
171+
status = "okay";
172+
};
173+
85174
&gpu {
86175
mali-supply = <&vdd_gpu>;
87176
status = "okay";
@@ -121,8 +210,8 @@
121210
vcc12-supply = <&vcc_io>;
122211

123212
regulators {
124-
vdd_cpu: vdd_log: DCDC_REG1 {
125-
regulator-name = "vdd_log";
213+
vdd_cpu: DCDC_REG1 {
214+
regulator-name = "vdd_arm";
126215
regulator-min-microvolt = <750000>;
127216
regulator-max-microvolt = <1350000>;
128217
regulator-always-on;
@@ -260,8 +349,8 @@
260349
};
261350
};
262351

263-
vcc33_sd: SWITCH_REG1 {
264-
regulator-name = "vcc33_sd";
352+
vcc_sd: SWITCH_REG1 {
353+
regulator-name = "vcc_sd";
265354
regulator-min-microvolt = <3300000>;
266355
regulator-max-microvolt = <3300000>;
267356
regulator-always-on;
@@ -289,6 +378,21 @@
289378
status = "okay";
290379
};
291380

381+
&io_domains {
382+
status = "okay";
383+
384+
audio-supply = <&vcc_18>;
385+
bb-supply = <&vcc_io>;
386+
dvp-supply = <&vcc_io>;
387+
flash0-suuply = <&vcc_18>;
388+
flash1-supply = <&vcc_lan>;
389+
gpio30-supply = <&vcc_io>;
390+
gpio1830 = <&vcc_io>;
391+
lcdc-supply = <&vcc_io>;
392+
sdcard-supply = <&vccio_sd>;
393+
wifi-supply = <&vcc_18>;
394+
};
395+
292396
&sdmmc {
293397
bus-width = <4>;
294398
cap-mmc-highspeed;
@@ -312,6 +416,24 @@
312416
status = "okay";
313417
};
314418

419+
&usbphy {
420+
status = "okay";
421+
};
422+
423+
&usb_host0_ehci {
424+
status = "okay";
425+
};
426+
427+
&usb_host1 {
428+
pinctrl-names = "default";
429+
pinctrl-0 = <&phy_pwr_en>;
430+
status = "okay";
431+
};
432+
433+
&usb_otg {
434+
status = "okay";
435+
};
436+
315437
&vopb {
316438
status = "okay";
317439
};
@@ -333,15 +455,44 @@
333455
};
334456

335457
&pinctrl {
458+
pcfg_output_high: pcfg-output-high {
459+
output-high;
460+
};
461+
462+
gmac {
463+
phy_int: phy-int {
464+
rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
465+
};
466+
467+
phy_pmeb: phy-pmeb {
468+
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
469+
};
470+
471+
phy_rst: phy-rst {
472+
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
473+
};
474+
};
475+
336476
pmic {
337477
pmic_int: pmic-int {
338478
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
339479
};
340480
};
341481

342-
sdmmc {
343-
sdmmc_pwr: sdmmc-pwr {
344-
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
482+
usb_host {
483+
phy_pwr_en: phy-pwr-en {
484+
rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
485+
};
486+
487+
usb2_pwr_en: usb2-pwr-en {
488+
rockchip,pins = <8 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
489+
};
490+
};
491+
492+
usb_otg {
493+
otg_vbus_drv: otg-vbus-drv {
494+
rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
495+
345496
};
346497
};
347498
};

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,17 @@
972972
status = "disabled";
973973
};
974974

975+
rga: rga@ff920000 {
976+
compatible = "rockchip,rk3288-rga";
977+
reg = <0x0 0xff920000 0x0 0x180>;
978+
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
979+
clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
980+
clock-names = "aclk", "hclk", "sclk";
981+
power-domains = <&power RK3288_PD_VIO>;
982+
resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;
983+
reset-names = "core", "axi", "ahb";
984+
};
985+
975986
vopb: vop@ff930000 {
976987
compatible = "rockchip,rk3288-vop";
977988
reg = <0x0 0xff930000 0x0 0x19c>;
@@ -1167,8 +1178,8 @@
11671178
reg-io-width = <4>;
11681179
rockchip,grf = <&grf>;
11691180
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
1170-
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
1171-
clock-names = "iahb", "isfr";
1181+
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
1182+
clock-names = "iahb", "isfr", "cec";
11721183
power-domains = <&power RK3288_PD_VIO>;
11731184
status = "disabled";
11741185

@@ -1470,6 +1481,14 @@
14701481
};
14711482

14721483
hdmi {
1484+
hdmi_cec_c0: hdmi-cec-c0 {
1485+
rockchip,pins = <7 RK_PC0 RK_FUNC_2 &pcfg_pull_none>;
1486+
};
1487+
1488+
hdmi_cec_c7: hdmi-cec-c7 {
1489+
rockchip,pins = <7 RK_PC7 RK_FUNC_4 &pcfg_pull_none>;
1490+
};
1491+
14731492
hdmi_ddc: hdmi-ddc {
14741493
rockchip,pins = <7 19 RK_FUNC_2 &pcfg_pull_none>,
14751494
<7 20 RK_FUNC_2 &pcfg_pull_none>;

‎arch/arm/boot/dts/rv1108-evb.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@
222222
status = "okay";
223223
};
224224

225+
&tsadc {
226+
status = "okay";
227+
};
228+
225229
&u2phy {
226230
status = "okay";
227231

0 commit comments

Comments
 (0)