* [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
[not found] <1240963177-23941-1-git-send-email-vbarinov@embeddedalley.com>
@ 2009-04-29 0:03 ` Vladimir Barinov
2009-04-29 6:19 ` David Miller
2009-04-29 8:48 ` Robby Cai
0 siblings, 2 replies; 9+ messages in thread
From: Vladimir Barinov @ 2009-04-29 0:03 UTC (permalink / raw)
To: netdev, s.hauer; +Cc: linux-arm-kernel
Add CS89x0 net chip support for MX27ADS board
Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
---
drivers/net/Kconfig | 5 +++--
drivers/net/cs89x0.c | 10 ++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 214a92d..25fd824 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1438,7 +1438,8 @@ config FORCEDETH_NAPI
config CS89x0
tristate "CS89x0 support"
depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
- || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
+ || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS \
+ || MACH_MX27ADS)
---help---
Support for CS89x0 chipset based Ethernet cards. If you have a
network (Ethernet) card of this type, say Y and read the
@@ -1452,7 +1453,7 @@ config CS89x0
config CS89x0_NONISA_IRQ
def_bool y
depends on CS89x0 != n
- depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS
+ depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS || MACH_MX27ADS
config TC35815
tristate "TOSHIBA TC35815 Ethernet support"
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 7433b88..558f630 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -195,6 +195,12 @@ static unsigned int netcard_portlist[] __used __initdata = {
PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0
};
static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
+#elif defined(CONFIG_MACH_MX27ADS)
+#include <mach/board-mx27ads.h>
+static unsigned int netcard_portlist[] __used __initdata = {
+ PBC_CS8900A_IOBASE_REG + 0x300 + 3, 0
+};
+static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
#else
static unsigned int netcard_portlist[] __used __initdata =
{ 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
@@ -1034,7 +1040,7 @@ skip_this_frame:
static void __init reset_chip(struct net_device *dev)
{
-#if !defined(CONFIG_MACH_MX31ADS)
+#if !defined(CONFIG_MACH_MX31ADS) && !defined(CONFIG_MACH_MX27ADS)
#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
struct net_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr;
@@ -1063,7 +1069,7 @@ static void __init reset_chip(struct net_device *dev)
reset_start_time = jiffies;
while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 && jiffies - reset_start_time < 2)
;
-#endif /* !CONFIG_MACH_MX31ADS */
+#endif /* !CONFIG_MACH_MX31ADS && !CONFIG_MACH_MX27ADS */
}
--
1.5.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 0:03 ` [PATCH 8/8 V2] MX27ADS: Add CS89x0 support Vladimir Barinov
@ 2009-04-29 6:19 ` David Miller
2009-04-29 7:03 ` Vladimir Barinov
2009-04-29 8:48 ` Robby Cai
1 sibling, 1 reply; 9+ messages in thread
From: David Miller @ 2009-04-29 6:19 UTC (permalink / raw)
To: vova.barinov; +Cc: netdev, s.hauer, linux-arm-kernel
From: Vladimir Barinov <vova.barinov@gmail.com>
Date: Wed, 29 Apr 2009 04:03:25 +0400
> Add CS89x0 net chip support for MX27ADS board
>
> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
So what's the story with the apparent 7 patches that preceed this
one and this one seems to depend upon?
Context, please :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 6:19 ` David Miller
@ 2009-04-29 7:03 ` Vladimir Barinov
2009-04-29 7:15 ` Sascha Hauer
2009-04-29 7:19 ` David Miller
0 siblings, 2 replies; 9+ messages in thread
From: Vladimir Barinov @ 2009-04-29 7:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev, s.hauer, linux-arm-kernel
Hello David,
David Miller wrote:
> From: Vladimir Barinov <vova.barinov@gmail.com>
> Date: Wed, 29 Apr 2009 04:03:25 +0400
>
>
>> Add CS89x0 net chip support for MX27ADS board
>>
>> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
>>
>
> So what's the story with the apparent 7 patches that preceed this
> one and this one seems to depend upon?
>
> Context, please :)
>
>
The patchset description is:
The following patch series makes transition to setup all pins at once in
platfrom code. Also it adds NAND, I2C, Framebuffer, SDHC, EXPIO(CPLD),
CS89x0 devices support for MX27ADS board.
The changes since V1:
- removed ifdefs around I2C
- put IRQF flags in request_irq for sdhc card detection
The patch series looks like:
0000-MX27ADS-support.patch
0001-MX27ADS-setup-all-pins-at-once-in-one-table.patch
0002-MX27ADS-Add-NAND-support.patch
0003-MX27ADS-Add-I2C-support.patch
0004-MX27ADS-Add-framebuffer-support.patch
0005-MX27ADS-Add-1-wire-support.patch
0006-MX27ADS-Add-SDHC-support.patch
0007-MX27ADS-Add-EXPIO-demux-support.patch
0008-MX27ADS-Add-CS89x0-support.patch
And the total diffstat for previous 7 patches is:
arch/arm/mach-mx2/mx27ads.c | 368
++++++++++++++++---------
arch/arm/plat-mxc/include/mach/board-mx27ads.h | 3
2 files changed, 238 insertions(+), 133 deletions(-)
So I think there were no sense to send first 7 patches to netdev list in
this case :)
Sorry for inconvenience.
Regards,
Vladimir
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 7:03 ` Vladimir Barinov
@ 2009-04-29 7:15 ` Sascha Hauer
2009-04-29 7:21 ` David Miller
2009-04-29 7:19 ` David Miller
1 sibling, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2009-04-29 7:15 UTC (permalink / raw)
To: Vladimir Barinov; +Cc: David Miller, netdev, linux-arm-kernel
On Wed, Apr 29, 2009 at 11:03:36AM +0400, Vladimir Barinov wrote:
> Hello David,
>
> David Miller wrote:
>> From: Vladimir Barinov <vova.barinov@gmail.com>
>> Date: Wed, 29 Apr 2009 04:03:25 +0400
>>
>>
>>> Add CS89x0 net chip support for MX27ADS board
>>>
>>> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
>>>
>>
>> So what's the story with the apparent 7 patches that preceed this
>> one and this one seems to depend upon?
>>
>> Context, please :)
>>
>>
> The patchset description is:
>
> The following patch series makes transition to setup all pins at once in
> platfrom code. Also it adds NAND, I2C, Framebuffer, SDHC, EXPIO(CPLD),
> CS89x0 devices support for MX27ADS board.
The important information is that PATCH8/8 does not depend on the
previous seven patches and can be applied independently.
You shouldn't have added it to this series but sent an extra patch to
David.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 7:03 ` Vladimir Barinov
2009-04-29 7:15 ` Sascha Hauer
@ 2009-04-29 7:19 ` David Miller
1 sibling, 0 replies; 9+ messages in thread
From: David Miller @ 2009-04-29 7:19 UTC (permalink / raw)
To: vova.barinov; +Cc: netdev, s.hauer, linux-arm-kernel
From: Vladimir Barinov <vova.barinov@gmail.com>
Date: Wed, 29 Apr 2009 11:03:36 +0400
> So I think there were no sense to send first 7 patches to netdev list
> in this case :)
It seems that I can't add this patch to the net-2.6 tree because
it depends upon those 7 previous patches, right?
That's what I'm concerned about.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 7:15 ` Sascha Hauer
@ 2009-04-29 7:21 ` David Miller
0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2009-04-29 7:21 UTC (permalink / raw)
To: s.hauer; +Cc: vova.barinov, netdev, linux-arm-kernel
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 29 Apr 2009 09:15:12 +0200
> The important information is that PATCH8/8 does not depend on the
> previous seven patches and can be applied independently.
>
> You shouldn't have added it to this series but sent an extra patch to
> David.
I'm glad someone is paying attention.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 0:03 ` [PATCH 8/8 V2] MX27ADS: Add CS89x0 support Vladimir Barinov
2009-04-29 6:19 ` David Miller
@ 2009-04-29 8:48 ` Robby Cai
2009-04-30 10:48 ` Vladimir Barinov
1 sibling, 1 reply; 9+ messages in thread
From: Robby Cai @ 2009-04-29 8:48 UTC (permalink / raw)
To: Vladimir Barinov; +Cc: netdev, s.hauer, linux-arm-kernel
Does it make sense if we add keep the new items in the alphabetic/numeric
order?
Nowadays, seems more and more people are paying attention on this.
Regards,
Robby
On Wed, Apr 29, 2009 at 8:03 AM, Vladimir Barinov <vova.barinov@gmail.com>wrote:
> Add CS89x0 net chip support for MX27ADS board
>
> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com>
> ---
> drivers/net/Kconfig | 5 +++--
> drivers/net/cs89x0.c | 10 ++++++++--
> 2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 214a92d..25fd824 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -1438,7 +1438,8 @@ config FORCEDETH_NAPI
> config CS89x0
> tristate "CS89x0 support"
> depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
> - || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
> + || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS \
> + || MACH_MX27ADS)
> ---help---
> Support for CS89x0 chipset based Ethernet cards. If you have a
> network (Ethernet) card of this type, say Y and read the
> @@ -1452,7 +1453,7 @@ config CS89x0
> config CS89x0_NONISA_IRQ
> def_bool y
> depends on CS89x0 != n
> - depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X ||
> MACH_MX31ADS
> + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X ||
> MACH_MX31ADS || MACH_MX27ADS
>
> config TC35815
> tristate "TOSHIBA TC35815 Ethernet support"
> diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
> index 7433b88..558f630 100644
> --- a/drivers/net/cs89x0.c
> +++ b/drivers/net/cs89x0.c
> @@ -195,6 +195,12 @@ static unsigned int netcard_portlist[] __used
> __initdata = {
> PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0
> };
> static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
> +#elif defined(CONFIG_MACH_MX27ADS)
> +#include <mach/board-mx27ads.h>
> +static unsigned int netcard_portlist[] __used __initdata = {
> + PBC_CS8900A_IOBASE_REG + 0x300 + 3, 0
> +};
> +static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
> #else
> static unsigned int netcard_portlist[] __used __initdata =
> { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0,
> 0x2c0, 0x2e0, 0};
> @@ -1034,7 +1040,7 @@ skip_this_frame:
>
> static void __init reset_chip(struct net_device *dev)
> {
> -#if !defined(CONFIG_MACH_MX31ADS)
> +#if !defined(CONFIG_MACH_MX31ADS) && !defined(CONFIG_MACH_MX27ADS)
> #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
> struct net_local *lp = netdev_priv(dev);
> int ioaddr = dev->base_addr;
> @@ -1063,7 +1069,7 @@ static void __init reset_chip(struct net_device *dev)
> reset_start_time = jiffies;
> while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 && jiffies -
> reset_start_time < 2)
> ;
> -#endif /* !CONFIG_MACH_MX31ADS */
> +#endif /* !CONFIG_MACH_MX31ADS && !CONFIG_MACH_MX27ADS */
> }
>
>
> --
> 1.5.6
>
>
> -------------------------------------------------------------------
> List admin:
> http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
> FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
> Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
>
-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-29 8:48 ` Robby Cai
@ 2009-04-30 10:48 ` Vladimir Barinov
2009-04-30 23:10 ` Robby Cai
0 siblings, 1 reply; 9+ messages in thread
From: Vladimir Barinov @ 2009-04-30 10:48 UTC (permalink / raw)
To: Robby Cai; +Cc: netdev, s.hauer, linux-arm-kernel
Hello Robby,
Robby Cai wrote:
> Does it make sense if we add keep the new items in
> the alphabetic/numeric order?
> Nowadays, seems more and more people are paying attention on this.
>
What actually do propose to line up in alphabetic/numeric order here?
AFAIK the alphabetic order is suggested to use in Kconfig files for
variables.
Not sure if this valid here. In this patch you can find only added
dependencies.
> Regards,
> Robby
>
> On Wed, Apr 29, 2009 at 8:03 AM, Vladimir Barinov
> <vova.barinov@gmail.com <mailto:vova.barinov@gmail.com>> wrote:
>
> Add CS89x0 net chip support for MX27ADS board
>
> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com
> <mailto:vbarinov@embeddedalley.com>>
> ---
> drivers/net/Kconfig | 5 +++--
> drivers/net/cs89x0.c | 10 ++++++++--
> 2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 214a92d..25fd824 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -1438,7 +1438,8 @@ config FORCEDETH_NAPI
> config CS89x0
> tristate "CS89x0 support"
> depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
> - || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
> + || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS \
> + || MACH_MX27ADS)
> ---help---
> Support for CS89x0 chipset based Ethernet cards. If you
> have a
> network (Ethernet) card of this type, say Y and read the
> @@ -1452,7 +1453,7 @@ config CS89x0
> config CS89x0_NONISA_IRQ
> def_bool y
> depends on CS89x0 != n
> - depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X
> || MACH_MX31ADS
> + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X
> || MACH_MX31ADS || MACH_MX27ADS
>
> config TC35815
> tristate "TOSHIBA TC35815 Ethernet support"
> diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
> index 7433b88..558f630 100644
> --- a/drivers/net/cs89x0.c
> +++ b/drivers/net/cs89x0.c
> @@ -195,6 +195,12 @@ static unsigned int netcard_portlist[] __used
> __initdata = {
> PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0
> };
> static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
> +#elif defined(CONFIG_MACH_MX27ADS)
> +#include <mach/board-mx27ads.h>
> +static unsigned int netcard_portlist[] __used __initdata = {
> + PBC_CS8900A_IOBASE_REG + 0x300 + 3, 0
> +};
> +static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
> #else
> static unsigned int netcard_portlist[] __used __initdata =
> { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260,
> 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
> @@ -1034,7 +1040,7 @@ skip_this_frame:
>
> static void __init reset_chip(struct net_device *dev)
> {
> -#if !defined(CONFIG_MACH_MX31ADS)
> +#if !defined(CONFIG_MACH_MX31ADS) && !defined(CONFIG_MACH_MX27ADS)
> #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
> struct net_local *lp = netdev_priv(dev);
> int ioaddr = dev->base_addr;
> @@ -1063,7 +1069,7 @@ static void __init reset_chip(struct
> net_device *dev)
> reset_start_time = jiffies;
> while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 &&
> jiffies - reset_start_time < 2)
> ;
> -#endif /* !CONFIG_MACH_MX31ADS */
> +#endif /* !CONFIG_MACH_MX31ADS && !CONFIG_MACH_MX27ADS */
> }
>
>
> --
> 1.5.6
>
>
> -------------------------------------------------------------------
> List admin:
> http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
> FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
> Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/8 V2] MX27ADS: Add CS89x0 support
2009-04-30 10:48 ` Vladimir Barinov
@ 2009-04-30 23:10 ` Robby Cai
0 siblings, 0 replies; 9+ messages in thread
From: Robby Cai @ 2009-04-30 23:10 UTC (permalink / raw)
To: Vladimir Barinov; +Cc: netdev, s.hauer, linux-arm-kernel
IIRC, someone in this list recommends to do like the following(for
example), rather than always add new item at the end of the line.
depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X ||
MACH_MX27ADS || MACH_MX31ADS
And next time if we would like to another new item, saying MACH_MX21ADS,
then the result would be
depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X ||
MACH_MX21ADS || MACH_MX27ADS || MACH_MX31ADS
Regards,
Robby
On Thu, Apr 30, 2009 at 6:48 PM, Vladimir Barinov <vova.barinov@gmail.com>wrote:
> Hello Robby,
>
> Robby Cai wrote:
>
>> Does it make sense if we add keep the new items in the alphabetic/numeric
>> order?
>> Nowadays, seems more and more people are paying attention on this.
>>
>> What actually do propose to line up in alphabetic/numeric order here?
> AFAIK the alphabetic order is suggested to use in Kconfig files for
> variables.
> Not sure if this valid here. In this patch you can find only added
> dependencies.
>
> Regards,
>> Robby
>>
>> On Wed, Apr 29, 2009 at 8:03 AM, Vladimir Barinov <vova.barinov@gmail.com<mailto:
>> vova.barinov@gmail.com>> wrote:
>>
>> Add CS89x0 net chip support for MX27ADS board
>>
>> Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com
>> <mailto:vbarinov@embeddedalley.com>>
>>
>> ---
>> drivers/net/Kconfig | 5 +++--
>> drivers/net/cs89x0.c | 10 ++++++++--
>> 2 files changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
>> index 214a92d..25fd824 100644
>> --- a/drivers/net/Kconfig
>> +++ b/drivers/net/Kconfig
>> @@ -1438,7 +1438,8 @@ config FORCEDETH_NAPI
>> config CS89x0
>> tristate "CS89x0 support"
>> depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
>> - || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
>> + || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS \
>> + || MACH_MX27ADS)
>> ---help---
>> Support for CS89x0 chipset based Ethernet cards. If you
>> have a
>> network (Ethernet) card of this type, say Y and read the
>> @@ -1452,7 +1453,7 @@ config CS89x0
>> config CS89x0_NONISA_IRQ
>> def_bool y
>> depends on CS89x0 != n
>> - depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X
>> || MACH_MX31ADS
>> + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X
>> || MACH_MX31ADS || MACH_MX27ADS
>>
>> config TC35815
>> tristate "TOSHIBA TC35815 Ethernet support"
>> diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
>> index 7433b88..558f630 100644
>> --- a/drivers/net/cs89x0.c
>> +++ b/drivers/net/cs89x0.c
>> @@ -195,6 +195,12 @@ static unsigned int netcard_portlist[] __used
>> __initdata = {
>> PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0
>> };
>> static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
>> +#elif defined(CONFIG_MACH_MX27ADS)
>> +#include <mach/board-mx27ads.h>
>> +static unsigned int netcard_portlist[] __used __initdata = {
>> + PBC_CS8900A_IOBASE_REG + 0x300 + 3, 0
>> +};
>> +static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
>> #else
>> static unsigned int netcard_portlist[] __used __initdata =
>> { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260,
>> 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
>> @@ -1034,7 +1040,7 @@ skip_this_frame:
>>
>> static void __init reset_chip(struct net_device *dev)
>> {
>> -#if !defined(CONFIG_MACH_MX31ADS)
>> +#if !defined(CONFIG_MACH_MX31ADS) && !defined(CONFIG_MACH_MX27ADS)
>> #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
>> struct net_local *lp = netdev_priv(dev);
>> int ioaddr = dev->base_addr;
>> @@ -1063,7 +1069,7 @@ static void __init reset_chip(struct
>> net_device *dev)
>> reset_start_time = jiffies;
>> while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 &&
>> jiffies - reset_start_time < 2)
>> ;
>> -#endif /* !CONFIG_MACH_MX31ADS */
>> +#endif /* !CONFIG_MACH_MX31ADS && !CONFIG_MACH_MX27ADS */
>> }
>>
>>
>> --
>> 1.5.6
>>
>>
>> -------------------------------------------------------------------
>> List admin:
>> http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
>> FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
>> Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
>>
>>
>>
>
-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-04-30 23:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1240963177-23941-1-git-send-email-vbarinov@embeddedalley.com>
2009-04-29 0:03 ` [PATCH 8/8 V2] MX27ADS: Add CS89x0 support Vladimir Barinov
2009-04-29 6:19 ` David Miller
2009-04-29 7:03 ` Vladimir Barinov
2009-04-29 7:15 ` Sascha Hauer
2009-04-29 7:21 ` David Miller
2009-04-29 7:19 ` David Miller
2009-04-29 8:48 ` Robby Cai
2009-04-30 10:48 ` Vladimir Barinov
2009-04-30 23:10 ` Robby Cai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).