Skip to content

Commit 07917ee

Browse files
arndbarndb
committed
Merge tag 'v6.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Apart from the regular dts fixes for wrong addresses, missing or wrong properties, this reverts the previous move away from cd-gpios to the mmc-controller's internal card-detect. With this change applied, it was reported that boards could not detect card anymore, so this go reverted of course. * tag 'v6.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add sound-dai-cells for RK3368 arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi 4B arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E arm64: dts: rockchip: make poweroff(8) work on Radxa ROCK 5A Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes" ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node arm64: dts: rockchip: Fix the value of `dlg,jack-det-rate` mismatch on rk3399-gru arm64: dts: rockchip: set correct pwm0 pinctrl on rk3588-tiger arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s arm64: dts: rockchip: Fix SD NAND and eMMC init on rk3308-rock-pi-s arm64: dts: rockchip: Fix rk3308 codec@ff560000 reset-names arm64: dts: rockchip: Fix the DCDC_REG2 minimum voltage on Quartz64 Model B Link: https://lore.kernel.org/r/10237789.nnTZe4vzsl@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 56d62dc + 8d7ec44 commit 07917ee

13 files changed

Lines changed: 34 additions & 12 deletions

‎arch/arm/boot/dts/rockchip/rk3066a.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;
129129
power-domains = <&power RK3066_PD_VIO>;
130130
rockchip,grf = <&grf>;
131+
#sound-dai-cells = <0>;
131132
status = "disabled";
132133

133134
ports {

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
/dts-v1/;
8+
9+
#include <dt-bindings/leds/common.h>
810
#include "rk3308.dtsi"
911

1012
/ {
@@ -24,17 +26,21 @@
2426
leds {
2527
compatible = "gpio-leds";
2628
pinctrl-names = "default";
27-
pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
29+
pinctrl-0 = <&green_led>, <&heartbeat_led>;
2830

2931
green-led {
32+
color = <LED_COLOR_ID_GREEN>;
3033
default-state = "on";
34+
function = LED_FUNCTION_POWER;
3135
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
3236
label = "rockpis:green:power";
3337
linux,default-trigger = "default-on";
3438
};
3539

3640
blue-led {
41+
color = <LED_COLOR_ID_BLUE>;
3742
default-state = "on";
43+
function = LED_FUNCTION_HEARTBEAT;
3844
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
3945
label = "rockpis:blue:user";
4046
linux,default-trigger = "heartbeat";
@@ -126,10 +132,12 @@
126132
};
127133

128134
&emmc {
129-
bus-width = <4>;
130135
cap-mmc-highspeed;
131-
mmc-hs200-1_8v;
136+
cap-sd-highspeed;
137+
no-sdio;
132138
non-removable;
139+
pinctrl-names = "default";
140+
pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
133141
vmmc-supply = <&vcc_io>;
134142
status = "okay";
135143
};
@@ -214,11 +222,11 @@
214222
pinctrl-0 = <&rtc_32k>;
215223

216224
leds {
217-
green_led_gio: green-led-gpio {
225+
green_led: green-led {
218226
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
219227
};
220228

221-
heartbeat_led_gpio: heartbeat-led-gpio {
229+
heartbeat_led: heartbeat-led {
222230
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
223231
};
224232
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@
811811
clocks = <&cru SCLK_I2S2_8CH_TX_OUT>,
812812
<&cru SCLK_I2S2_8CH_RX_OUT>,
813813
<&cru PCLK_ACODEC>;
814-
reset-names = "codec-reset";
814+
reset-names = "codec";
815815
resets = <&cru SRST_ACODEC_P>;
816816
#sound-dai-cells = <0>;
817817
status = "disabled";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@
241241
rk805: pmic@18 {
242242
compatible = "rockchip,rk805";
243243
reg = <0x18>;
244-
interrupt-parent = <&gpio2>;
245-
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
244+
interrupt-parent = <&gpio0>;
245+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
246246
#clock-cells = <1>;
247247
clock-output-names = "xin32k", "rk805-clkout2";
248248
gpio-controller;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,7 @@
793793
dma-names = "tx";
794794
pinctrl-names = "default";
795795
pinctrl-0 = <&spdif_tx>;
796+
#sound-dai-cells = <0>;
796797
status = "disabled";
797798
};
798799

@@ -804,6 +805,7 @@
804805
clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;
805806
dmas = <&dmac_bus 6>, <&dmac_bus 7>;
806807
dma-names = "tx", "rx";
808+
#sound-dai-cells = <0>;
807809
status = "disabled";
808810
};
809811

@@ -817,6 +819,7 @@
817819
dma-names = "tx", "rx";
818820
pinctrl-names = "default";
819821
pinctrl-0 = <&i2s_8ch_bus>;
822+
#sound-dai-cells = <0>;
820823
status = "disabled";
821824
};
822825

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ ap_i2c_audio: &i2c8 {
450450
dlg,btn-cfg = <50>;
451451
dlg,mic-det-thr = <500>;
452452
dlg,jack-ins-deb = <20>;
453-
dlg,jack-det-rate = "32ms_64ms";
453+
dlg,jack-det-rate = "32_64";
454454
dlg,jack-rem-deb = <1>;
455455

456456
dlg,a-d-btn-thr = <0xa>;

‎arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
regulator-name = "vdd_gpu";
290290
regulator-always-on;
291291
regulator-boot-on;
292-
regulator-min-microvolt = <900000>;
292+
regulator-min-microvolt = <500000>;
293293
regulator-max-microvolt = <1350000>;
294294
regulator-ramp-delay = <6001>;
295295

‎arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@
444444
&sdmmc {
445445
bus-width = <4>;
446446
cap-sd-highspeed;
447+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
447448
disable-wp;
448449
max-frequency = <150000000>;
449450
no-sdio;

‎arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
&sdmmc {
436436
bus-width = <4>;
437437
cap-sd-highspeed;
438+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
438439
disable-wp;
439440
max-frequency = <150000000>;
440441
no-sdio;

‎arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@
383383
bus-width = <4>;
384384
cap-mmc-highspeed;
385385
cap-sd-highspeed;
386+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
386387
disable-wp;
387388
sd-uhs-sdr104;
388389
vmmc-supply = <&vcc_3v3_s3>;

0 commit comments

Comments
 (0)