On Sun, 2006-03-05 at 14:53 +0100, Pavel Machek wrote:
> This adds missing bits of collie (sharp sl-5500) PCMCIA support.
>
> Signed-off-by: Pavel Machek <[email protected]>
>
> diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
> index f146e5e..8bd802e 100644
> --- a/arch/arm/mach-sa1100/collie.c
> +++ b/arch/arm/mach-sa1100/collie.c
> @@ -76,6 +76,12 @@ static struct scoop_pcmcia_dev collie_pc
> },
> };
>
> +static struct scoop_pcmcia_config collie_pcmcia_config = {
> + .devs = &collie_pcmcia_scoop[0],
> + .num_devs = 1,
> +};
> +
> +
> static struct mcp_plat_data collie_mcp_data = {
> .mccr0 = MCCR0_ADM,
> .sclk_rate = 11981000,
> @@ -242,8 +249,7 @@ static void __init collie_init(void)
> GPDR |= GPIO_32_768kHz;
> TUCR = TUCR_32_768kHz;
>
> - scoop_num = 1;
> - scoop_devs = &collie_pcmcia_scoop[0];
These lines don't exist in mainline kernels anymore? What was this
diffed against?
> + platform_scoop_config = &collie_pcmcia_config;
This is fine (and its definition above).
> ret = platform_add_devices(devices, ARRAY_SIZE(devices));
> if (ret) {
> diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
> index fd36473..f1363b8 100644
> --- a/drivers/pcmcia/pxa2xx_sharpsl.c
> +++ b/drivers/pcmcia/pxa2xx_sharpsl.c
> @@ -22,6 +22,15 @@
> #include <asm/hardware.h>
> #include <asm/irq.h>
> #include <asm/hardware/scoop.h>
> +#include <asm/mach-types.h>
This is needed but its already in mainline?
> +#include <linux/delay.h>
This is no longer needed (and should have been above asm anyway).
> +
> +#ifdef CONFIG_SA1100_COLLIE
> +#include <asm/arch-sa1100/collie.h>
I can't immediately see why this is needed anymore.
> +#else
> +#include <asm/arch/spitz.h>
> +#include <asm/arch-pxa/pxa-regs.h>
> +#endif
These aren't needed.
Richard
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
