refresh patches

SVN-Revision: 30777
This commit is contained in:
Florian Fainelli 2012-03-02 13:18:47 +00:00
parent 6c61d7cbf1
commit c25f266680
7 changed files with 14 additions and 13 deletions

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
@@ -264,11 +264,13 @@ static int _open_bdev(struct block2mtd_d
bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
#ifndef MODULE
if (IS_ERR(bdev)) {
@ -9,8 +9,9 @@
/* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */
+ wait_for_device_probe();
- dev_t devt = name_to_dev_t(dev->devname);
+ wait_for_device_probe();
+ devt = name_to_dev_t(dev->devname);
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}

View file

@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -99,6 +99,9 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@@ -101,6 +101,9 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -102,6 +102,10 @@ config ADM6996_PHY
@@ -104,6 +104,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -106,6 +106,10 @@ config IP17XX_PHY
@@ -108,6 +108,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -110,6 +110,10 @@ config AR8216_PHY
@@ -112,6 +112,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -141,4 +141,29 @@ config MDIO_GPIO
@@ -143,4 +143,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.

View file

@ -206,7 +206,7 @@
u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
@@ -509,15 +518,12 @@ void ssb_pmu_init(struct ssb_chipcommon
@@ -509,15 +518,12 @@ void ssb_pmu_init(struct ssb_chipcommon
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
cc->pmu.rev, pmucap);
@ -1468,7 +1468,7 @@
/* TODO - get remaining rev 8 stuff needed */
}
@@ -572,37 +682,34 @@ static int sprom_extract(struct ssb_bus
@@ -572,37 +682,34 @@ static int sprom_extract(struct ssb_bus
ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
memset(out->et0mac, 0xFF, 6); /* preset et0 and et1 mac */
memset(out->et1mac, 0xFF, 6);
@ -1527,7 +1527,7 @@
}
if (out->boardflags_lo == 0xFFFF)
@@ -616,15 +723,14 @@ static int sprom_extract(struct ssb_bus
@@ -616,15 +723,14 @@ static int sprom_extract(struct ssb_bus
static int ssb_pci_sprom_get(struct ssb_bus *bus,
struct ssb_sprom *sprom)
{
@ -2309,7 +2309,7 @@
/* Suspend a SSB bus.
* Call this from the parent bus suspend routine. */
@@ -667,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct
@@ -667,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct
* Otherwise static always-on powercontrol will be used. */
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);