iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to adapt to correct binding behaviour and fixes for devices on some boards

Browse Source 
Most notably may be the adaption of lower thermal limits for the pinephone
 pro, where the original hiher ones could result in (possibly permanent)
 display issues.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmPapWIQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgVu4CACD6VNbu005k/Ot8wN3jIzJPicgz9Z6QfSM
 xH0OBYQ037O833wGJYKosQT+azQaUrzMVRrO2hPhdAKR8OXbD4m5k7EySQzNgsNT
 bG1ONkBD+ZLT04K3aYL+lg/ty0UE88/GeVMG/CP7tuCNkvvel5Gqt9WLDeNOC5Md
 oPrkGP+SGT97A6QSkjTTwphlaze7zBBMPVPR2buJRaKrRFrwoTERE7zglZ/9ZFaJ
 gB5o+y1fjTUKtD9fFZ0ch7yHHx3T5GIh1Lzxm+wpfMwsFOwl9k4PGN0dS/pu93gm
 zYY535P/gUY8gzsb8rde+kFVEvAF4PIJBMjVkKfHNGfDG6YSWO+T
 =qX0n
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmPdCbEACgkQmmx57+YA
 GNlyKBAAojNNEBz3h/2hUTI9atcR6TgACw4YFSGeuQhua0b952wHIds1ugt10qas
 O063c4rqUJnBOjhFvxJ8zdpmN0+/8byjneZsQGKX0tV8QgRHuL2cWEDqMNpd74cm
 x2oBlctKImkaDISR4xRBNVzdiYWKQ4KogjMKOeWC2gObPPK4LQ9/gEcJIxo4sWy6
 3yA+K8gjOurnnOqOuU+f3XfY0kEdLgEtZn5ii8T26tj/RR7Q3qxoGh0YWRfQoSLE
 uw1TSBQDTCPM+6gudIs1WUWeSm0plSGHtY7srrpzvdfoRq9l3y7VFlD+cyNP1luF
 N+X2ytZyDlowC4EUHORoF7wBzT9QnfwAa5EY9+QHnh4wE6lyhfSxGWCzVMHHY7pq
 7SkaUTgaItrWgDt0neXu3gpcVLvNkRONbmYGttG1oot+rQgnk9hYMovDKknMu+2w
 jrmsrdBYj2fFckIEPd1gJ3Ws5oMubavvYZuh1NI8r+S4EC8pbaKxFN51gsfdE53s
 1mmhvFLm6cQ1IxPSllpiAD+JRVFCHfMH+k2hDY3VjyEIcXcSdK+unPH/iLtSa+fi
 6EIybQ0iYmMeHBTzUAAEv6qLgN17OzIPUDlWG8xH/b2fAe2nBlFVWQjKJbbZ1wsa
 Wsa41bGba9QFK0HoHafzpA3xqy1KpgHiXVa4ZDWIfgAEf+ta6hM=
 =5IlC
 -----END PGP SIGNATURE-----

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

Fixes to adapt to correct binding behaviour and fixes for devices on some boards

Most notably may be the adaption of lower thermal limits for the pinephone
pro, where the original hiher ones could result in (possibly permanent)
display issues.

* tag 'v6.2-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: align rk3399 DMC OPP table with bindings
  arm64: dts: rockchip: set sdmmc0 speed to sd-uhs-sdr50 on rock-3a
  arm64: dts: rockchip: fix probe of analog sound card on rock-3a
  arm64: dts: rockchip: add missing #interrupt-cells to rk356x pcie2x1
  arm64: dts: rockchip: fix input enable pinconf on rk3399
  ARM: dts: rockchip: add power-domains property to dp node on rk3288
  arm64: dts: rockchip: add io domain setting to rk3566-box-demo
  arm64: dts: rockchip: remove unsupported property from sdmmc2 for rock-3a
  arm64: dts: rockchip: drop unused LED mode property from rk3328-roc-cc
  arm64: dts: rockchip: reduce thermal limits on rk3399-pinephone-pro
  arm64: dts: rockchip: use correct reset names for rk3399 crypto nodes

