Skip to content

Commit 30c1951

Browse files
fabioestevamShawn Guo
authored andcommitted
clk: imx: imx31: Remove mx31_clocks_init()
mx31_clocks_init() has been used to register clocks on i.MX31 non-devicetree platforms. Now that i.MX is a devicetree-only platform, it is safe to remove mx31_clocks_init() as there are no more users. Signed-off-by: Fabio Estevam <festevam@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 4d66bc3 commit 30c1951

1 file changed

Lines changed: 0 additions & 71 deletions

File tree

drivers/clk/imx/clk-imx31.c

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -132,77 +132,6 @@ static void __init _mx31_clocks_init(void __iomem *base, unsigned long fref)
132132
clk_disable_unprepare(clk[iim_gate]);
133133
}
134134

135-
int __init mx31_clocks_init(unsigned long fref)
136-
{
137-
void __iomem *base;
138-
139-
base = ioremap(MX31_CCM_BASE_ADDR, SZ_4K);
140-
if (!base)
141-
panic("%s: failed to map registers\n", __func__);
142-
143-
_mx31_clocks_init(base, fref);
144-
145-
clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0");
146-
clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
147-
clk_register_clkdev(clk[cspi1_gate], NULL, "imx31-cspi.0");
148-
clk_register_clkdev(clk[cspi2_gate], NULL, "imx31-cspi.1");
149-
clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2");
150-
clk_register_clkdev(clk[pwm_gate], "pwm", NULL);
151-
clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");
152-
clk_register_clkdev(clk[ckil], "ref", "imx21-rtc");
153-
clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc");
154-
clk_register_clkdev(clk[epit1_gate], "epit", NULL);
155-
clk_register_clkdev(clk[epit2_gate], "epit", NULL);
156-
clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0");
157-
clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");
158-
clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
159-
clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");
160-
clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0");
161-
clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0");
162-
clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");
163-
clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.1");
164-
clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.1");
165-
clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.1");
166-
clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.2");
167-
clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.2");
168-
clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");
169-
clk_register_clkdev(clk[usb_div_post], "per", "imx-udc-mx27");
170-
clk_register_clkdev(clk[usb_gate], "ahb", "imx-udc-mx27");
171-
clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27");
172-
clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");
173-
/* i.mx31 has the i.mx21 type uart */
174-
clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");
175-
clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.0");
176-
clk_register_clkdev(clk[uart2_gate], "per", "imx21-uart.1");
177-
clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.1");
178-
clk_register_clkdev(clk[uart3_gate], "per", "imx21-uart.2");
179-
clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.2");
180-
clk_register_clkdev(clk[uart4_gate], "per", "imx21-uart.3");
181-
clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.3");
182-
clk_register_clkdev(clk[uart5_gate], "per", "imx21-uart.4");
183-
clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.4");
184-
clk_register_clkdev(clk[i2c1_gate], NULL, "imx21-i2c.0");
185-
clk_register_clkdev(clk[i2c2_gate], NULL, "imx21-i2c.1");
186-
clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2");
187-
clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0");
188-
clk_register_clkdev(clk[sdhc1_gate], NULL, "imx31-mmc.0");
189-
clk_register_clkdev(clk[sdhc2_gate], NULL, "imx31-mmc.1");
190-
clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0");
191-
clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1");
192-
clk_register_clkdev(clk[firi_gate], "firi", NULL);
193-
clk_register_clkdev(clk[ata_gate], NULL, "pata_imx");
194-
clk_register_clkdev(clk[rtic_gate], "rtic", NULL);
195-
clk_register_clkdev(clk[rng_gate], NULL, "mxc_rnga");
196-
clk_register_clkdev(clk[sdma_gate], NULL, "imx31-sdma");
197-
clk_register_clkdev(clk[iim_gate], "iim", NULL);
198-
199-
200-
imx_register_uart_clocks(uart_clks);
201-
mxc_timer_init(MX31_GPT1_BASE_ADDR, MX31_INT_GPT, GPT_TYPE_IMX31);
202-
203-
return 0;
204-
}
205-
206135
static void __init mx31_clocks_init_dt(struct device_node *np)
207136
{
208137
struct device_node *osc_np;

0 commit comments

Comments
 (0)