convert arm platforms to smsc911x
Subsystems (5)
cover convert arm platforms to smsc911x
This patchset, intended for 2.6.30, converts all in-tree arm platforms from smc911x to the actively maintained smsc911x driver.
I don't have any of these platforms available to me, so I've only been able to compile-test the changes.
David Miller is planning to take the smsc911x patches via net-2.6, but I've included them here to make testing easier as the other patches in the set depend on them.
This patchset supercedes previous irq_flags patches from me and Stanley Miao.
Steve Glendinning (5):
smsc911x: add support for platform-specific irq flags
smsc911x: register isr as IRQF_SHARED
arm: convert pcm037 platform to use smsc911x
arm: convert realview platform to use smsc911x
arm: convert omap ldp platform to use smsc911x
arch/arm/configs/omap_ldp_defconfig | 24 ++++++++++++++- arch/arm/configs/pcm037_defconfig | 23 ++++++++++++++- arch/arm/configs/realview-smp_defconfig | 24 ++++++++++++++- arch/arm/configs/realview_defconfig | 24 ++++++++++++++- arch/arm/mach-mx3/pcm037.c | 22 ++++++++------ arch/arm/mach-omap2/board-ldp.c | 41 +++++++++++++++++---------- arch/arm/mach-realview/core.c | 17 ++++++----- arch/arm/plat-omap/include/mach/board-ldp.h | 4 +- drivers/net/smsc911x.c | 19 +++++++++--- 9 files changed, 151 insertions(+), 47 deletions(-)
PATCH 1/5 smsc911x: add support for platform-specific irq flags
this patch adds support for the platform_device's resources to indicate additional flags to use when registering the irq, for example IORESOURCE_IRQ_LOWLEVEL (which corresponds to IRQF_TRIGGER_LOW). These should be set in the irq resource flags field.
--- drivers/net/smsc911x.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/smsc911x.c +14 -5
@@ -1892,9 +1892,9 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)struct net_device *dev;struct smsc911x_data *pdata;struct smsc911x_platform_config *config = pdev->dev.platform_data; -struct resource *res; +struct resource *res, *irq_res;unsigned int intcfg =0 ; -int res_size; +int res_size, irq_flags;int retval;DECLARE_MAC_BUF (mac);
@@ -1919,6 +1919,14 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) } res_size = res->end - res->start; + irq_res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); +if (!irq_res) { +pr_warning ("%s: Could not allocate irq resource.\n" , +SMSC_CHIPNAME ); + retval = -ENODEV ; + goto out_0; + } +if (!request_mem_region (res->start, res_size,SMSC_CHIPNAME )) { retval = -EBUSY ; goto out_0;
@@ -1935,7 +1943,8 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) pdata =netdev_priv (dev); - dev->irq =platform_get_irq (pdev,0 ); + dev->irq = irq_res->start; + irq_flags = irq_res->flags &IRQF_TRIGGER_MASK ; pdata->ioaddr =ioremap_nocache (res->start, res_size);/* copy config parameters across to pdata */
@@ -1968,8 +1977,8 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)smsc911x_reg_write (pdata,INT_EN ,0 );smsc911x_reg_write (pdata,INT_STS ,0xFFFFFFFF ); - retval =request_irq (dev->irq, smsc911x_irqhandler,IRQF_DISABLED , - dev->name, dev); + retval =request_irq (dev->irq, smsc911x_irqhandler, + irq_flags |IRQF_DISABLED , dev->name, dev);if (retval) {SMSC_WARNING (PROBE ,"Unable to claim requested irq: %d" , dev->irq);
Signature · 1 line
1.6.0.6
PATCH 2/5 smsc911x: register isr as IRQF_SHARED
The isr supports shared operation, so register it with the IRQF_SHARED flag to indicate this.
This patch also removes the IRQF_DISABLED flag. This driver doesn't need it, and IRQF_DISABLED isn't guaranteed when using shared interrupts.
--- drivers/net/smsc911x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/smsc911x.c +1 -1
@@ -1978,7 +1978,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)smsc911x_reg_write (pdata,INT_STS ,0xFFFFFFFF ); retval =request_irq (dev->irq, smsc911x_irqhandler, - irq_flags |IRQF_DISABLED , dev->name, dev); + irq_flags |IRQF_SHARED , dev->name, dev);if (retval) {SMSC_WARNING (PROBE ,"Unable to claim requested irq: %d" , dev->irq);
Signature · 1 line
1.6.0.6
PATCH 3/5 arm: convert pcm037 platform to use smsc911x
--- arch/arm/configs/pcm037_defconfig | 23 ++++++++++++++++++++++- arch/arm/mach-mx3/pcm037.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 11 deletions(-)
arch/arm/configs/pcm037_defconfig +22 -1
@@ -465,12 +465,33 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set CONFIG_SMC91X=y # CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set
arch/arm/mach-mx3/pcm037.c +12 -10
@@ -24,7 +24,7 @@#include <linux/mtd/plat-ram.h> #include <linux/memory.h> #include <linux/gpio.h> -#include <linux/smc911x.h> +#include <linux/smsc911x.h> #include <linux/interrupt.h> #include <mach/hardware.h>
@@ -64,7 +64,7 @@ static struct imxuart_platform_data uart_pdata = { .flags = IMXUART_HAVE_RTSCTS, }; -static struct resource smc911x_resources[] = { +static struct resource smsc911x_resources[] = { [0 ] = { .start =CS1_BASE_ADDR +0x300 , .end =CS1_BASE_ADDR +0x300 +SZ_64K -1 ,
@@ -73,22 +73,24 @@ static struct resource smc911x_resources[] = { [1 ] = { .start =IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), .end =IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), - .flags =IORESOURCE_IRQ , + .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_LOWLEVEL , }, }; -static struct smc911x_platdata smc911x_info = { - .flags =SMC911X_USE_32BIT , - .irq_flags =IRQF_SHARED |IRQF_TRIGGER_LOW , +static struct smsc911x_platform_config smsc911x_info = { + .flags =SMSC911X_USE_32BIT , + .irq_polarity =SMSC911X_IRQ_POLARITY_ACTIVE_LOW , + .irq_type =SMSC911X_IRQ_TYPE_OPEN_DRAIN , + .phy_interface =PHY_INTERFACE_MODE_MII , };static struct platform_device pcm037_eth = { - .name ="smc911x" , + .name ="smsc911x" , .id =-1 , - .num_resources =ARRAY_SIZE (smc911x_resources), - .resource = smc911x_resources, + .num_resources =ARRAY_SIZE (smsc911x_resources), + .resource = smsc911x_resources, .dev = { - .platform_data = &smc911x_info, + .platform_data = &smsc911x_info, }, };
Signature · 1 line
1.6.0.6
PATCH 4/5 arm: convert realview platform to use smsc911x
--- arch/arm/configs/realview-smp_defconfig | 24 ++++++++++++++++++++++-- arch/arm/configs/realview_defconfig | 24 ++++++++++++++++++++++-- arch/arm/mach-realview/core.c | 17 +++++++++-------- 3 files changed, 53 insertions(+), 12 deletions(-)
arch/arm/configs/realview-smp_defconfig +22 -2
@@ -496,13 +496,33 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set CONFIG_SMC91X=y # CONFIG_DM9000 is not set -CONFIG_SMC911X=y +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set
arch/arm/configs/realview_defconfig +22 -2
@@ -490,13 +490,33 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set CONFIG_SMC91X=y # CONFIG_DM9000 is not set -CONFIG_SMC911X=y +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set
arch/arm/mach-realview/core.c +9 -8
@@ -28,7 +28,7 @@#include <linux/clocksource.h> #include <linux/clockchips.h> #include <linux/io.h> -#include <linux/smc911x.h> +#include <linux/smsc911x.h> #include <asm/clkdev.h> #include <asm/system.h>
@@ -127,14 +127,15 @@ int realview_flash_register(struct resource *res, u32 num)return platform_device_register (&realview_flash_device); } -static struct smc911x_platdata realview_smc911x_platdata = { - .flags =SMC911X_USE_32BIT , - .irq_flags =IRQF_SHARED , - .irq_polarity =1 , +static struct smsc911x_platform_config smsc911x_config = { + .flags =SMSC911X_USE_32BIT , + .irq_polarity =SMSC911X_IRQ_POLARITY_ACTIVE_LOW , + .irq_type =SMSC911X_IRQ_TYPE_OPEN_DRAIN , + .phy_interface =PHY_INTERFACE_MODE_MII , };static struct platform_device realview_eth_device = { - .name ="smc911x" , + .name ="smsc911x" , .id =0 , .num_resources =2 , };
@@ -144,8 +145,8 @@ int realview_eth_register(const char *name, struct resource *res)if (name) realview_eth_device.name = name; realview_eth_device.resource = res; -if (strcmp (realview_eth_device.name,"smc911x" ) ==0 ) - realview_eth_device.dev.platform_data = &realview_smc911x_platdata; +if (strcmp (realview_eth_device.name,"smsc911x" ) ==0 ) + realview_eth_device.dev.platform_data = &smsc911x_config;return platform_device_register (&realview_eth_device); }
Signature · 1 line
1.6.0.6
PATCH 5/5 arm: convert omap ldp platform to use smsc911x
--- arch/arm/configs/omap_ldp_defconfig | 24 ++++++++++++++- arch/arm/mach-omap2/board-ldp.c | 41 +++++++++++++++++---------- arch/arm/plat-omap/include/mach/board-ldp.h | 4 +- 3 files changed, 50 insertions(+), 19 deletions(-)
arch/arm/configs/omap_ldp_defconfig +22 -2
@@ -474,14 +474,34 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set # CONFIG_ENC28J60 is not set -CONFIG_SMC911X=y +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set
arch/arm/mach-omap2/board-ldp.c +26 -15
86 lines not on this page · raw message
arch/arm/plat-omap/include/mach/board-ldp.h +2 -2
@@ -32,8 +32,8 @@extern void twl4030_bci_battery_init (void );#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -#define LDP_SMC911X_CS 1 -#define LDP_SMC911X_GPIO 152 +#define LDP_SMSC911X_CS 1 +#define LDP_SMSC911X_GPIO 152#define DEBUG_BASE 0x08000000#define OMAP34XX_ETHR_START DEBUG_BASE#endif /* __ASM_ARCH_OMAP_LDP_H */
Signature · 1 line
1.6.0.6
Re: [PATCH 5/5] arm: convert omap ldp platform to use smsc911x
This patch should be sent to linux-omap mail list. But linux-omap git tree is still in 2.6.28 and it doesn't have smsc911x driver.
Stanley.
Quoted 157 lines · Steve Glendinning
Signed-off-by Steve Glendinning <[email protected]>--- arch/arm/configs/omap_ldp_defconfig | 24 ++++++++++++++- arch/arm/mach-omap2/board-ldp.c | 41 +++++++++++++++++---------- arch/arm/plat-omap/include/mach/board-ldp.h | 4 +- 3 files changed, 50 insertions(+), 19 deletions(-)arch/arm/configs/omap_ldp_defconfig +22
-2@@ -474,14 +474,34 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set # CONFIG_ENC28J60 is not set -CONFIG_SMC911X=y +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not setarch/arm/mach-omap2/board-ldp.c +26
-15@@ -22,6 +22,7 @@#include <linux/spi/spi.h> #include <linux/spi/ads7846.h> #include <linux/i2c/twl4030.h> +#include <linux/smsc911x.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -43,7 +44,7 @@#define SDP3430_SMC91X_CS 3 -static struct resource ldp_smc911x_resources[] = { +static struct resource ldp_smsc911x_resources[] = { [0 ] = { .start =OMAP34XX_ETHR_START , .end =OMAP34XX_ETHR_START +SZ_4K ,@@ -56,40 +57,50 @@ static struct resource ldp_smc911x_resources[] = { }, }; -static struct platform_device ldp_smc911x_device = { - .name ="smc911x" , +static struct smsc911x_platform_config ldp_smsc911x_config = { + .irq_polarity =SMSC911X_IRQ_POLARITY_ACTIVE_LOW , + .irq_type =SMSC911X_IRQ_TYPE_OPEN_DRAIN , + .flags =SMSC911X_USE_32BIT , + .phy_interface =PHY_INTERFACE_MODE_MII , +}; + +static struct platform_device ldp_smsc911x_device = { + .name ="smsc911x" , .id =-1 , - .num_resources =ARRAY_SIZE (ldp_smc911x_resources), - .resource = ldp_smc911x_resources, + .num_resources =ARRAY_SIZE (ldp_smsc911x_resources), + .resource = ldp_smsc911x_resources, + .dev = { + .platform_data = &ldp_smsc911x_config, + }, };static struct platform_device *ldp_devices[]__initdata = { - &ldp_smc911x_device, + &ldp_smsc911x_device, }; -static inline void __init ldp_init_smc911x (void ) +static inline void __init ldp_init_smsc911x (void ) {int eth_cs;unsigned long cs_mem_base;int eth_gpio =0 ; - eth_cs =LDP_SMC911X_CS ; + eth_cs =LDP_SMSC911X_CS ;if (gpmc_cs_request (eth_cs,SZ_16M , &cs_mem_base) <0 ) { -printk (KERN_ERR "Failed to request GPMC mem for smc911x\n" ); +printk (KERN_ERR "Failed to request GPMC mem for smsc911x\n" );return ; } - ldp_smc911x_resources[0 ].start = cs_mem_base +0x0 ; - ldp_smc911x_resources[0 ].end = cs_mem_base +0xf ; + ldp_smsc911x_resources[0 ].start = cs_mem_base +0x0 ; + ldp_smsc911x_resources[0 ].end = cs_mem_base +0xf ;udelay (100 ); - eth_gpio =LDP_SMC911X_GPIO ; + eth_gpio =LDP_SMSC911X_GPIO ; - ldp_smc911x_resources[1 ].start =OMAP_GPIO_IRQ (eth_gpio); + ldp_smsc911x_resources[1 ].start =OMAP_GPIO_IRQ (eth_gpio);if (omap_request_gpio (eth_gpio) <0 ) { -printk (KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n" , +printk (KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n" , eth_gpio);return ; }@@ -101,7 +112,7 @@ static void __init omap_ldp_init_irq(void)omap2_init_common_hw ();omap_init_irq ();omap_gpio_init (); -ldp_init_smc911x (); +ldp_init_smsc911x (); }static struct omap_uart_config ldp_uart_config__initdata = {arch/arm/plat-omap/include/mach/board-ldp.h +2
-2@@ -32,8 +32,8 @@extern void twl4030_bci_battery_init (void );#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -#define LDP_SMC911X_CS 1 -#define LDP_SMC911X_GPIO 152 +#define LDP_SMSC911X_CS 1 +#define LDP_SMSC911X_GPIO 152#define DEBUG_BASE 0x08000000#define OMAP34XX_ETHR_START DEBUG_BASE#endif /* __ASM_ARCH_OMAP_LDP_H */
Re: [PATCH 5/5] arm: convert omap ldp platform to use smsc911x
In reply to Steve Glendinningarch/arm/mach-omap2/board-ldp.c static struct resource ldp_smc911x_resources[] = { · line 95
Quoted 4 lines · Steve Glendinning
arch/arm/mach-omap2/board-ldp.c +2
-2- ldp_smc911x_resources[0 ].start = cs_mem_base +0x0 ; - ldp_smc911x_resources[0 ].end = cs_mem_base +0xf ; + ldp_smsc911x_resources[0 ].start = cs_mem_base +0x0 ; + ldp_smsc911x_resources[0 ].end = cs_mem_base +0xf ;
Actually, having finally got around to checking whether the smc911x support submitted from the OMAP folk on the LDP board works, I find it doesn't.
And the reason it doesn't is that SMC911x wants to claim 256 bytes of space in this resource. With only 16 bytes in the parent resource, that isn't going to work.
It looks to me like this is wrong for the SMSC911x driver as well.
davem - I can see if I merge a fix for this (once I have confirmation what the fix should be) and push it for -rc, that will make things a little more complicated at your end. Suggest we hold fire on these patches for a few more days.
David Miller
maintainerRe: [PATCH 5/5] arm: convert omap ldp platform to use smsc911x
From: Russell King - ARM Linux <[email protected]>
Date: Mon, 19 Jan 2009 22:35:41 +0000
Quoted 4 lines
davem - I can see if I merge a fix for this (once I have confirmation what the fix should be) and push it for -rc, that will make things a little more complicated at your end. Suggest we hold fire on these patches for a few more days.
Ok, I'm going to toss the smsc911x patches from my tree as well.
Just resubmit to me and netdev@vger the relevant parts I should take in my tree once this is all sorted out.
Thanks!
David Miller
maintainerFrom: Steve Glendinning <[email protected]>
Date: Thu, 15 Jan 2009 09:07:57 +0000
Quoted 6 lines
This patchset, intended for 2.6.30, converts all in-tree arm platforms from smc911x to the actively maintained smsc911x driver.
I don't have any of these platforms available to me, so I've only been able to compile-test the changes.
Quoted 6 lines
David Miller is planning to take the smsc911x patches via net-2.6, but I've included them here to make testing easier as the other patches in the set depend on them.
This patchset supercedes previous
irq_flagspatches from me and Stanley Miao.
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
Quoted 13 lines · David Miller
From: Steve Glendinning <[email protected]>
Date: Thu, 15 Jan 2009 09:07:57 +0000Quoted 10 lines
This patchset, intended for 2.6.30, converts all in-tree arm platforms from smc911x to the actively maintained smsc911x driver.
I don't have any of these platforms available to me, so I've only been able to compile-test the changes.
David Miller is planning to take the smsc911x patches via net-2.6, but I've included them here to make testing easier as the other patches in the set depend on them.
Quoted 8 lines
Quoted 2 lines
This patchset supercedes previous
irq_flagspatches from me and Stanley Miao.I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
I think the platform data had better stay in arm tree.
Stanley.
Quoted 17 lines · stanley.miao
Quoted 16 lines · David Miller
From: Steve Glendinning <[email protected]>
Date: Thu, 15 Jan 2009 09:07:57 +0000Quoted 12 lines
This patchset, intended for 2.6.30, converts all in-tree arm platforms from smc911x to the actively maintained smsc911x driver.
I don't have any of these platforms available to me, so I've only been able to compile-test the changes.
David Miller is planning to take the smsc911x patches via net-2.6, but I've included them here to make testing easier as the other patches in the set depend on them.
This patchset supercedes previous
irq_flagspatches from me and Stanley Miao.
Quoted 7 lines
Quoted 5 lines
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
I think the platform data had better stay in arm tree.
What would be the impact if patches 3 to 5 got merged before 1 and 2?
Russell King - ARM Linux <[email protected]> wrote on 19/01/2009 09:22:57:
Quoted 11 lines · stanley.miao
Quoted 8 lines · David Miller
Quoted 5 lines
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
I think the platform data had better stay in arm tree.
What would be the impact if patches 3 to 5 got merged before 1 and 2?
It would not break compilation, but it would probably break ethernet support
on those three platforms.
All 3 platforms pass some combination of IRQF_TRIGGER_LOW | IRQF_SHARED when
registering these interrupts. The trigger flag isn't passed through without
1 and IRQF_SHARED isn't specified without 2.
I expect register_irq would fail on these platforms without these flags?
Steve
David Miller
maintainerFrom: [email protected]
Date: Mon, 19 Jan 2009 09:53:54 +0000
Quoted 10 lines
Russell King - ARM Linux <[email protected]> wrote on 19/01/2009 09:22:57:
Quoted 8 lines · stanley.miao
Quoted 7 lines · David Miller
Quoted 5 lines
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
I think the platform data had better stay in arm tree.
What would be the impact if patches 3 to 5 got merged before 1 and 2?
It would not break compilation, but it would probably break ethernet support
on those three platforms.
That's why I suggested they go where the dependency is for proper functionality.
Quoted 15 lines · David Miller
From: [email protected]
Date: Mon, 19 Jan 2009 09:53:54 +0000Quoted 12 lines
Russell King - ARM Linux <[email protected]> wrote on 19/01/2009 09:22:57:
Quoted 10 lines · stanley.miao
Quoted 8 lines · David Miller
Quoted 5 lines
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
I think the platform data had better stay in arm tree.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
What would be the impact if patches 3 to 5 got merged before 1 and 2?
It would not break compilation, but it would probably break ethernet support
on those three platforms.That's why I suggested they go where the dependency is for proper functionality.
Ok, as I see it, the files with the highest chance of conflicting in this set are the defconfig files.
Therefore, may I suggest that the defconfig updates are split from 3-5 and sent via my tree, the remainder via davem's net-next-2.6 tree?
David Miller
maintainerFrom: Russell King - ARM Linux <[email protected]>
Date: Mon, 19 Jan 2009 21:31:59 +0000
Quoted 22 lines · David Miller
Quoted 21 lines
From: [email protected]
Date: Mon, 19 Jan 2009 09:53:54 +0000Quoted 17 lines
Russell King - ARM Linux <[email protected]> wrote on 19/01/2009 09:22:57:
Quoted 11 lines · stanley.miao
Quoted 8 lines · David Miller
Quoted 5 lines
I've applied patches 1 and 2, the smsc911x driver changes.
I can pull the platform changes into net-next-2.6 as well if people don't think there will enough conflicts to cause problems.
I think the platform data had better stay in arm tree.
What would be the impact if patches 3 to 5 got merged before 1 and 2?
It would not break compilation, but it would probably break ethernet support
on those three platforms.
Quoted 8 lines
Quoted 2 lines
That's why I suggested they go where the dependency is for proper functionality.
Ok, as I see it, the files with the highest chance of conflicting in this set are the defconfig files.
Therefore, may I suggest that the defconfig updates are split from 3-5 and sent via my tree, the remainder via davem's net-next-2.6 tree?
That works for me.