shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c3bd2c8d05a52e2ab1d7e5a770587903ca916a1c'

Browse Source 
* commit 'c3bd2c8d05a52e2ab1d7e5a770587903ca916a1c':
  arm64: dts: rockchip: rk3528: default disable v2 tuning for sdio
  clk: rockchip: ROCKCHIP_CLK_INV depends on CLK_RK3188 || CLK_RK3288 || CLK_RK3368 || CLK_RV1108
  clk: rockchip: ROCKCHIP_CLK_PVTM depends on CLK_RK3368

Change-Id: Ie8d6c2e1cf4f8d1fdb4df8e6e0217626f9e4e68e
This commit is contained in:
Tao Huang
2025-04-23 19:24:57 +08:00
parent 8b4d270907 c3bd2c8d05
commit f03fb7b7e5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/rk3528.dtsi
View File

@@ -2219,7 +2219,6 @@
fifo-depth = <0x100>;
resets = <&cru SRST_HRESETN_SDIO0>;
reset-names = "reset";
rockchip,use-v2-tuning;
status = "disabled";
};
@@ -2235,7 +2234,6 @@
fifo-depth = <0x100>;
resets = <&cru SRST_HRESETN_SDIO1>;
reset-names = "reset";
rockchip,use-v2-tuning;
status = "disabled";
};

4
drivers/clk/rockchip/Kconfig
View File

@@ -176,7 +176,7 @@ config ROCKCHIP_CLK_BOOST
config ROCKCHIP_CLK_INV
bool "Rockchip Clk Inverter"
depends on !CPU_RV1126 && !CPU_RV1106 && !CPU_RV1103B
depends on CLK_RK3188 || CLK_RK3288 || CLK_RK3368 || CLK_RV1108
default y
help
Say y here to enable clk Inverter.
@@ -189,7 +189,7 @@ config ROCKCHIP_CLK_OUT
config ROCKCHIP_CLK_PVTM
bool "Rockchip Clk Pvtm"
depends on !CPU_RV1126 && !CPU_RV1106 && !CPU_RV1103B
depends on CLK_RK3368
default y
help
Say y here to enable clk pvtm.