| Message ID | 1473015587-15589-2-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Sep 04, 2016 at 08:59:46PM +0200, Robert Jarzmik wrote: > Add the clock provided to the PCMCIA block so that sa1111_pcmcia_add() > doesn't end up on error while probing "1800" device. I don't think this is correct - SA1111 is not really the PCMCIA controller - it's a load of logic which sits between the host device and the PCMCIA sockets to manage buffers and the PCMCIA socket control signals. The timing is done by the SoC, and the PCMCIA driver needs a clock to compute the timing information for the PCMCIA interface. Originally, in 2.6.12-rc2, lubbock (and all of the PXA socket drivers) were using pxa2xx_base.c, which got the clock frequency via get_memclk_frequency_10khz(). In 2a125dd56b3a ("ARM: pxa: remove get_memclk_frequency_10khz()") this was changed to use the clk API, and added the "pxa2xx-pcmcia" clock. However, it ignored Lubbock, because that doesn't use _that_ device, but the SA1111 PCMCIA sub-device "1800". This commit should have introduced an identical entry for the SA1111 PCMCIA sub-device. This is actually one of the problems converting these platforms to DT - seemingly simple stuff is actually quite complex because the resources are spread around. In the case of Lubbock, some of the resources are on the PXA255 SoC, others are on the SA1111 which requires a fair amount of initialisation to get to. I think we're really into the "combine multiple devices into one logical device" game (iow, using the component helper), just like DRM and other subsystems. The quick fix here is to add a clock for the SA1111 PCMCIA sub-device, but it still needs to be the SoC memory clock - iow, what get_memclk_frequency_10khz() would have returned as that's what pxa2xx_base.c wants.
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index cd401546cea8..0bcb107d69b4 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c @@ -491,6 +491,7 @@ static void __init lubbock_init(void) gpiod_add_lookup_table(&sa1111_pcmcia_gpio_table); clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); + clk_add_alias(NULL, "1800", "SA1111_CLK", NULL); pxa_set_udc_info(&udc_info); pxa_set_fb_info(NULL, &sharp_lm8v31); pxa_set_mci_info(&lubbock_mci_platform_data);
Add the clock provided to the PCMCIA block so that sa1111_pcmcia_add() doesn't end up on error while probing "1800" device. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- arch/arm/mach-pxa/lubbock.c | 1 + 1 file changed, 1 insertion(+)