Link: https://lore.kernel.org/r/3514663.mvXUDI8C0e@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-02-03 14:18:41 +01:00
commit 07975ef0fa
8 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/rk3288.dtsi
View File

@ -1181,6 +1181,7 @@
clock-names = "dp", "pclk";
phys = <&edp_phy>;
phy-names = "dp";
power-domains = <&power RK3288_PD_VIO>;
resets = <&cru SRST_EDP>;
reset-names = "dp";
rockchip,grf = <&grf>;

2
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
View File

@ -96,7 +96,6 @@
linux,default-trigger = "heartbeat";
gpios = <&rk805 1 GPIO_ACTIVE_LOW>;
default-state = "on";
mode = <0x23>;
};
user_led: led-1 {
@ -104,7 +103,6 @@
linux,default-trigger = "mmc1";
gpios = <&rk805 0 GPIO_ACTIVE_LOW>;
default-state = "off";
mode = <0x05>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi
View File

@ -111,7 +111,7 @@
};
};
dmc_opp_table: dmc_opp_table {
dmc_opp_table: opp-table-3 {
compatible = "operating-points-v2";
opp00 {

7
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
View File

@ -104,6 +104,13 @@
};
};
&cpu_alert0 {
temperature = <65000>;
};
&cpu_alert1 {
temperature = <68000>;
};
&cpu_l0 {
cpu-supply = <&vdd_cpu_l>;
};

6
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

@ -589,7 +589,7 @@
clocks = <&cru HCLK_M_CRYPTO0>, <&cru HCLK_S_CRYPTO0>, <&cru SCLK_CRYPTO0>;
clock-names = "hclk_master", "hclk_slave", "sclk";
resets = <&cru SRST_CRYPTO0>, <&cru SRST_CRYPTO0_S>, <&cru SRST_CRYPTO0_M>;
reset-names = "master", "lave", "crypto";
reset-names = "master", "slave", "crypto-rst";
};
crypto1: crypto@ff8b8000 {
@ -599,7 +599,7 @@
clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>, <&cru SCLK_CRYPTO1>;
clock-names = "hclk_master", "hclk_slave", "sclk";
resets = <&cru SRST_CRYPTO1>, <&cru SRST_CRYPTO1_S>, <&cru SRST_CRYPTO1_M>;
reset-names = "master", "slave", "crypto";
reset-names = "master", "slave", "crypto-rst";
};
i2c1: i2c@ff110000 {
@ -2241,13 +2241,11 @@
pcfg_input_pull_up: pcfg-input-pull-up {
input-enable;
bias-pull-up;
drive-strength = <2>;
};
pcfg_input_pull_down: pcfg-input-pull-down {
input-enable;
bias-pull-down;
drive-strength = <2>;
};
clock {

11
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
View File

@ -353,6 +353,17 @@
};
};
&pmu_io_domains {
pmuio2-supply = <&vcc_3v3>;
vccio1-supply = <&vcc_3v3>;
vccio3-supply = <&vcc_3v3>;
vccio4-supply = <&vcca_1v8>;
vccio5-supply = <&vcc_3v3>;
vccio6-supply = <&vcca_1v8>;
vccio7-supply = <&vcc_3v3>;
status = "okay";
};
&pwm0 {
status = "okay";
};

5
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
View File

@ -571,6 +571,8 @@
};
&i2s1_8ch {
pinctrl-names = "default";
pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
rockchip,trcm-sync-tx-only;
status = "okay";
};
@ -730,14 +732,13 @@
disable-wp;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
sd-uhs-sdr104;
sd-uhs-sdr50;
vmmc-supply = <&vcc3v3_sd>;
vqmmc-supply = <&vccio_sd>;
status = "okay";
};
&sdmmc2 {
supports-sdio;
bus-width = <4>;
disable-wp;
cap-sd-highspeed;

1
arch/arm64/boot/dts/rockchip/rk356x.dtsi
View File

@ -966,6 +966,7 @@
clock-names = "aclk_mst", "aclk_slv",
"aclk_dbi", "pclk", "aux";
device_type = "pci";
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
interrupt-map = <0 0 0 1 &pcie_intc 0>,
<0 0 0 2 &pcie_intc 1>,