Skip to content

Commit 4100145

Browse files
arndbarndb
committed
Merge tag 'v6.14-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into HEAD
Fixes for the IOMMU used together with the PCIe controllers on rk3588, some board-level fixes for wrong pins, pinctrl and regulators, and disabling DMA on a board where the DMA+uart causes the dma controller to hang, as well as improved network stability for the OrangePi R1. * tag 'v6.14-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: adjust SMMU interrupt type on rk3588 arm64: dts: rockchip: disable IOMMU when running rk3588 in PCIe endpoint mode dt-bindings: rockchip: pmu: Ensure all properties are defined arm64: dts: rockchip: Fix lcdpwr_en pin for Cool Pi GenBook arm64: dts: rockchip: fix fixed-regulator renames on rk3399-gru devices arm64: dts: rockchip: Disable DMA for uart5 on px30-ringneck arm64: dts: rockchip: Move uart5 pin configuration to px30 ringneck SoM arm64: dts: rockchip: change eth phy mode to rgmii-id for orangepi r1 plus lts arm64: dts: rockchip: Fix broken tsadc pinctrl names for rk3588 Link: https://lore.kernel.org/r/3004814.3ZeAukHxDK@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a64dcfb + 8546cfd commit 4100145

13 files changed

Lines changed: 50 additions & 37 deletions

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ properties:
5353
reg:
5454
maxItems: 1
5555

56+
power-controller:
57+
type: object
58+
59+
reboot-mode:
60+
type: object
61+
5662
required:
5763
- compatible
5864
- reg
5965

60-
additionalProperties: true
66+
additionalProperties: false
6167

6268
examples:
6369
- |

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
};
227227

228228
&uart5 {
229-
pinctrl-0 = <&uart5_xfer>;
230229
rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
231230
status = "okay";
232231
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,12 @@
396396
status = "okay";
397397
};
398398

