* [patch] collie: fix missing pcmcia bits @ 2006-03-05 13:53 Pavel Machek 2006-03-05 18:23 ` Richard Purdie 0 siblings, 1 reply; 4+ messages in thread From: Pavel Machek @ 2006-03-05 13:53 UTC (permalink / raw) To: rpurdie, lenz, kernel list, Russell King, linux This adds missing bits of collie (sharp sl-5500) PCMCIA support. Signed-off-by: Pavel Machek <pavel@suse.cz> 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]; + platform_scoop_config = &collie_pcmcia_config; 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> +#include <linux/delay.h> + +#ifdef CONFIG_SA1100_COLLIE +#include <asm/arch-sa1100/collie.h> +#else +#include <asm/arch/spitz.h> +#include <asm/arch-pxa/pxa-regs.h> +#endif #include "soc_common.h" -- Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted... ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] collie: fix missing pcmcia bits 2006-03-05 13:53 [patch] collie: fix missing pcmcia bits Pavel Machek @ 2006-03-05 18:23 ` Richard Purdie 2006-03-06 13:23 ` Pavel Machek 0 siblings, 1 reply; 4+ messages in thread From: Richard Purdie @ 2006-03-05 18:23 UTC (permalink / raw) To: Pavel Machek; +Cc: lenz, kernel list, Russell King, linux 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 <pavel@suse.cz> > > 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] collie: fix missing pcmcia bits 2006-03-05 18:23 ` Richard Purdie @ 2006-03-06 13:23 ` Pavel Machek 2006-03-06 17:08 ` Richard Purdie 0 siblings, 1 reply; 4+ messages in thread From: Pavel Machek @ 2006-03-06 13:23 UTC (permalink / raw) To: Richard Purdie; +Cc: Andrew Morton, lenz, kernel list, Russell King, linux Hi! This adds missing bits of collie (sharp sl-5500) PCMCIA support and MFD support. Signed-off-by: Pavel Machek <pavel@suse.cz> --- > > @@ -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? Will check; I used old diff because new diff included too much additional fluff.. oops. ...ahha, oops, sorry, I have some bad stuff in my "good" tree. Here's updated patch... > > + > > +#ifdef CONFIG_SA1100_COLLIE > > +#include <asm/arch-sa1100/collie.h> > > I can't immediately see why this is needed anymore. It is not. Sorry about it and surrounding changes. diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 6888816..ce2b479 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -40,6 +40,7 @@ #include <asm/hardware/scoop.h> #include <asm/mach/sharpsl_param.h> #include <asm/hardware/locomo.h> +#include <asm/arch/mcp.h> #include "generic.h" @@ -66,6 +67,32 @@ struct platform_device colliescoop_devic .resource = collie_scoop_resources, }; +static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = { +{ + .dev = &colliescoop_device.dev, + .irq = COLLIE_IRQ_GPIO_CF_IRQ, + .cd_irq = COLLIE_IRQ_GPIO_CF_CD, + .cd_irq_str = "PCMCIA0 CD", +}, +}; + +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, +}; + + +static struct sa1100_port_fns collie_port_fns __initdata = { + .set_mctrl = collie_uart_set_mctrl, + .get_mctrl = collie_uart_get_mctrl, +}; + static struct resource locomo_resources[] = { [0] = { @@ -153,12 +246,14 @@ static void __init collie_init(void) PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \ PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM ); PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 ); GAFR |= GPIO_32_768kHz; GPDR |= GPIO_32_768kHz; TUCR = TUCR_32_768kHz; + platform_scoop_config = &collie_pcmcia_config; + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); if (ret) { printk(KERN_WARNING "collie: Unable to register LoCoMo device\n"); @@ -166,6 +302,7 @@ static void __init collie_init(void) sa11x0_set_flash_data(&collie_flash_data, collie_flash_resources, ARRAY_SIZE(collie_flash_resources)); + sa11x0_set_mcp_data(&collie_mcp_data); sharpsl_save_param(); } -- Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted... ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] collie: fix missing pcmcia bits 2006-03-06 13:23 ` Pavel Machek @ 2006-03-06 17:08 ` Richard Purdie 0 siblings, 0 replies; 4+ messages in thread From: Richard Purdie @ 2006-03-06 17:08 UTC (permalink / raw) To: Pavel Machek, Russell King; +Cc: lenz, kernel list, linux, Andrew Morton On Mon, 2006-03-06 at 14:23 +0100, Pavel Machek wrote: > Hi! > > This adds missing bits of collie (sharp sl-5500) PCMCIA support and > MFD support. > > Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Richard Purdie <rpurdie@rpsys.net> > --- > diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c > index 6888816..ce2b479 100644 > --- a/arch/arm/mach-sa1100/collie.c > +++ b/arch/arm/mach-sa1100/collie.c > @@ -40,6 +40,7 @@ > #include <asm/hardware/scoop.h> > #include <asm/mach/sharpsl_param.h> > #include <asm/hardware/locomo.h> > +#include <asm/arch/mcp.h> > > #include "generic.h" > > @@ -66,6 +67,32 @@ struct platform_device colliescoop_devic > .resource = collie_scoop_resources, > }; > > +static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = { > +{ > + .dev = &colliescoop_device.dev, > + .irq = COLLIE_IRQ_GPIO_CF_IRQ, > + .cd_irq = COLLIE_IRQ_GPIO_CF_CD, > + .cd_irq_str = "PCMCIA0 CD", > +}, > +}; > + > +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, > +}; > + > + > +static struct sa1100_port_fns collie_port_fns __initdata = { > + .set_mctrl = collie_uart_set_mctrl, > + .get_mctrl = collie_uart_get_mctrl, > +}; > + > > static struct resource locomo_resources[] = { > [0] = { > @@ -153,12 +246,14 @@ static void __init collie_init(void) > PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \ > PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM ); > > PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 ); > > GAFR |= GPIO_32_768kHz; > GPDR |= GPIO_32_768kHz; > TUCR = TUCR_32_768kHz; > > + platform_scoop_config = &collie_pcmcia_config; > + > ret = platform_add_devices(devices, ARRAY_SIZE(devices)); > if (ret) { > printk(KERN_WARNING "collie: Unable to register LoCoMo device\n"); > @@ -166,6 +302,7 @@ static void __init collie_init(void) > > sa11x0_set_flash_data(&collie_flash_data, collie_flash_resources, > ARRAY_SIZE(collie_flash_resources)); > + sa11x0_set_mcp_data(&collie_mcp_data); > > sharpsl_save_param(); > } > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-03-06 17:09 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-03-05 13:53 [patch] collie: fix missing pcmcia bits Pavel Machek 2006-03-05 18:23 ` Richard Purdie 2006-03-06 13:23 ` Pavel Machek 2006-03-06 17:08 ` Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
Powered by JetHome