Commit 389eda15 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Haojian Zhuang
Browse files

ARM: pxa: add clk support in gpio driver 



Support clk in gpio driver. There's no gpio clock in PXA25x and PXA27x.
So use dummy clk instead. And move the gpio edge initialization into
gpio driver for arch-mmp.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
parent be24168f

arch/arm/mach-mmp/mmp2.c

+2 −9
Original line number Diff line number Diff line
@@ -93,18 +93,9 @@ void mmp2_clear_pmic_int(void) 
	__raw_writel(data, mfpr_pmic);

}



static void __init mmp2_init_gpio(void)

{

	int i;



	/* enable GPIO clock */

	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_MMP2_GPIO);

}



void __init mmp2_init_irq(void)

{

	mmp2_init_icu();

	mmp2_init_gpio();

}



static void sdhc_clk_enable(struct clk *clk)
@@ -141,6 +132,7 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000); 
static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);

static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);

static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);

static APBC_CLK(gpio, MMP2_GPIO, 0, 26000000);



static APMU_CLK(nand, NAND, 0xbf, 100000000);

static APMU_CLK_OPS(sdh0, SDH0, 0x1b, 200000000, &sdhc_clk_ops);
@@ -160,6 +152,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_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/pxa168.c

+2 −9
Original line number Diff line number Diff line
@@ -43,18 +43,9 @@ static struct mfp_addr_map pxa168_mfp_addr_map[] __initdata = 
	MFP_ADDR_END,

};



static void __init pxa168_init_gpio(void)

{

	int i;



	/* enable GPIO clock */

	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA168_GPIO);

}



void __init pxa168_init_irq(void)

{

	icu_init_irq();

	pxa168_init_gpio();

}



/* APB peripheral clocks */
@@ -72,6 +63,7 @@ static APBC_CLK(ssp2, PXA168_SSP2, 4, 0); 
static APBC_CLK(ssp3, PXA168_SSP3, 4, 0);

static APBC_CLK(ssp4, PXA168_SSP4, 4, 0);

static APBC_CLK(ssp5, PXA168_SSP5, 4, 0);

static APBC_CLK(gpio, PXA168_GPIO, 0, 13000000);

static APBC_CLK(keypad, PXA168_KPC, 0, 32000);



static APMU_CLK(nand, NAND, 0x19b, 156000000);
@@ -97,6 +89,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_keypad, "pxa27x-keypad", NULL),

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

	INIT_CLKREG(&clk_usb, "pxa168-ehci", "PXA168-USBCLK"),

arch/arm/mach-mmp/pxa910.c

+2 −9
Original line number Diff line number Diff line
@@ -77,18 +77,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata = 
	MFP_ADDR_END,

};



static void __init pxa910_init_gpio(void)

{

	int i;



	/* enable GPIO clock */

	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA910_GPIO);

}



void __init pxa910_init_irq(void)

{

	icu_init_irq();

	pxa910_init_gpio();

}



/* APB peripheral clocks */
@@ -100,6 +91,7 @@ static APBC_CLK(pwm1, PXA910_PWM1, 1, 13000000); 
static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);

static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);

static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);

static APBC_CLK(gpio, PXA910_GPIO, 0, 13000000);



static APMU_CLK(nand, NAND, 0x19b, 156000000);

static APMU_CLK(u2o, USB, 0x1b, 480000000);
@@ -115,6 +107,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_u2o, "pxa-u2o", "U2OCLK"),

};

arch/arm/mach-pxa/pxa25x.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static struct clk_lookup pxa25x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),

	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),

	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),

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

};



static struct clk_lookup pxa25x_hwuart_clkreg =

arch/arm/mach-pxa/pxa27x.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),

	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),

	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),

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

};



#ifdef CONFIG_PM