399+
&uart5 {
400+
/delete-property/ dmas;
401+
/delete-property/ dma-names;
402+
pinctrl-0 = <&uart5_xfer>;
403+
};
404+
399405
/* Mule UCAN */
400406
&usb_host0_ehci {
401407
status = "okay";

‎arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
&gmac2io {
1919
phy-handle = <&yt8531c>;
20-
tx_delay = <0x19>;
21-
rx_delay = <0x05>;
20+
phy-mode = "rgmii-id";
2221
status = "okay";
2322

2423
mdio {

‎arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
&gmac2io {
1717
phy-handle = <&rtl8211e>;
18+
phy-mode = "rgmii";
1819
tx_delay = <0x24>;
1920
rx_delay = <0x18>;
2021
status = "okay";

‎arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
110110
assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
111111
clock_in_out = "input";
112-
phy-mode = "rgmii";
113112
phy-supply = <&vcc_io>;
114113
pinctrl-0 = <&rgmiim1_pins>;
115114
pinctrl-names = "default";

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
};
2323

2424
/* EC turns on w/ pp900_usb_en */
25-
pp900_usb: pp900-ap {
25+
pp900_usb: regulator-pp900-ap {
2626
};
2727

2828
/* EC turns on w/ pp900_pcie_en */
29-
pp900_pcie: pp900-ap {
29+
pp900_pcie: regulator-pp900-ap {
3030
};
3131

3232
pp3000: regulator-pp3000 {
@@ -126,7 +126,7 @@
126126
};
127127

128128
/* Always on; plain and simple */
129-
pp3000_ap: pp3000_emmc: pp3000 {
129+
pp3000_ap: pp3000_emmc: regulator-pp3000 {
130130
};
131131

132132
pp1500_ap_io: regulator-pp1500-ap-io {
@@ -160,7 +160,7 @@
160160
};
161161

162162
/* EC turns on w/ pp3300_usb_en_l */
163-
pp3300_usb: pp3300 {
163+
pp3300_usb: regulator-pp3300 {
164164
};
165165

166166
/* gpio is shared with pp1800_pcie and pinctrl is set there */

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
};
9393

9494
/* EC turns on pp1800_s3_en */
95-
pp1800_s3: pp1800 {
95+
pp1800_s3: regulator-pp1800 {
9696
};
9797

9898
/* pp3300 children, sorted by name */
@@ -109,11 +109,11 @@
109109
};
110110

111111
/* EC turns on pp3300_s0_en */
112-
pp3300_s0: pp3300 {
112+
pp3300_s0: regulator-pp3300 {
113113
};
114114

115115
/* EC turns on pp3300_s3_en */
116-
pp3300_s3: pp3300 {
116+
pp3300_s3: regulator-pp3300 {
117117
};
118118

119119
/*

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,39 +189,39 @@
189189
};
190190

191191
/* EC turns on w/ pp900_ddrpll_en */
192-
pp900_ddrpll: pp900-ap {
192+
pp900_ddrpll: regulator-pp900-ap {
193193
};
194194

195195
/* EC turns on w/ pp900_pll_en */
196-
pp900_pll: pp900-ap {
196+
pp900_pll: regulator-pp900-ap {
197197
};
198198

199199
/* EC turns on w/ pp900_pmu_en */
200-
pp900_pmu: pp900-ap {
200+
pp900_pmu: regulator-pp900-ap {
201201
};
202202

203203
/* EC turns on w/ pp1800_s0_en_l */
204-
pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: pp1800 {
204+
pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: regulator-pp1800 {
205205
};
206206

207207
/* EC turns on w/ pp1800_avdd_en_l */
208-
pp1800_avdd: pp1800 {
208+
pp1800_avdd: regulator-pp1800 {
209209
};
210210

211211
/* EC turns on w/ pp1800_lid_en_l */
212-
pp1800_lid: pp1800_mic: pp1800 {
212+
pp1800_lid: pp1800_mic: regulator-pp1800 {
213213
};
214214

215215
/* EC turns on w/ lpddr_pwr_en */
216-
pp1800_lpddr: pp1800 {
216+
pp1800_lpddr: regulator-pp1800 {
217217
};
218218

219219
/* EC turns on w/ pp1800_pmu_en_l */
220-
pp1800_pmu: pp1800 {
220+
pp1800_pmu: regulator-pp1800 {
221221
};
222222

223223
/* EC turns on w/ pp1800_usb_en_l */
224-
pp1800_usb: pp1800 {
224+
pp1800_usb: regulator-pp1800 {
225225
};
226226

227227
pp3000_sd_slot: regulator-pp3000-sd-slot {
@@ -259,11 +259,11 @@
259259
};
260260

261261
/* EC turns on w/ pp3300_trackpad_en_l */
262-
pp3300_trackpad: pp3300-trackpad {
262+
pp3300_trackpad: regulator-pp3300-trackpad {
263263
};
264264

265265
/* EC turns on w/ usb_a_en */
266-
pp5000_usb_a_vbus: pp5000 {
266+
pp5000_usb_a_vbus: regulator-pp5000 {
267267
};
268268

269269
ap_rtc_clk: ap-rtc-clk {

‎arch/arm64/boot/dts/rockchip/rk3588-base.dtsi‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -549,21 +549,21 @@
549549
mmu600_pcie: iommu@fc900000 {
550550
compatible = "arm,smmu-v3";
551551
reg = <0x0 0xfc900000 0x0 0x200000>;
552-
interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH 0>,
553-
<GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH 0>,
554-
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH 0>,
555-
<GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH 0>;
552+
interrupts = <GIC_SPI 369 IRQ_TYPE_EDGE_RISING 0>,
553+
<GIC_SPI 371 IRQ_TYPE_EDGE_RISING 0>,
554+
<GIC_SPI 374 IRQ_TYPE_EDGE_RISING 0>,
555+
<GIC_SPI 367 IRQ_TYPE_EDGE_RISING 0>;
556556
interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
557557
#iommu-cells = <1>;
558558
};
559559

560560
mmu600_php: iommu@fcb00000 {
561561
compatible = "arm,smmu-v3";
562562
reg = <0x0 0xfcb00000 0x0 0x200000>;
563-
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH 0>,
564-
<GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH 0>,
565-
<GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH 0>,
566-
<GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH 0>;
563+
interrupts = <GIC_SPI 381 IRQ_TYPE_EDGE_RISING 0>,
564+
<GIC_SPI 383 IRQ_TYPE_EDGE_RISING 0>,
565+
<GIC_SPI 386 IRQ_TYPE_EDGE_RISING 0>,
566+
<GIC_SPI 379 IRQ_TYPE_EDGE_RISING 0>;
567567
interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
568568
#iommu-cells = <1>;
569569
status = "disabled";
@@ -2668,9 +2668,9 @@
26682668
rockchip,hw-tshut-temp = <120000>;
26692669
rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
26702670
rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */
2671-
pinctrl-0 = <&tsadc_gpio_func>;
2672-
pinctrl-1 = <&tsadc_shut>;
2673-
pinctrl-names = "gpio", "otpout";
2671+
pinctrl-0 = <&tsadc_shut_org>;
2672+
pinctrl-1 = <&tsadc_gpio_func>;
2673+
pinctrl-names = "default", "sleep";
26742674
#thermal-sensor-cells = <1>;
26752675
status = "disabled";
26762676
};

0 commit comments

Comments
 (0)