-Index: linux-2.6.32.25/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.32.25.orig/drivers/mtd/maps/physmap.c 2010-10-28 21:47:22.000000000 -0700
-+++ linux-2.6.32.25/drivers/mtd/maps/physmap.c 2010-11-16 08:14:11.469582161 -0800
-@@ -80,7 +80,7 @@
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
+@@ -80,7 +80,7 @@ static const char *rom_probe_types[] = {
"map_rom",
NULL };
#ifdef CONFIG_MTD_PARTITIONS
#endif
static int physmap_flash_probe(struct platform_device *dev)
-Index: linux-2.6.32.25/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.25.orig/arch/mips/ar7/platform.c 2010-11-16 08:17:41.352090063 -0800
-+++ linux-2.6.32.25/arch/mips/ar7/platform.c 2010-11-16 08:18:09.232119441 -0800
-@@ -98,7 +98,7 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -98,7 +98,7 @@ static struct resource physmap_flash_res
.name = "mem",
.flags = IORESOURCE_MEM,
.start = 0x10000000,
+ tristate "TI AR7 GPIO Support"
+ depends on AR7
+ help
-+ Give userspace access to the GPIO pins on the Texas Instruments AR7
++ Give userspace access to the GPIO pins on the Texas Instruments AR7
+ processors.
+
+ If compiled as a module, it will be called ar7_gpio.
-Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
-===================================================================
---- linux-2.6.32.26.orig/drivers/vlynq/vlynq.c 2010-11-22 10:48:20.000000000 -0800
-+++ linux-2.6.32.26/drivers/vlynq/vlynq.c 2010-11-28 02:56:51.972405343 -0800
-@@ -103,6 +103,12 @@
+--- a/drivers/vlynq/vlynq.c
++++ b/drivers/vlynq/vlynq.c
+@@ -103,6 +103,12 @@ static void vlynq_dump_mem(u32 *base, in
}
#endif
/* Check the VLYNQ link status with a given device */
static int vlynq_linked(struct vlynq_device *dev)
{
-@@ -117,20 +123,40 @@
+@@ -117,20 +123,40 @@ static int vlynq_linked(struct vlynq_dev
return 0;
}
}
static void vlynq_irq_unmask(unsigned int irq)
-@@ -379,6 +405,61 @@
+@@ -379,6 +405,61 @@ void vlynq_unregister_driver(struct vlyn
}
EXPORT_SYMBOL(vlynq_unregister_driver);
/*
* A VLYNQ remote device can clock the VLYNQ bus master
* using a dedicated clock line. In that case, both the
-@@ -392,29 +473,17 @@
+@@ -392,29 +473,17 @@ static int __vlynq_try_remote(struct vly
int i;
vlynq_reset(dev);
return 0;
} else {
vlynq_reset(dev);
-@@ -437,21 +506,14 @@
+@@ -437,21 +506,14 @@ static int __vlynq_try_local(struct vlyn
vlynq_reset(dev);
return 0;
} else {
vlynq_reset(dev);
-@@ -473,18 +535,10 @@
+@@ -473,18 +535,10 @@ static int __vlynq_try_external(struct v
if (!vlynq_linked(dev))
return -ENODEV;
return 0;
}
-@@ -507,18 +561,9 @@
+@@ -507,18 +561,9 @@ static int __vlynq_enable_device(struct
* generation negotiated by hardware.
* Check which device is generating clocks and perform setup
* accordingly */
break;
case vlynq_ldiv1:
case vlynq_ldiv2:
-@@ -528,15 +573,12 @@
+@@ -528,15 +573,12 @@ static int __vlynq_enable_device(struct
case vlynq_ldiv6:
case vlynq_ldiv7:
case vlynq_ldiv8:
return 0;
}
break;
-@@ -548,15 +590,12 @@
+@@ -548,15 +590,12 @@ static int __vlynq_enable_device(struct
case vlynq_rdiv6:
case vlynq_rdiv7:
case vlynq_rdiv8:
return 0;
}
break;
-@@ -732,13 +771,12 @@
+@@ -732,13 +771,12 @@ static int vlynq_probe(struct platform_d
platform_set_drvdata(pdev, dev);
printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
dev->dev_id = readl(&dev->remote->chip);
((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
}
-Index: linux-2.6.32.26/include/linux/vlynq.h
-===================================================================
---- linux-2.6.32.26.orig/include/linux/vlynq.h 2010-11-22 10:48:20.000000000 -0800
-+++ linux-2.6.32.26/include/linux/vlynq.h 2010-11-27 12:08:39.312438011 -0800
-@@ -98,6 +98,7 @@
+--- a/include/linux/vlynq.h
++++ b/include/linux/vlynq.h
+@@ -98,6 +98,7 @@ static inline struct vlynq_device *to_vl
extern struct bus_type vlynq_bus_type;
+ const char *prod_id ;
+ prod_id = prom_getenv("ProductID");
-+ if(prod_id &&
++ if(prod_id &&
+ (strcmp(prod_id, "CYWL")==0 ||
+ strcmp(prod_id, "CYWM")==0 ||
+ strcmp(prod_id, "CYLM")==0 ||
+ * GPIO Control
+ **********************************************************************/
+
-+typedef struct
++typedef struct
+{
+ int pinSelReg;
+ int shift;
+ GPIO_CFG gpio_cfg;
+ volatile PIN_SEL_REG_ARRAY_T *pin_sel_array = (PIN_SEL_REG_ARRAY_T*) AVALANCHE_PIN_SEL_BASE;
+ volatile TITAN_GPIO_CONTROL_T *gpio_cntl = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
-+
++
+ if (gpio_pin > 51 )
+ return(-1);
+
-Index: linux-2.6.32.26/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.26.orig/arch/mips/ar7/platform.c 2010-11-28 03:22:24.522383766 -0800
-+++ linux-2.6.32.26/arch/mips/ar7/platform.c 2010-11-28 04:17:24.872413302 -0800
-@@ -46,7 +46,6 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -46,7 +46,6 @@ struct plat_vlynq_data {
int reset_bit;
};
static int vlynq_on(struct vlynq_device *dev)
{
int result;
-@@ -72,7 +71,8 @@
+@@ -72,7 +71,8 @@ static int vlynq_on(struct vlynq_device
msleep(50);
msleep(50);
return 0;
-@@ -601,6 +601,18 @@
+@@ -601,6 +601,18 @@ static inline unsigned char char2hex(cha
}
}
static void cpmac_get_mac(int instance, unsigned char *dev_addr)
{
int i;
-@@ -662,6 +674,7 @@
+@@ -662,6 +674,7 @@ static int __init ar7_register_devices(v
u16 chip_id;
int res;
u32 *bootcr, val;
#ifdef CONFIG_SERIAL_8250
static struct uart_port uart_port[2];
-@@ -715,27 +728,6 @@
+@@ -715,27 +728,6 @@ static int __init ar7_register_devices(v
return res;
}
res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
cpmac_low.id, &fixed_phy_status);
if (res && res != -ENODEV)
-@@ -748,6 +740,34 @@
+@@ -748,6 +740,34 @@ static int __init ar7_register_devices(v
if (res)
return res;
detect_leds();
res = platform_device_register(&ar7_gpio_leds);
if (res)
-@@ -771,8 +791,10 @@
+@@ -771,8 +791,10 @@ static int __init ar7_register_devices(v
ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
/* Register watchdog only if enabled in hardware */
if (val & AR7_WDT_HW_ENA)
-Index: linux-2.6.32.26/arch/mips/include/asm/mach-ar7/ar7.h
-===================================================================
---- linux-2.6.32.26.orig/arch/mips/include/asm/mach-ar7/ar7.h 2010-11-28 03:22:24.522383766 -0800
-+++ linux-2.6.32.26/arch/mips/include/asm/mach-ar7/ar7.h 2010-11-28 03:22:25.012385426 -0800
+--- a/arch/mips/include/asm/mach-ar7/ar7.h
++++ b/arch/mips/include/asm/mach-ar7/ar7.h
@@ -41,6 +41,7 @@
#define AR7_REGS_RESET (AR7_REGS_BASE + 0x1600)
#define AR7_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1800)
#define AR7_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1c00)
#define AR7_REGS_MDIO (AR7_REGS_BASE + 0x1e00)
#define AR7_REGS_IRQ (AR7_REGS_BASE + 0x2400)
-Index: linux-2.6.32.26/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.32.26.orig/drivers/net/cpmac.c 2010-11-28 03:22:24.982383427 -0800
-+++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
-@@ -668,9 +668,8 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -668,9 +668,8 @@ static void cpmac_hw_start(struct net_de
for (i = 0; i < 8; i++)
cpmac_write(priv->regs, CPMAC_MAC_ADDR_LO(i), dev->dev_addr[5]);
cpmac_write(priv->regs, CPMAC_MAC_ADDR_MID, dev->dev_addr[4]);
cpmac_write(priv->regs, CPMAC_MAX_LENGTH, CPMAC_SKB_SIZE);
cpmac_write(priv->regs, CPMAC_UNICAST_CLEAR, 0xff);
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 0xff);
-@@ -1104,8 +1103,6 @@
+@@ -1104,8 +1103,6 @@ static const struct net_device_ops cpmac
.ndo_set_mac_address = eth_mac_addr,
};
static int __devinit cpmac_probe(struct platform_device *pdev)
{
int rc, phy_id;
-@@ -1117,24 +1114,26 @@
+@@ -1117,24 +1114,26 @@ static int __devinit cpmac_probe(struct
pdata = pdev->dev.platform_data;
}
dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-@@ -1168,7 +1167,7 @@
+@@ -1168,7 +1167,7 @@ static int __devinit cpmac_probe(struct
priv->dev = dev;
priv->ring_size = 64;
priv->msg_enable = netif_msg_init(debug_level, 0xff);
snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
-@@ -1244,14 +1243,14 @@
+@@ -1244,14 +1243,14 @@ int __devinit cpmac_init(void)
ar7_gpio_disable(26);
ar7_gpio_disable(27);
}
cpmac_mii->reset(cpmac_mii);
-@@ -1262,14 +1261,7 @@
+@@ -1262,14 +1261,7 @@ int __devinit cpmac_init(void)
else
msleep(10);
-Index: linux-2.6.32.26/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.32.26.orig/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
-+++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:26:02.494883201 -0800
-@@ -369,6 +369,7 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -369,6 +369,7 @@ static struct sk_buff *cpmac_rx_one(stru
struct cpmac_desc *desc)
{
struct sk_buff *skb, *result = NULL;
if (unlikely(netif_msg_hw(priv)))
cpmac_dump_desc(priv->dev, desc);
-@@ -382,9 +383,13 @@
+@@ -382,9 +383,13 @@ static struct sk_buff *cpmac_rx_one(stru
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
if (likely(skb)) {
desc->skb->ip_summed = CHECKSUM_NONE;
priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += desc->datalen;
-@@ -456,7 +461,12 @@
+@@ -456,7 +461,12 @@ static int cpmac_poll(struct napi_struct
skb = cpmac_rx_one(priv, desc);
if (likely(skb)) {
received++;
}
desc = desc->next;
-@@ -951,7 +961,7 @@
+@@ -951,7 +961,7 @@ static void cpmac_adjust_link(struct net
static int cpmac_open(struct net_device *dev)
{
struct cpmac_priv *priv = netdev_priv(dev);
struct resource *mem;
struct cpmac_desc *desc;
-@@ -995,7 +1005,12 @@
+@@ -995,7 +1005,12 @@ static int cpmac_open(struct net_device
res = -ENOMEM;
goto fail_desc;
}
projects / openwrt / staging / jow.git / commitdiff