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

Drop some not-specified properties, fix phy-supply properties, 

fix edp clock on Gru, fix usb port on BPI-R2-Pro, fix license typo,
 fix wlan-wake-pin on Gru-Bob and lower the sd-card speed on Quartz64-B
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmMb4fQQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgbZ6B/4j5Up0eubn3kxWt1Mn5XSYXoPOHH+dgwxu
 CkR0ZijvvTmdHjYCSg7Iy+ZNreowSUJkbjES6iEGVZbflopAcss6hxvwTM+Y7GU0
 Q6+ZCKDqpDr23TZZ7VMzkOwQIYEyV3FKZ1vZfhdAk6/WNpdkHl9NVBrWcfSmJHY4
 Mh32a7YIuaWhLI3MKTt5/umdGRzqMtvxhKfYlLKOrRc3ePoTIXVTWGdx0OzOFvCT
 B9cWCq5YbVb+0VTbS5yHLG9i6ssOsMlYpoyl+m6mcqKu7CDjsNVwucc/keTIIavD
 NeaJY7wkRdvjsd+0MF3U63bVSCcuslnLlGsGt5NTREpLvIuHHYRH
 =DVTd
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmMfRJoACgkQmmx57+YA
 GNnZ/A//ZHE9W/+pPxXUkFW81BWTaVbqsGMd7S74+0WK9kdQGejdnovkj2HUKOc2
 m3f7K36qsfhFMZsgdn9o1QO01wM7moPa23/T99yd1i7Ja/y4r0oTNBC1Bn6VlGu4
 3NWGptaOZhdn4WHKxFjVZP/U4Mf67Ze5R62YsnfvjSsMDKysbUzJJFhzP/MkyJEP
 RmJwcFiVAIGKI6LTRqynYx2PkcH/wanjMDOsPol0gpRxBSdGrIMTLBDqnp+qpbbp
 9jXkHE2kU+Eb64ZdeR0wkf34bkHYrxExgP7tjN6hrbGbbXspnX5VfRcKpUeU5vfJ
 FStzsKgEN0Lq4ssH5qBnoNCAxLoihGwz4UT5jn+bgCsLnJpSmc8XQRfoHCbJejK9
 +lvG1q7RjVJhX7ekmn1gSOw7ltxebk9hx3lV6T8rTilg25HXM+aATuiDTyckD1v4
 Oi8hxw+NS8p0XRXAe9p6lsxJYXlsIpEXIWoXC9SYgzF2iqLpHwFHEvfpyBbVltw5
 QtPG1fhq9a3/At3GEjYg/rSYq/VDrBu1DwVfshy6DpyqeUB30Mdrj3uVpH2ZPH5L
 Uv0/Wp+F4WynXxn14qmuLiIXBsxTtb1oLZifUCMmrb6w8eeGudu7TN6olT0+ynVl
 L7ks2Kah3Nf9p2JshEVBI76xQnrU4+RDCN/LfRs9KN2P6WemcX4=
 =6QKc
 -----END PGP SIGNATURE-----

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

Drop some not-specified properties, fix phy-supply properties,
fix edp clock on Gru, fix usb port on BPI-R2-Pro, fix license typo,
fix wlan-wake-pin on Gru-Bob and lower the sd-card speed on Quartz64-B

* tag 'v6.0-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Remove 'enable-active-low' from rk3566-quartz64-a
  arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma
  arm64: dts: rockchip: fix property for usb2 phy supply on rk3568-evb1-v10
  arm64: dts: rockchip: fix property for usb2 phy supply on rock-3a
  arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz
  arm64: dts: rockchip: fix upper usb port on BPI-R2-Pro
  arm64: dts: rockchip: Fix typo in lisense text for PX30.Core
  arm64: dts: rockchip: Pull up wlan wake# on Gru-Bob
  arm64: dts: rockchip: Lower sd speed on quartz64-b

Link: https://lore.kernel.org/r/2645885.mvXUDI8C0e@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-09-12 16:39:21 +02:00
parent 02181e6827 ea89926d96
commit 78c94808a4
9 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi
View File

@ -2,8 +2,8 @@
/*
* Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd
* Copyright (c) 2020 Engicam srl
* Copyright (c) 2020 Amarula Solutons
* Copyright (c) 2020 Amarula Solutons(India)
* Copyright (c) 2020 Amarula Solutions
* Copyright (c) 2020 Amarula Solutions(India)
*/
#include <dt-bindings/gpio/gpio.h>

5
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
View File

@ -88,3 +88,8 @@
};
};
};
&wlan_host_wake_l {
/* Kevin has an external pull up, but Bob does not. */
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};

9
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
View File

@ -244,6 +244,14 @@
&edp {
status = "okay";
/*
* eDP PHY/clk don't sync reliably at anything other than 24 MHz. Only
* set this here, because rk3399-gru.dtsi ensures we can generate this
* off GPLL=600MHz, whereas some other RK3399 boards may not.
*/
assigned-clocks = <&cru PCLK_EDP>;
assigned-clock-rates = <24000000>;
ports {
edp_out: port@1 {
reg = <1>;
@ -578,6 +586,7 @@ ap_i2c_tp: &i2c5 {
};
wlan_host_wake_l: wlan-host-wake-l {
/* Kevin has an external pull up, but Bob does not */
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
View File

@ -62,7 +62,6 @@
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed";
gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
enable-active-low;
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en>;
regulator-name = "vcc5v0_host";

1
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
View File

@ -189,7 +189,6 @@
vcc3v3_sd: vcc3v3_sd {
compatible = "regulator-fixed";
enable-active-low;
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&vcc_sd_h>;

2
arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
View File

@ -506,7 +506,7 @@
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";

2
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
View File

@ -678,7 +678,7 @@
};
&usb_host0_xhci {
extcon = <&usb2phy0>;
dr_mode = "host";
status = "okay";
};

2
arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
View File

@ -656,7 +656,7 @@
};
&usb2phy0_otg {
vbus-supply = <&vcc5v0_usb_otg>;
phy-supply = <&vcc5v0_usb_otg>;
status = "okay";
};

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

@ -581,7 +581,7 @@
};
&usb2phy0_otg {
vbus-supply = <&vcc5v0_usb_otg>;
phy-supply = <&vcc5v0_usb_otg>;
status = "okay";
};