Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed card-detect on one board and some missing properties added.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmeAXgAQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgfi3CACZduWgY5wxOLWeXBFhGRjeVpld0fM7EYdO
 VTuMgIjQTDo8pi+uGmP49HP/Uz9w4YxTbhAT5lBwdBnHs0SrTMWUZcp6R146ihbc
 IQ5SogUdK0WpvaRk0hnntZ1kzbje8xP2O0wwPLi7pf+gDgNvzbnMQzba4n010KII
 eM2yzQJ78szoNa4WfO8q8U4J2mNEjzdNX0bNw9CqUIvQxB7ndhnAlkIlZghisAXq
 WSd4w/EG0hXbd17KNR1/ZnyPzxyu1z2/2RS71Up4c35fYn0a57x6kqdzSyuNMbuF
 jwlR7wBW9FTWb/iMRhYo4ACx5DAutZytpr5RjmLVtSzEbZqdE1MP
 =8yDt
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeBVvsACgkQYKtH/8kJ
 Uic6UQ/+KqYxW6yca/l3NfRz8v+LzCAQyUFTM7VJnfsVmkg4A2SimrKbt93OWJXU
 MFoPDI9SwNrrq7yFSSxuzEfdoROIfxEK1JBUXSFDTdWU1uqGJfsTAMEINoR0uCC1
 A21qNz4Tr8S9nYpgvaQCssH88HM736QkPiwhS1cTZHHaduU585a4ycDqCZSXYdj7
 nUM0SD6sJ6K8UN32hj7eD+sYIV/plSHIdybAlcpUNRR/GLLTxoReb7fkDeXVBHkE
 NhS1L1T3XWXfHJJZLZhVA1gJmpicUBJeX4UgbVeNV97F4UxJL4JcU7B2kdJppl/9
 W5awxVA3ANC7jB94N+hY58MOA+qfcCwLIL3NsyPjghS61XGMRGRw02EI0WymO9Zg
 puD0NVvH8SMQ1n/5ryrlCoEdDbjc2H/P+v2VmohY+oPzThsjrcy4CpQVGS2nOAAx
 3SlUqUxYz97YeewR9D3wunpFtfm5grlBG17Xfzf8SK5J5MoDbl3QGSvxojlsz7+p
 piQjyntdzPUbsIQGMUpn0FVHDRjPhE2AotacHTmgJXEcFf1C6d1f9VrR8WTEXmhQ
 uFrsk3bslVXV4mlHMAhA+z2OvwPRaeOziFk2r9k/XE+hdbut29CQpUZbTwO/Rqn8
 bgj80v5dZMac+u1FcA1lcs7FUTDCiLvFPbNor31FMmsd3KmxgDU=
 =aKk7
 -----END PGP SIGNATURE-----

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

Fixed card-detect on one board and some missing properties added.

* tag 'v6.13-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: add hevc power domain clock to rk3328
  arm64: dts: rockchip: Fix the SD card detection on NanoPi R6C/R6S
  arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B
  arm64: dts: rockchip: add reset-names for combphy on rk3568

Link: https://lore.kernel.org/r/2914560.yaVYbkx8dN@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-01-10 18:20:46 +01:00
commit 5391c5d8e6
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,6 +333,7 @@
power-domain@RK3328_PD_HEVC {
reg = <RK3328_PD_HEVC>;
clocks = <&cru SCLK_VENC_CORE>;
#power-domain-cells = <0>;
};
power-domain@RK3328_PD_VIDEO {

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

@ -350,6 +350,7 @@
assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;
assigned-clock-rates = <100000000>;
resets = <&cru SRST_PIPEPHY0>;
reset-names = "phy";
rockchip,pipe-grf = <&pipegrf>;
rockchip,pipe-phy-grf = <&pipe_phy_grf0>;
#phy-cells = <1>;

2
arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
View File

@ -1681,6 +1681,7 @@
assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
assigned-clock-rates = <100000000>;
resets = <&cru SRST_PIPEPHY1>;
reset-names = "phy";
rockchip,pipe-grf = <&pipegrf>;
rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
#phy-cells = <1>;
@ -1697,6 +1698,7 @@
assigned-clocks = <&pmucru CLK_PCIEPHY2_REF>;
assigned-clock-rates = <100000000>;
resets = <&cru SRST_PIPEPHY2>;
reset-names = "phy";
rockchip,pipe-grf = <&pipegrf>;
rockchip,pipe-phy-grf = <&pipe_phy_grf2>;
#phy-cells = <1>;

2
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
View File

@ -72,7 +72,7 @@
rfkill {
compatible = "rfkill-gpio";
label = "rfkill-pcie-wlan";
label = "rfkill-m2-wlan";
radio-type = "wlan";
shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
};

1
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
View File

@ -434,6 +434,7 @@
&sdmmc {
bus-width = <4>;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
max-frequency = <150000000>;
no-mmc;