p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i.MX clock changes for 5.17 

- Set suppress_bind_attrs to true for i.MX8ULP driver
 - Switch from do_div to div64_ul for throughout all drivers
 - Fix imx8mn_clko1_sels for i.MX8MN
 - Remove unused IPG_AUDIO_ROOT from i.MX8MP
 - Switch parent for audio_root_clk to audio ahb in i.MX8MP driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEdRlgxHYCb3ovKt456LNSLBEEo7YFAmG+X64ACgkQ6LNSLBEE
 o7YLSQ//XRhdFGlPjJI2za6LNIv+3XOY484w0gs15qgw6whWcQcwWeGo1i3ESt70
 wCcUsfMlbrLZuQ0H/4WpMDfPGH05DpzAA9y5zuJsUvz2gOi423riyHLPrjo3ww6N
 zZtISUAQUQvrxiuvpxittjRJGuSR2gDvvggmjS8cGZzRNCVBZK9riVbpMvmRaLTd
 6dhEn4/cko+Oeh7PMNJ+3GIvc15sQSo2z7cQVvqD/zYVXT4JoJWfAEjAjyPG8Vdn
 iZ6TZDUy5mWr4DqUMihPyzu5aeP99BWU8uac9lhWWl3D+EOI3mOUIngHcxqY8RVS
 EDReTghwbwQjFKfDFJYUbeFyrce1BiEUyXN+t4ksx8d0ZMNyVYx6uFRS/uTEE7k0
 So/vmB98kcpi12qpBckX1IE6QVWUb0azowDe+PFuuKZ8f0CPJxXNuQrtZAFmgWcM
 /hFXThognUZs8rN3XpZpjzn4FA82aOJW8F4nlDRP1JFot5k2/rOB9C6W0QnwFuoG
 1VNhbFgfvLapE230mb4M+P332YV8gIvdHj8qAWI/daryp2Ck8eIubkrj4v8fuGsg
 fEecthRmytjfWL6F8Nx5AedF2+GfqPJWEI9CFWoJft4FZgni5oe/RXYEwGPxDdsV
 um4zfAwbt1CMh8Z3ZTVraMKk2XVkMXrPtnNBtK5oV/NJs6hm110=
 =/cWE
 -----END PGP SIGNATURE-----

Merge tag 'clk-imx-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx

Pull i.MX clk driver updates from Abel Vesa:

 - Set suppress_bind_attrs to true for i.MX8ULP driver
 - Switch from do_div to div64_ul for throughout all drivers
 - Fix imx8mn_clko1_sels for i.MX8MN
 - Remove unused IPG_AUDIO_ROOT from i.MX8MP
 - Switch parent for audio_root_clk to audio ahb in i.MX8MP driver

* tag 'clk-imx-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
  clk: imx8mp: Fix the parent clk of the audio_root_clk
  clk: imx8mp: Remove IPG_AUDIO_ROOT from imx8mp-clock.h
  clk: imx8mn: Fix imx8mn_clko1_sels
  clk: imx: Use div64_ul instead of do_div
  clk: imx: imx8ulp: set suppress_bind_attrs to true
This commit is contained in:
Stephen Boyd 2021-12-28 21:53:29 -08:00
parent fa55b7dcdc 9dd8102108
commit 176a3200ef
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/clk/imx/clk-imx8mn.c
View File

@ -277,9 +277,9 @@ static const char * const imx8mn_pdm_sels[] = {"osc_24m", "sys_pll2_100m", "audi
static const char * const imx8mn_dram_core_sels[] = {"dram_pll_out", "dram_alt_root", };
static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m",
"sys_pll1_200m", "audio_pll2_out", "vpu_pll",
"sys_pll1_80m", };
static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "dummy",
"sys_pll1_200m", "audio_pll2_out", "sys_pll2_500m",
"dummy", "sys_pll1_80m", };
static const char * const imx8mn_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_400m",
"sys_pll2_166m", "sys_pll3_out", "audio_pll1_out",
"video_pll1_out", "osc_32k", };

2
drivers/clk/imx/clk-imx8mp.c
View File

@ -700,7 +700,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
hws[IMX8MP_CLK_HDMI_ROOT] = imx_clk_hw_gate4("hdmi_root_clk", "hdmi_axi", ccm_base + 0x45f0, 0);
hws[IMX8MP_CLK_TSENSOR_ROOT] = imx_clk_hw_gate4("tsensor_root_clk", "ipg_root", ccm_base + 0x4620, 0);
hws[IMX8MP_CLK_VPU_ROOT] = imx_clk_hw_gate4("vpu_root_clk", "vpu_bus", ccm_base + 0x4630, 0);
hws[IMX8MP_CLK_AUDIO_ROOT] = imx_clk_hw_gate4("audio_root_clk", "ipg_root", ccm_base + 0x4650, 0);
hws[IMX8MP_CLK_AUDIO_ROOT] = imx_clk_hw_gate4("audio_root_clk", "audio_ahb", ccm_base + 0x4650, 0);
hws[IMX8MP_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core",
hws[IMX8MP_CLK_A53_CORE]->clk,

1
drivers/clk/imx/clk-imx8ulp.c
View File

@ -559,6 +559,7 @@ static struct platform_driver imx8ulp_clk_driver = {
.probe = imx8ulp_clk_probe,
.driver = {
.name = KBUILD_MODNAME,
.suppress_bind_attrs = true,
.of_match_table = imx8ulp_clk_dt_ids,
},
};

6
drivers/clk/imx/clk-pllv3.c
View File

@ -247,7 +247,7 @@ static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate,
div = rate / parent_rate;
temp64 = (u64) (rate - div * parent_rate);
temp64 *= mfd;
do_div(temp64, parent_rate);
temp64 = div64_ul(temp64, parent_rate);
mfn = temp64;
temp64 = (u64)parent_rate;
@ -277,7 +277,7 @@ static int clk_pllv3_av_set_rate(struct clk_hw *hw, unsigned long rate,
div = rate / parent_rate;
temp64 = (u64) (rate - div * parent_rate);
temp64 *= mfd;
do_div(temp64, parent_rate);
temp64 = div64_ul(temp64, parent_rate);
mfn = temp64;
val = readl_relaxed(pll->base);
@ -334,7 +334,7 @@ static struct clk_pllv3_vf610_mf clk_pllv3_vf610_rate_to_mf(
/* rate = parent_rate * (mfi + mfn/mfd) */
temp64 = rate - parent_rate * mf.mfi;
temp64 *= mf.mfd;
do_div(temp64, parent_rate);
temp64 = div64_ul(temp64, parent_rate);
mf.mfn = temp64;
}

1
include/dt-bindings/clock/imx8mp-clock.h
View File

@ -117,7 +117,6 @@
#define IMX8MP_CLK_AUDIO_AHB 108
#define IMX8MP_CLK_MIPI_DSI_ESC_RX 109
#define IMX8MP_CLK_IPG_ROOT 110
#define IMX8MP_CLK_IPG_AUDIO_ROOT 111
#define IMX8MP_CLK_DRAM_ALT 112
#define IMX8MP_CLK_DRAM_APB 113
#define IMX8MP_CLK_VPU_G1 114