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

Commit 2cab0292 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: remove cpu_is_xxx in gpio driver 



Avoid to use cpu_is_xxx() in pxa gpio driver. Use platform_device_id
to identify the difference.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 31880c37

arch/arm/mach-mmp/clock-mmp2.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct clk_lookup mmp2_clkregs[] = { 
	INIT_CLKREG(&clk_twsi5, "pxa2xx-i2c.4", NULL),

	INIT_CLKREG(&clk_twsi6, "pxa2xx-i2c.5", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_gpio, "mmp2-gpio", NULL),

	INIT_CLKREG(&clk_sdh0, "sdhci-pxav3.0", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh1, "sdhci-pxav3.1", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh2, "sdhci-pxav3.2", "PXA-SDHCLK"),

arch/arm/mach-mmp/clock-pxa168.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct clk_lookup pxa168_clkregs[] = { 
	INIT_CLKREG(&clk_ssp5, "pxa168-ssp.4", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_lcd, "pxa168-fb", NULL),

	INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_gpio, "mmp-gpio", NULL),

	INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL),

	INIT_CLKREG(&clk_eth, "pxa168-eth", "MFUCLK"),

	INIT_CLKREG(&clk_usb, NULL, "PXA168-USBCLK"),

arch/arm/mach-mmp/clock-pxa910.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct clk_lookup pxa910_clkregs[] = { 
	INIT_CLKREG(&clk_pwm3, "pxa910-pwm.2", NULL),

	INIT_CLKREG(&clk_pwm4, "pxa910-pwm.3", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_gpio, "mmp-gpio", NULL),

	INIT_CLKREG(&clk_u2o, NULL, "U2OCLK"),

	INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),

};

arch/arm/mach-mmp/mmp-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

};
@@ -39,7 +39,7 @@ static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

};

arch/arm/mach-mmp/mmp2-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4016000, "pxa2xx-uart.3", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp2-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

};