Re: [PATCH -next] pcmcia: fix controller printk warnings

2009-09-18 Thread Randy Dunlap
On Fri, 18 Sep 2009 14:34:03 -0700 Andrew Morton wrote:

> On Thu, 17 Sep 2009 14:14:23 -0700
> Randy Dunlap  wrote:
> 
> > Subject: [PATCH -next] pcmcia: fix controller printk warnings
> 
> Why the "-next"?
> 
> > 
> > drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> > int', but argument 6 has type 'phys_addr_t'
> > drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> > int', but argument 7 has type 'phys_addr_t'
> > drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned 
> > int', but argument 6 has type 'phys_addr_t'
> > drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned 
> > int', but argument 7 has type 'phys_addr_t'
> 
> afacit this patch is needed in mainline also, but the "-next" indicates
> that it's only needed in linux-next.  This sends me scrabbling around
> trying to work out why the "-next" was added.

That's where I encountered the warnings.


---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


Re: aironet 350

2009-09-18 Thread Komuro

Hi,

Please post the output of "pccardctl ident".


Best Regards
Komuro

>
>
>I am using a 2.6.27.7 kernel and the card is not initialize by pccard.
>Actually it is not even in the output of lspci !! but the kernel (pccard)
>shows at least that the card was inserted if the slot.
>The card was working fine with kernel 2.4.31 and the old card manager
>
>Is it a know problem ?
>Is there any solution to this issue ?
>PC is a dell latitude csx (pretty old)
>Alfredo
>
>___
>Linux PCMCIA reimplementation list
>http://lists.infradead.org/mailman/listinfo/linux-pcmcia


___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


Re: [PATCH -next] pcmcia: fix controller printk warnings

2009-09-18 Thread Andrew Morton
On Thu, 17 Sep 2009 14:14:23 -0700
Randy Dunlap  wrote:

> Subject: [PATCH -next] pcmcia: fix controller printk warnings

Why the "-next"?

> 
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> int', but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> int', but argument 7 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', 
> but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', 
> but argument 7 has type 'phys_addr_t'

afacit this patch is needed in mainline also, but the "-next" indicates
that it's only needed in linux-next.  This sends me scrabbling around
trying to work out why the "-next" was added.


___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


Re: [PATCH] MIPS: BCM63xx: Add PCMCIA & Cardbus support.

2009-09-18 Thread Greg KH
On Fri, Sep 18, 2009 at 01:21:31PM +0200, Maxime Bizon wrote:
> 
> Hi Wolfram & Greg,
> 
> It seems Dominik is busy, and you're the one acking pcmcia patch at the
> moment so I'm sending this to you.
> 
> 
> This is a pcmcia/cardbus driver for the bcm63xx mips SOCs, it was
> already posted twice:
> 
> last year: 
> http://lists.infradead.org/pipermail/linux-pcmcia/2008-October/005942.html
> three months ago: 
> http://lists.infradead.org/pipermail/linux-pcmcia/2009-July/006196.html
> 
> and got no review.
> 
> Could you please have a look at it ?

I'll trust Wolfram on these.  If he queues stuff up, I can get them to
Linus.

thanks,

greg k-h

___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


Re: [PATCH -next] pcmcia: fix controller printk warnings

2009-09-18 Thread Randy Dunlap
On Fri, 18 Sep 2009 09:05:45 +0200 Wolfram Sang wrote:

> On Thu, Sep 17, 2009 at 02:14:23PM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap 
> > 
> > Fix new pcmcia printk format warnings:
> > 
> > drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> > int', but argument 6 has type 'phys_addr_t'
> > drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> > int', but argument 7 has type 'phys_addr_t'
> > drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned 
> > int', but argument 6 has type 'phys_addr_t'
> > drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned 
> > int', but argument 7 has type 'phys_addr_t'
> > 
> > Signed-off-by: Randy Dunlap 
> Acked-by: Wolfram Sang 
> 
> I spotted another four drivers needing a similar patch (soc_common, m32r_* and
> m8xx_pcmcia). Do you want to add them, shall I make a patch on top of this one
> or incorporate all into one patch?

You add those, please.  Thanks.


