mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Revert "ARM: pxa: add dummy clock for sa1100-rtc"
This reverts commit 7557c175f6
.
This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.
This commit is contained in:
parent
8bd9266919
commit
a55b5adaf4
6 changed files with 0 additions and 8 deletions
|
@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
|
INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
|
||||||
INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
|
INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
|
||||||
INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
|
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 =
|
static struct clk_lookup pxa25x_hwuart_clkreg =
|
||||||
|
|
|
@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
|
INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
|
||||||
INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
|
INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
|
||||||
INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
|
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
|
#ifdef CONFIG_PM
|
||||||
|
|
|
@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
|
||||||
static struct clk_lookup common_clkregs[] = {
|
static struct clk_lookup common_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
|
INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
|
||||||
INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
|
INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
|
||||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
|
static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
|
||||||
|
|
|
@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
|
||||||
static struct clk_lookup pxa320_clkregs[] = {
|
static struct clk_lookup pxa320_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
|
INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
|
||||||
INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
|
INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
|
||||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init pxa320_init(void)
|
static int __init pxa320_init(void)
|
||||||
|
|
|
@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
|
INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
|
||||||
/* Power I2C clock is always on */
|
/* Power I2C clock is always on */
|
||||||
INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
|
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_lcd, "pxa2xx-fb", NULL),
|
||||||
INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),
|
INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),
|
||||||
INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),
|
INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),
|
||||||
|
|
|
@ -217,7 +217,6 @@ static struct clk_lookup pxa95x_clkregs[] = {
|
||||||
INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
|
INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
|
||||||
/* Power I2C clock is always on */
|
/* Power I2C clock is always on */
|
||||||
INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
|
INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
|
||||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
|
||||||
INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
|
INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
|
||||||
INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
|
INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
|
||||||
INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),
|
INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),
|
||||||
|
|
Loading…
Reference in a new issue