Commit d635c351 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-imx7ulp-5.2' of... 

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

Pull i.MX7UPL clk changes from Shawn Guo:

 - Remove SNVS clock from i.MX7UPL clock driver and bindings, as the
   clock will be visible on M4 core only, and never be accessed by
   Cortex-A cores

* tag 'clk-imx7ulp-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: clock: imx7ulp: remove SNVS clock
  clk: imx7ulp: remove snvs clock
parents 363de1d6 d058fb60

drivers/clk/imx/clk-imx7ulp.c

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ static void __init imx7ulp_clk_pcc2_init(struct device_node *np) 
	clks[IMX7ULP_CLK_DMA1]		= imx_clk_hw_gate("dma1", "nic1_clk", base + 0x20, 30);

	clks[IMX7ULP_CLK_RGPIO2P1]	= imx_clk_hw_gate("rgpio2p1", "nic1_bus_clk", base + 0x3c, 30);

	clks[IMX7ULP_CLK_DMA_MUX1]	= imx_clk_hw_gate("dma_mux1", "nic1_bus_clk", base + 0x84, 30);

	clks[IMX7ULP_CLK_SNVS]		= imx_clk_hw_gate("snvs", "nic1_bus_clk", base + 0x8c, 30);

	clks[IMX7ULP_CLK_CAAM]		= imx_clk_hw_gate("caam", "nic1_clk", base + 0x90, 30);

	clks[IMX7ULP_CLK_LPTPM4]	= imx7ulp_clk_composite("lptpm4",  periph_bus_sels, ARRAY_SIZE(periph_bus_sels), true, false, true, base + 0x94);

	clks[IMX7ULP_CLK_LPTPM5]	= imx7ulp_clk_composite("lptpm5",  periph_bus_sels, ARRAY_SIZE(periph_bus_sels), true, false, true, base + 0x98);

include/dt-bindings/clock/imx7ulp-clock.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#define IMX7ULP_CLK_FLEXBUS		2

#define IMX7ULP_CLK_SEMA42_1		3

#define IMX7ULP_CLK_DMA_MUX1		4

#define IMX7ULP_CLK_SNVS		5

#define IMX7ULP_CLK_CAAM		6

#define IMX7ULP_CLK_LPTPM4		7

#define IMX7ULP_CLK_LPTPM5		8

CRA Git | Maintained and supported by SUSTech CRA and CCSE