> > ---
> >  drivers/pcmcia/i82365.c |4 ++--
> >  drivers/pcmcia/tcic.c   |4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > --- linux-next-20090917.orig/drivers/pcmcia/tcic.c
> > +++ linux-next-20090917/drivers/pcmcia/tcic.c
> > @@ -732,8 +732,8 @@ static int tcic_set_io_map(struct pcmcia
> >  u_short base, len, ioctl;
> >  
> >  debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> > - "%#x-%#x)\n", psock, io->map, io->flags,
> > - io->speed, io->start, io->stop);
> > + "%#llx-%#llx)\n", psock, io->map, io->flags, io->speed,
> > + (unsigned long long)io->start, (unsigned long long)io->stop);
> >  if ((io->map > 1) || (io->start > 0x) || (io->stop > 0x) ||
> > (io->stop < io->start)) return -EINVAL;
> >  tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
> > --- linux-next-20090917.orig/drivers/pcmcia/i82365.c
> > +++ linux-next-20090917/drivers/pcmcia/i82365.c
> > @@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock,
> >  u_char map, ioctl;
> >  
> >  debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> > - "%#x-%#x)\n", sock, io->map, io->flags,
> > - io->speed, io->start, io->stop);
> > + "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed,
> > + (unsigned long long)io->start, (unsigned long long)io->stop);
> >  map = io->map;
> >  if ((map > 1) || (io->start > 0x) || (io->stop > 0x) ||
> > (io->stop < io->start)) return -EINVAL;
> 
> -- 
> Pengutronix e.K.   | Wolfram Sang|
> Industrial Linux Solutions | http://www.pengutronix.de/  |


---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


[PATCH] MIPS: BCM63xx: Add PCMCIA & Cardbus support.

2009-09-18 Thread Maxime Bizon

Hi Wolfram & Greg,

It seems Dominik is busy, and you're the one acking pcmcia patch at the
moment so I'm sending this to you.


This is a pcmcia/cardbus driver for the bcm63xx mips SOCs, it was
already posted twice:

last year: 
http://lists.infradead.org/pipermail/linux-pcmcia/2008-October/005942.html
three months ago: 
http://lists.infradead.org/pipermail/linux-pcmcia/2009-July/006196.html

and got no review.

Could you please have a look at it ?

Thanks !


Signed-off-by: Maxime Bizon 
Signed-off-by: Ralf Baechle 
---

diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
index cff75de..c146d1e 100644
--- a/arch/mips/bcm63xx/Makefile
+++ b/arch/mips/bcm63xx/Makefile
@@ -1,5 +1,5 @@
 obj-y  += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
-  dev-dsp.o dev-enet.o dev-uart.o
+  dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
 
 obj-y  += boards/
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index d3fdf27..e3e6205 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -796,6 +797,9 @@ int __init board_register_devices(void)
 
bcm63xx_uart_register();
 
