kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i.MX clock changes for 5.9:

Browse source 
- Add CAAM clock support for vf610 driver.
 - Add MU root clock support for imx8mp driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl8VGBEUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM407AgAlAlMVIHVNmob88YQc9LKb9eG0os3
 R/Qrz2dE4VdZbry2iPY3nfI/v+clUUfKB63I3Uj1knjvqMQDZK2vpzQEo9s31nMY
 xpAgPxoSzPYuglLKia982N77vehegZ/slSalDKfgdb0qRZFKTHNq4yByUx8pErVL
 mA1RSx5VXuelzwOiRg1RMJpuI/ljYM2f6j7wBiENwNdWbxOZyLtzhwTpFqnP06hh
 X/2eYoJiqCpryCCDIK1xf2OHBWbN0tYJPQnJmZl+DmMmYChSs10afGfSiFb5waf+
 59pGQsiU4I3Epbe66oLhI7Fk8X5NNlU40Zmo4BaDWQLatPLycswBt2xewg==
 =C5MK
 -----END PGP SIGNATURE-----

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

Pull i.MX clk updates from Shawn Guo:

 - Add CAAM clock support for vf610 driver
 - Add MU root clock support for imx8mp driver

* tag 'clk-imx-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx: vf610: add CAAM clock
  clk: imx8mp: add mu root clk
This commit is contained in:
Stephen Boyd 2020-07-21 01:02:00 -07:00
commit 22b1408b0d
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/clk/imx/clk-imx8mp.c
View file

@ -680,6 +680,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
hws[IMX8MP_CLK_I2C2_ROOT] = imx_clk_hw_gate4("i2c2_root_clk", "i2c2", ccm_base + 0x4180, 0);
hws[IMX8MP_CLK_I2C3_ROOT] = imx_clk_hw_gate4("i2c3_root_clk", "i2c3", ccm_base + 0x4190, 0);
hws[IMX8MP_CLK_I2C4_ROOT] = imx_clk_hw_gate4("i2c4_root_clk", "i2c4", ccm_base + 0x41a0, 0);
hws[IMX8MP_CLK_MU_ROOT] = imx_clk_hw_gate4("mu_root_clk", "ipg_root", ccm_base + 0x4210, 0);
hws[IMX8MP_CLK_OCOTP_ROOT] = imx_clk_hw_gate4("ocotp_root_clk", "ipg_root", ccm_base + 0x4220, 0);
hws[IMX8MP_CLK_PCIE_ROOT] = imx_clk_hw_gate4("pcie_root_clk", "pcie_aux", ccm_base + 0x4250, 0);
hws[IMX8MP_CLK_PWM1_ROOT] = imx_clk_hw_gate4("pwm1_root_clk", "pwm1", ccm_base + 0x4280, 0);

1
drivers/clk/imx/clk-vf610.c
View file

@ -438,6 +438,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
clk[VF610_CLK_SNVS] = imx_clk_gate2("snvs-rtc", "ipg_bus", CCM_CCGR6, CCM_CCGRx_CGn(7));
clk[VF610_CLK_DAP] = imx_clk_gate("dap", "platform_bus", CCM_CCSR, 24);
clk[VF610_CLK_OCOTP] = imx_clk_gate("ocotp", "ipg_bus", CCM_CCGR6, CCM_CCGRx_CGn(5));
clk[VF610_CLK_CAAM] = imx_clk_gate2("caam", "ipg_bus", CCM_CCGR11, CCM_CCGRx_CGn(0));
imx_check_clocks(clk, ARRAY_SIZE(clk));

3
include/dt-bindings/clock/vf610-clock.h
View file

@ -195,6 +195,7 @@
#define VF610_CLK_WKPU 186
#define VF610_CLK_TCON0 187
#define VF610_CLK_TCON1 188
#define VF610_CLK_END 189
#define VF610_CLK_CAAM 189
#define VF610_CLK_END 190
#endif /* __DT_BINDINGS_CLOCK_VF610_H */