Skip to content

Commit 32a1eaa

Browse files
arndbarndb
committed
Merge branch 'v6.9-armsoc/dtsfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into for-next
* 'v6.9-armsoc/dtsfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Fix USB interface compatible string on kobol-helios64 arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 2 arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 1 arm64: dts: rockchip: drop redundant pcie-reset-suspend in Scarlet Dumo arm64: dts: rockchip: mark system power controller and fix typo on orangepi-5-plus arm64: dts: rockchip: Designate the system power controller on QuartzPro64 arm64: dts: rockchip: drop panel port unit address in GRU Scarlet arm64: dts: rockchip: Remove unsupported node from the Pinebook Pro dts arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi CM5 arm64: dts: rockchip: add regulators for PCIe on RK3399 Puma Haikou arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma arm64: dts: rockchip: enable internal pull-up on Q7_USB_ID for RK3399 Puma arm64: dts: rockchip: fix alphabetical ordering RK3399 puma arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma arm64: dts: rockchip: set PHY address of MT7531 switch to 0x1f Link: https://lore.kernel.org/r/3413596.CbtlEUcBR6@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0bbac3f + 93b36e1 commit 32a1eaa

12 files changed

Lines changed: 61 additions & 17 deletions

‎Documentation/devicetree/bindings/soc/rockchip/grf.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ allOf:
171171
unevaluatedProperties: false
172172

173173
pcie-phy:
174+
type: object
174175
description:
175176
Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
176177

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ camera: &i2c7 {
663663
port@1 {
664664
reg = <1>;
665665

666-
mipi1_in_panel: endpoint@1 {
666+
mipi1_in_panel: endpoint {
667667
remote-endpoint = <&mipi1_out_panel>;
668668
};
669669
};
@@ -689,7 +689,6 @@ camera: &i2c7 {
689689
ep-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
690690

691691
/* PERST# asserted in S3 */
692-
pcie-reset-suspend = <1>;
693692

694693
vpcie3v3-supply = <&wlan_3v3>;
695694
vpcie1v8-supply = <&pp1800_pcie>;

‎arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@
611611
#size-cells = <0>;
612612

613613
interface@0 { /* interface 0 of configuration 1 */
614-
compatible = "usbbda,8156.config1.0";
614+
compatible = "usbifbda,8156.config1.0";
615615
reg = <0 1>;
616616
};
617617
};

‎arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,6 @@
779779
};
780780

781781
&pcie0 {
782-
bus-scan-delay-ms = <1000>;
783782
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
784783
num-lanes = <4>;
785784
pinctrl-names = "default";

‎arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@
194194
num-lanes = <4>;
195195
pinctrl-names = "default";
196196
pinctrl-0 = <&pcie_clkreqn_cpm>;
197+
vpcie3v3-supply = <&vcc3v3_baseboard>;
198+
vpcie12v-supply = <&dc_12v>;
197199
status = "okay";
198200
};
199201

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

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,26 @@
7979
regulator-max-microvolt = <5000000>;
8080
};
8181

82+
vcca_0v9: vcca-0v9-regulator {
83+
compatible = "regulator-fixed";
84+
regulator-name = "vcca_0v9";
85+
regulator-always-on;
86+
regulator-boot-on;
87+
regulator-min-microvolt = <900000>;
88+
regulator-max-microvolt = <900000>;
89+
vin-supply = <&vcc_1v8>;
90+
};
91+
92+
vcca_1v8: vcca-1v8-regulator {
93+
compatible = "regulator-fixed";
94+
regulator-name = "vcca_1v8";
95+
regulator-always-on;
96+
regulator-boot-on;
97+
regulator-min-microvolt = <1800000>;
98+
regulator-max-microvolt = <1800000>;
99+
vin-supply = <&vcc3v3_sys>;
100+
};
101+
82102
vdd_log: vdd-log {
83103
compatible = "pwm-regulator";
84104
pwms = <&pwm2 0 25000 1>;
@@ -416,16 +436,28 @@
416436
gpio1830-supply = <&vcc_1v8>;
417437
};
418438

419-
&pmu_io_domains {
420-
status = "okay";
421-
pmu1830-supply = <&vcc_1v8>;
439+
&pcie0 {
440+
/* PCIe PHY supplies */
441+
vpcie0v9-supply = <&vcca_0v9>;
442+
vpcie1v8-supply = <&vcca_1v8>;
422443
};
423444

424-
&pwm2 {
425-
status = "okay";
445+
&pcie_clkreqn_cpm {
446+
rockchip,pins =
447+
<2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
426448
};
427449

428450
&pinctrl {
451+
pinctrl-names = "default";
452+
pinctrl-0 = <&q7_thermal_pin>;
453+
454+
gpios {
455+
q7_thermal_pin: q7-thermal-pin {
456+
rockchip,pins =
457+
<0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
458+
};
459+
};
460+
429461
i2c8 {
430462
i2c8_xfer_a: i2c8-xfer {
431463
rockchip,pins =
@@ -458,11 +490,20 @@
458490
usb3 {
459491
usb3_id: usb3-id {
460492
rockchip,pins =
461-
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
493+
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
462494
};
463495
};
464496
};
465497

498+
&pmu_io_domains {
499+
status = "okay";
500+
pmu1830-supply = <&vcc_1v8>;
501+
};
502+
503+
&pwm2 {
504+
status = "okay";
505+
};
506+
466507
&sdhci {
467508
/*
468509
* Signal integrity isn't great at 200MHz but 100MHz has proven stable

‎arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@
447447

448448
&pcie2x1 {
449449
reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
450-
disable-gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
451450
vpcie3v3-supply = <&vcc3v3_pcie>;
452451
status = "okay";
453452
};

‎arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,8 @@
416416

417417
vccio_sd: LDO_REG5 {
418418
regulator-name = "vccio_sd";
419+
regulator-always-on;
420+
regulator-boot-on;
419421
regulator-min-microvolt = <1800000>;
420422
regulator-max-microvolt = <3300000>;
421423

@@ -525,9 +527,9 @@
525527
#address-cells = <1>;
526528
#size-cells = <0>;
527529

528-
switch@0 {
530+
switch@1f {
529531
compatible = "mediatek,mt7531";
530-
reg = <0>;
532+
reg = <0x1f>;
531533

532534
ports {
533535
#address-cells = <1>;

‎arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@
523523

524524
&pcie2x1 {
525525
reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
526-
disable-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>;
527526
vpcie3v3-supply = <&vcc3v3_mini_pcie>;
528527
status = "okay";
529528
};

‎arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@
216216
pinctrl-0 = <&i2c7m0_xfer>;
217217
status = "okay";
218218

219-
es8316: audio-codec@11 {
219+
es8316: audio-codec@10 {
220220
compatible = "everest,es8316";
221-
reg = <0x11>;
221+
reg = <0x10>;
222222
assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
223223
assigned-clock-rates = <12288000>;
224224
clocks = <&cru I2S0_8CH_MCLKOUT>;

0 commit comments

Comments
 (0)