+   if (board.has_pccard)
+   bcm63xx_pcmcia_register();
+
if (board.has_enet0 &&
!board_get_mac_address(board.enet0.mac_addr))
bcm63xx_enet_register(0, &board.enet0);
diff --git a/arch/mips/bcm63xx/dev-pcmcia.c b/arch/mips/bcm63xx/dev-pcmcia.c
new file mode 100644
index 000..40ec4bc
--- /dev/null
+++ b/arch/mips/bcm63xx/dev-pcmcia.c
@@ -0,0 +1,135 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2008 Maxime Bizon 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+static struct resource pcmcia_resources[] = {
+   /* pcmcia registers */
+   {
+   .start  = -1, /* filled at runtime */
+   .end= -1, /* filled at runtime */
+   .flags  = IORESOURCE_MEM,
+   },
+
+   /* pcmcia memory zone resources */
+   {
+   .start  = BCM_PCMCIA_COMMON_BASE_PA,
+   .end= BCM_PCMCIA_COMMON_END_PA,
+   .flags  = IORESOURCE_MEM,
+   },
+   {
+   .start  = BCM_PCMCIA_ATTR_BASE_PA,
+   .end= BCM_PCMCIA_ATTR_END_PA,
+   .flags  = IORESOURCE_MEM,
+   },
+   {
+   .start  = BCM_PCMCIA_IO_BASE_PA,
+   .end= BCM_PCMCIA_IO_END_PA,
+   .flags  = IORESOURCE_MEM,
+   },
+
+   /* PCMCIA irq */
+   {
+   .start  = -1, /* filled at runtime */
+   .flags  = IORESOURCE_IRQ,
+   },
+
+   /* declare PCMCIA IO resource also */
+   {
+   .start  = BCM_PCMCIA_IO_BASE_PA,
+   .end= BCM_PCMCIA_IO_END_PA,
+   .flags  = IORESOURCE_IO,
+   },
+};
+
+static struct bcm63xx_pcmcia_platform_data pd;
+
+static struct platform_device bcm63xx_pcmcia_device = {
+   .name   = "bcm63xx_pcmcia",
+   .id = 0,
+   .num_resources  = ARRAY_SIZE(pcmcia_resources),
+   .resource   = pcmcia_resources,
+   .dev= {
+   .platform_data = &pd,
+   },
+};
+
+static int __init config_pcmcia_cs(unsigned int cs,
+  u32 base, unsigned int size)
+{
+   int ret;
+
+   ret = bcm63xx_set_cs_status(cs, 0);
+   if (!ret)
+   ret = bcm63xx_set_cs_base(cs, base, size);
+   if (!ret)
+   ret = bcm63xx_set_cs_status(cs, 1);
+   return ret;
+}
+
+static const __initdata unsigned int pcmcia_cs[3][3] = {
+   /* cs, base address, size */
+   { MPI_CS_PCMCIA_COMMON, BCM_PCMCIA_COMMON_BASE_PA,
+ BCM_PCMCIA_COMMON_SIZE },
+
+   { MPI_CS_PCMCIA_ATTR, BCM_PCMCIA_ATTR_BASE_PA,
+ BCM_PCMCIA_ATTR_SIZE },
+
+   { MPI_CS_PCMCIA_IO, BCM_PCMCIA_IO_BASE_PA,
+ BCM_PCMCIA_IO_SIZE },
+};
+
+int __init bcm63xx_pcmcia_register(void)
+{
+   int ret, i;
+
+   if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358())
+   return 0;
+
+   /* use correct pcmcia ready gpio depending on processor */
+   switch (bcm63xx_get_cpu_id()) {
+   case BCM6348_CPU_ID:
+   pd.ready_gpio = 22;
+   break;
+
+   case BCM6358_CPU_ID:
+   pd.ready_gpio = 22;
+   break;
+
+   default:
+   return -ENODEV;
+   }
+
+   

Re: [PATCH -next] pcmcia: fix controller printk warnings

2009-09-18 Thread Wolfram Sang
On Thu, Sep 17, 2009 at 02:14:23PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap 
> 
> Fix new pcmcia printk format warnings:
> 
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> int', but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned 
> int', but argument 7 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', 
> but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', 
> but argument 7 has type 'phys_addr_t'
> 
> Signed-off-by: Randy Dunlap 
Acked-by: Wolfram Sang 

I spotted another four drivers needing a similar patch (soc_common, m32r_* and
m8xx_pcmcia). Do you want to add them, shall I make a patch on top of this one
or incorporate all into one patch?

> ---
>  drivers/pcmcia/i82365.c |4 ++--
>  drivers/pcmcia/tcic.c   |4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> --- linux-next-20090917.orig/drivers/pcmcia/tcic.c
> +++ linux-next-20090917/drivers/pcmcia/tcic.c
> @@ -732,8 +732,8 @@ static int tcic_set_io_map(struct pcmcia
>  u_short base, len, ioctl;
>  
>  debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> -   "%#x-%#x)\n", psock, io->map, io->flags,
> -   io->speed, io->start, io->stop);
> +   "%#llx-%#llx)\n", psock, io->map, io->flags, io->speed,
> +   (unsigned long long)io->start, (unsigned long long)io->stop);
>  if ((io->map > 1) || (io->start > 0x) || (io->stop > 0x) ||
>   (io->stop < io->start)) return -EINVAL;
>  tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
> --- linux-next-20090917.orig/drivers/pcmcia/i82365.c
> +++ linux-next-20090917/drivers/pcmcia/i82365.c
> @@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock,
>  u_char map, ioctl;
>  
>  debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> -   "%#x-%#x)\n", sock, io->map, io->flags,
> -   io->speed, io->start, io->stop);
> +   "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed,
> +   (unsigned long long)io->start, (unsigned long long)io->stop);
>  map = io->map;
>  if ((map > 1) || (io->start > 0x) || (io->stop > 0x) ||
>   (io->stop < io->start)) return -EINVAL;

-- 
Pengutronix e.K.   | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/  |


signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia