Commit 43950556 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v6.3-rockchip-dtsfixes1' of...

Merge tag 'v6.3-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Lower sd card speeds for two boards to make them run more reliable,
missing 32k clock definition for Anbric xx3 devices, missing cache-levels
for rk3588, fixed rk3326-board display supplies and more dt-schema fixes.

* tag 'v6.3-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: correct panel supplies on some rk3326 boards
  arm64: dts: rockchip: use just "port" in panel on RockPro64
  arm64: dts: rockchip: use just "port" in panel on Pinebook Pro
  arm64: dts: rockchip: Remove non-existing pwm-delay-us property
  arm64: dts: rockchip: Add clk_rtc_32k to Anbernic xx3 Devices
  arm64: dts: rockchip: add rk3588 cache level information
  arm64: dts: rockchip: Lower SD card speed on rk3399 Pinebook Pro
  arm64: dts: rockchip: Lower sd speed on rk3566-soquartz
  ARM: dts: rockchip: fix a typo error for rk3288 spdif node
  arm64: dts: rockchip: Fix rk3399 GICv3 ITS node name

Link: https://lore.kernel.org/r/10559306.CDJkKcVGEf@philSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 43235168 60a655de
...@@ -942,7 +942,7 @@ wdt: watchdog@ff800000 { ...@@ -942,7 +942,7 @@ wdt: watchdog@ff800000 {
status = "disabled"; status = "disabled";
}; };
spdif: sound@ff88b0000 { spdif: sound@ff8b0000 {
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif"; compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
reg = <0x0 0xff8b0000 0x0 0x10000>; reg = <0x0 0xff8b0000 0x0 0x10000>;
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
......
...@@ -24,6 +24,8 @@ vibrator { ...@@ -24,6 +24,8 @@ vibrator {
&internal_display { &internal_display {
compatible = "elida,kd35t133"; compatible = "elida,kd35t133";
iovcc-supply = <&vcc_lcd>;
vdd-supply = <&vcc_lcd>;
}; };
&pwm0 { &pwm0 {
......
...@@ -235,10 +235,8 @@ mipi_out_panel: endpoint { ...@@ -235,10 +235,8 @@ mipi_out_panel: endpoint {
internal_display: panel@0 { internal_display: panel@0 {
reg = <0>; reg = <0>;
backlight = <&backlight>; backlight = <&backlight>;
iovcc-supply = <&vcc_lcd>;
reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
rotation = <270>; rotation = <270>;
vdd-supply = <&vcc_lcd>;
port { port {
mipi_in_panel: endpoint { mipi_in_panel: endpoint {
......
...@@ -83,6 +83,8 @@ button-sw21 { ...@@ -83,6 +83,8 @@ button-sw21 {
&internal_display { &internal_display {
compatible = "elida,kd35t133"; compatible = "elida,kd35t133";
iovcc-supply = <&vcc_lcd>;
vdd-supply = <&vcc_lcd>;
}; };
&rk817 { &rk817 {
......
...@@ -59,6 +59,8 @@ battery: battery { ...@@ -59,6 +59,8 @@ battery: battery {
&internal_display { &internal_display {
compatible = "elida,kd35t133"; compatible = "elida,kd35t133";
iovcc-supply = <&vcc_lcd>;
vdd-supply = <&vcc_lcd>;
}; };
&rk817_charger { &rk817_charger {
......
...@@ -61,7 +61,6 @@ backlight: backlight { ...@@ -61,7 +61,6 @@ backlight: backlight {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_en>; pinctrl-0 = <&bl_en>;
pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
pwm-delay-us = <10000>;
}; };
emmc_pwrseq: emmc-pwrseq { emmc_pwrseq: emmc-pwrseq {
......
...@@ -198,7 +198,6 @@ backlight: backlight { ...@@ -198,7 +198,6 @@ backlight: backlight {
power-supply = <&pp3300_disp>; power-supply = <&pp3300_disp>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_en>; pinctrl-0 = <&bl_en>;
pwm-delay-us = <10000>;
}; };
gpio_keys: gpio-keys { gpio_keys: gpio-keys {
......
...@@ -167,7 +167,6 @@ backlight: backlight { ...@@ -167,7 +167,6 @@ backlight: backlight {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_en>; pinctrl-0 = <&bl_en>;
pwms = <&pwm1 0 1000000 0>; pwms = <&pwm1 0 1000000 0>;
pwm-delay-us = <10000>;
}; };
dmic: dmic { dmic: dmic {
......
...@@ -50,19 +50,9 @@ edp_panel: edp-panel { ...@@ -50,19 +50,9 @@ edp_panel: edp-panel {
pinctrl-0 = <&panel_en_pin>; pinctrl-0 = <&panel_en_pin>;
power-supply = <&vcc3v3_panel>; power-supply = <&vcc3v3_panel>;
ports { port {
#address-cells = <1>; panel_in_edp: endpoint {
#size-cells = <0>; remote-endpoint = <&edp_out_panel>;
port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
panel_in_edp: endpoint@0 {
reg = <0>;
remote-endpoint = <&edp_out_panel>;
};
}; };
}; };
}; };
...@@ -943,7 +933,7 @@ &sdmmc { ...@@ -943,7 +933,7 @@ &sdmmc {
disable-wp; disable-wp;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
sd-uhs-sdr104; sd-uhs-sdr50;
vmmc-supply = <&vcc3v0_sd>; vmmc-supply = <&vcc3v0_sd>;
vqmmc-supply = <&vcc_sdio>; vqmmc-supply = <&vcc_sdio>;
status = "okay"; status = "okay";
......
...@@ -647,16 +647,10 @@ mipi_panel: panel@0 { ...@@ -647,16 +647,10 @@ mipi_panel: panel@0 {
avdd-supply = <&avdd>; avdd-supply = <&avdd>;
backlight = <&backlight>; backlight = <&backlight>;
dvdd-supply = <&vcc3v3_s0>; dvdd-supply = <&vcc3v3_s0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 { port {
reg = <0>; mipi_in_panel: endpoint {
remote-endpoint = <&mipi_out_panel>;
mipi_in_panel: endpoint {
remote-endpoint = <&mipi_out_panel>;
};
}; };
}; };
}; };
......
...@@ -552,7 +552,7 @@ gic: interrupt-controller@fee00000 { ...@@ -552,7 +552,7 @@ gic: interrupt-controller@fee00000 {
<0x0 0xfff10000 0 0x10000>, /* GICH */ <0x0 0xfff10000 0 0x10000>, /* GICH */
<0x0 0xfff20000 0 0x10000>; /* GICV */ <0x0 0xfff20000 0 0x10000>; /* GICV */
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
its: interrupt-controller@fee20000 { its: msi-controller@fee20000 {
compatible = "arm,gic-v3-its"; compatible = "arm,gic-v3-its";
msi-controller; msi-controller;
#msi-cells = <1>; #msi-cells = <1>;
......
...@@ -16,8 +16,10 @@ backlight: backlight { ...@@ -16,8 +16,10 @@ backlight: backlight {
}; };
&cru { &cru {
assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>, <&cru PLL_VPLL>; assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>,
assigned-clock-rates = <1200000000>, <200000000>, <241500000>; <&pmucru PLL_PPLL>, <&cru PLL_VPLL>;
assigned-clock-rates = <32768>, <1200000000>,
<200000000>, <241500000>;
}; };
&gpio_keys_control { &gpio_keys_control {
......
...@@ -105,8 +105,10 @@ spk_amp: audio-amplifier { ...@@ -105,8 +105,10 @@ spk_amp: audio-amplifier {
}; };
&cru { &cru {
assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>, <&cru PLL_VPLL>; assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>,
assigned-clock-rates = <1200000000>, <200000000>, <500000000>; <&pmucru PLL_PPLL>, <&cru PLL_VPLL>;
assigned-clock-rates = <32768>, <1200000000>,
<200000000>, <500000000>;
}; };
&dsi_dphy0 { &dsi_dphy0 {
......
...@@ -598,7 +598,7 @@ &sdmmc1 { ...@@ -598,7 +598,7 @@ &sdmmc1 {
non-removable; non-removable;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
sd-uhs-sdr104; sd-uhs-sdr50;
vmmc-supply = <&vcc3v3_sys>; vmmc-supply = <&vcc3v3_sys>;
vqmmc-supply = <&vcc_1v8>; vqmmc-supply = <&vcc_1v8>;
status = "okay"; status = "okay";
......
...@@ -222,6 +222,7 @@ l2_cache_l0: l2-cache-l0 { ...@@ -222,6 +222,7 @@ l2_cache_l0: l2-cache-l0 {
cache-size = <131072>; cache-size = <131072>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <512>; cache-sets = <512>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -230,6 +231,7 @@ l2_cache_l1: l2-cache-l1 { ...@@ -230,6 +231,7 @@ l2_cache_l1: l2-cache-l1 {
cache-size = <131072>; cache-size = <131072>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <512>; cache-sets = <512>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -238,6 +240,7 @@ l2_cache_l2: l2-cache-l2 { ...@@ -238,6 +240,7 @@ l2_cache_l2: l2-cache-l2 {
cache-size = <131072>; cache-size = <131072>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <512>; cache-sets = <512>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -246,6 +249,7 @@ l2_cache_l3: l2-cache-l3 { ...@@ -246,6 +249,7 @@ l2_cache_l3: l2-cache-l3 {
cache-size = <131072>; cache-size = <131072>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <512>; cache-sets = <512>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -254,6 +258,7 @@ l2_cache_b0: l2-cache-b0 { ...@@ -254,6 +258,7 @@ l2_cache_b0: l2-cache-b0 {
cache-size = <524288>; cache-size = <524288>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <1024>; cache-sets = <1024>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -262,6 +267,7 @@ l2_cache_b1: l2-cache-b1 { ...@@ -262,6 +267,7 @@ l2_cache_b1: l2-cache-b1 {
cache-size = <524288>; cache-size = <524288>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <1024>; cache-sets = <1024>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -270,6 +276,7 @@ l2_cache_b2: l2-cache-b2 { ...@@ -270,6 +276,7 @@ l2_cache_b2: l2-cache-b2 {
cache-size = <524288>; cache-size = <524288>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <1024>; cache-sets = <1024>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -278,6 +285,7 @@ l2_cache_b3: l2-cache-b3 { ...@@ -278,6 +285,7 @@ l2_cache_b3: l2-cache-b3 {
cache-size = <524288>; cache-size = <524288>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <1024>; cache-sets = <1024>;
cache-level = <2>;
next-level-cache = <&l3_cache>; next-level-cache = <&l3_cache>;
}; };
...@@ -286,6 +294,7 @@ l3_cache: l3-cache { ...@@ -286,6 +294,7 @@ l3_cache: l3-cache {
cache-size = <3145728>; cache-size = <3145728>;
cache-line-size = <64>; cache-line-size = <64>;
cache-sets = <4096>; cache-sets = <4096>;
cache-level = <3>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment