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

Commit e69dc9a9 authored by Shawn Guo's avatar Shawn Guo
Browse files

video: imxfb: 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: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev@vger.kernel.org
parent 7f917a8d

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

+3 −3
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ int __init mx1_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[per2], "per", "imx1-cspi.1");

	clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.1");

	clk_register_clkdev(clk[per2], NULL, "imx-mmc.0");

	clk_register_clkdev(clk[per2], "per", "imx-fb.0");

	clk_register_clkdev(clk[dummy], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[dummy], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[per2], "per", "imx1-fb.0");

	clk_register_clkdev(clk[dummy], "ipg", "imx1-fb.0");

	clk_register_clkdev(clk[dummy], "ahb", "imx1-fb.0");

	clk_register_clkdev(clk[hclk], "mshc", NULL);

	clk_register_clkdev(clk[per3], "ssi", NULL);

	clk_register_clkdev(clk[clk32], NULL, "imx1-rtc.0");

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

+3 −3
Original line number Diff line number Diff line
@@ -157,9 +157,9 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) 
	clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx21-cspi.1");

	clk_register_clkdev(clk[per2], "per", "imx21-cspi.2");

	clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx21-cspi.2");

	clk_register_clkdev(clk[per3], "per", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[per3], "per", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx21-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, "imx21-nand.0");

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

+3 −3
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0");

	clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0");

	clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0");

	clk_register_clkdev(clk[lcdc_ipg_per], "per", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_per], "per", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx21-fb.0");

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

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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");

	clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");

	clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");

	clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");

	clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0");

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

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc");

arch/arm/mach-imx/devices/devices-common.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct platform_device *__init imx_add_imxdi_rtc( 


#include <linux/platform_data/video-imxfb.h>

struct imx_imx_fb_data {

	const char *devid;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;