Skip to content

Commit 1a57c28

Browse files
author
Russell King
committed
ARM: pxa/lubbock: add pcmcia clock
Add the required PCMCIA clock for the SA1111 "1800" device. This clock is used to compute timing information for the PCMCIA interface in the SoC device, rather than the SA1111. Hence, the provision of this clock is a convenience for the driver and does not reflect the hardware, so this must not be copied into DT. Acked-by: Robert Jarzmik <[email protected]> Tested-by: Robert Jarzmik <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 07f56e6 commit 1a57c28

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

arch/arm/mach-pxa/lubbock.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,18 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
137137
// no D+ pullup; lubbock can't connect/disconnect in software
138138
};
139139

140+
static void lubbock_init_pcmcia(void)
141+
{
142+
struct clk *clk;
143+
144+
/* Add an alias for the SA1111 PCMCIA clock */
145+
clk = clk_get_sys("pxa2xx-pcmcia", NULL);
146+
if (!IS_ERR(clk)) {
147+
clkdev_create(clk, NULL, "1800");
148+
clk_put(clk);
149+
}
150+
}
151+
140152
static struct resource sa1111_resources[] = {
141153
[0] = {
142154
.start = 0x10000000,
@@ -467,6 +479,8 @@ static void __init lubbock_init(void)
467479
pxa_set_btuart_info(NULL);
468480
pxa_set_stuart_info(NULL);
469481

482+
lubbock_init_pcmcia();
483+
470484
clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL);
471485
pxa_set_udc_info(&udc_info);
472486
pxa_set_fb_info(NULL, &sharp_lm8v31);

0 commit comments

Comments
 (0)