diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2024-05-04 12:50:28 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2024-05-04 12:50:28 +0200 |
| commit | 160b088184ec81028ff67a5032be33f1baea4b67 (patch) | |
| tree | 1b8fb3d9e0d7d7a327a53297126b04d943b06394 | |
| parent | d6400579d1d9116ce409854e463acef08096907a (diff) | |
| parent | f513991b69885025995dcb4ca75d2ee7261e1273 (diff) | |
| download | linux-rockchip-for-next.tar.gz | |
Merge branch 'v6.10-clk/next' into for-nextfor-next
| -rw-r--r-- | drivers/clk/rockchip/clk-mmc-phase.c | 1 | ||||
| -rw-r--r-- | drivers/clk/rockchip/clk-rk3568.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c index 975454a3dd72b..91012078681bf 100644 --- a/drivers/clk/rockchip/clk-mmc-phase.c +++ b/drivers/clk/rockchip/clk-mmc-phase.c @@ -14,7 +14,6 @@ struct rockchip_mmc_clock { struct clk_hw hw; void __iomem *reg; - int id; int shift; int cached_phase; struct notifier_block clk_rate_change_nb; diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c index 2d44bcaef046b..53d10b1c627b5 100644 --- a/drivers/clk/rockchip/clk-rk3568.c +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -64,6 +64,7 @@ static struct rockchip_pll_rate_table rk3568_pll_rates[] = { RK3036_PLL_RATE(912000000, 1, 76, 2, 1, 1, 0), RK3036_PLL_RATE(816000000, 1, 68, 2, 1, 1, 0), RK3036_PLL_RATE(800000000, 3, 200, 2, 1, 1, 0), + RK3036_PLL_RATE(724000000, 3, 181, 2, 1, 1, 0), RK3036_PLL_RATE(700000000, 3, 350, 4, 1, 1, 0), RK3036_PLL_RATE(696000000, 1, 116, 4, 1, 1, 0), RK3036_PLL_RATE(600000000, 1, 100, 4, 1, 1, 0), |