Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d62435f authored by Shawn Guo's avatar Shawn Guo
Browse files

mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id 



It changes the driver to use platform_device_id rather than cpu_is_xxx
to determine the controller type, and updates the platform code
accordingly.

As the result, mach/hardware.h inclusion gets removed from the driver.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: linux-mtd@lists.infradead.org
parent 5bdfba29

arch/arm/mach-imx/clk-imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) 
	clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[usb_gate], "per", "imx21-hcd.0");

	clk_register_clkdev(clk[usb_hclk_gate], "ahb", "imx21-hcd.0");

	clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[nfc_gate], NULL, "imx21-nand.0");

	clk_register_clkdev(clk[dma_hclk_gate], "ahb", "imx-dma");

	clk_register_clkdev(clk[dma_gate], "ipg", "imx-dma");

	clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");

arch/arm/mach-imx/clk-imx25.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[usbotg_ahb], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[nfc_ipg_per], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0");

	/* i.mx25 has the i.mx35 type cspi */

	clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0");

	clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");

arch/arm/mach-imx/clk-imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");

	clk_register_clkdev(clk[nfc_baud_gate], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0");

	clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0");

	clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0");

	clk_register_clkdev(clk[dma_ahb_gate], "ahb", "imx-dma");

arch/arm/mach-imx/clk-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int __init mx31_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[rtc_gate], NULL, "mxc_rtc");

	clk_register_clkdev(clk[epit1_gate], "epit", NULL);

	clk_register_clkdev(clk[epit2_gate], "epit", NULL);

	clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0");

	clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");

	clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");

	clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");

arch/arm/mach-imx/clk-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int __init mx35_clocks_init() 
	clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[nfc_div], NULL, "mxc_nand.0");

	clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0");

	clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");



	clk_prepare_enable(clk[spba_gate]);