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

Commit a55b5ada authored by Russell King's avatar Russell King
Browse files

Revert "ARM: pxa: add dummy clock for sa1100-rtc" 

This reverts commit 7557c175.

This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.
parent 8bd92669

arch/arm/mach-pxa/pxa25x.c

+0 −2
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ 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),

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

};



static struct clk_lookup pxa25x_hwuart_clkreg =

arch/arm/mach-pxa/pxa27x.c

+0 −2
Original line number Diff line number Diff line
@@ -230,8 +230,6 @@ 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),

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

};



#ifdef CONFIG_PM

arch/arm/mach-pxa/pxa300.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0); 
static struct clk_lookup common_clkregs[] = {

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

	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),

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

};



static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);

arch/arm/mach-pxa/pxa320.c

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0); 
static struct clk_lookup pxa320_clkregs[] = {

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

	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),

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

};



static int __init pxa320_init(void)

arch/arm/mach-pxa/pxa3xx.c

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = { 
	INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),

	/* Power I2C clock is always on */

	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),

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

	INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL),

	INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),

	INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),