projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f90fe2
)
[kernel/2.6.32] refresh patches
author
Florian Fainelli
<florian@openwrt.org>
Fri, 2 Mar 2012 13:18:47 +0000
(13:18 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Fri, 2 Mar 2012 13:18:47 +0000
(13:18 +0000)
SVN-Revision: 30777
target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/660-phy_mvswitch.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/670-phy_ip175c.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/680-phy_ar8216.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/690-phy_rtl8306.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/691-phy_rtl8366.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/975-ssb_update.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
b/target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
index b9130a446c70c80934f765f3542c116a61f10982..a97b74e5fde52777e403f6e0d385214cc9233c63 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
+++ b/
target/linux/generic/patches-2.6.32/066-block2mtd_probe.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
-@@ -264,1
0 +264,12
@@ static int _open_bdev(struct block2mtd_d
+@@ -264,1
1 +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)) {
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. */
/* 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);
- 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);
+ devt = name_to_dev_t(dev->devname);
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ }
diff --git
a/target/linux/generic/patches-2.6.32/660-phy_mvswitch.patch
b/target/linux/generic/patches-2.6.32/660-phy_mvswitch.patch
index 36551fd57018f225b5369acddd985e74df3ab5aa..c32b087b6b60dd3dcc4528d594bdc9b89a095c3d 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/660-phy_mvswitch.patch
+++ b/
target/linux/generic/patches-2.6.32/660-phy_mvswitch.patch
@@
-1,8
+1,8
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- 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"
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
diff --git
a/target/linux/generic/patches-2.6.32/670-phy_ip175c.patch
b/target/linux/generic/patches-2.6.32/670-phy_ip175c.patch
index a9452b3bbeb9a4f945e69a81c7a3ac11004623fa..6bd8704e01d7eb8318d079ff49c5a5227141eadd 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/670-phy_ip175c.patch
+++ b/
target/linux/generic/patches-2.6.32/670-phy_ip175c.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -10
2,6 +102
,10 @@ config ADM6996_PHY
+@@ -10
4,6 +104
,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
diff --git
a/target/linux/generic/patches-2.6.32/680-phy_ar8216.patch
b/target/linux/generic/patches-2.6.32/680-phy_ar8216.patch
index 0566600a0ee0ffd19a1250c8d50b42307e206adb..afda536b39848938bf117f85b1468a723e025528 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/680-phy_ar8216.patch
+++ b/
target/linux/generic/patches-2.6.32/680-phy_ar8216.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -10
6,6 +106
,10 @@ config IP17XX_PHY
+@@ -10
8,6 +108
,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git
a/target/linux/generic/patches-2.6.32/690-phy_rtl8306.patch
b/target/linux/generic/patches-2.6.32/690-phy_rtl8306.patch
index 36ce9dfce71a85bc5497cb5e0434b6530cfeb5b5..07238ab87c704c87ff62c0034bc018c3c6f6640a 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/690-phy_rtl8306.patch
+++ b/
target/linux/generic/patches-2.6.32/690-phy_rtl8306.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -11
0,6 +110
,10 @@ config AR8216_PHY
+@@ -11
2,6 +112
,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
diff --git
a/target/linux/generic/patches-2.6.32/691-phy_rtl8366.patch
b/target/linux/generic/patches-2.6.32/691-phy_rtl8366.patch
index 56050912c10f0ef1a99587a6cc65a01eae3e276b..8bf78355f1a7ea1891032ea6d69aa85632027b6e 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/691-phy_rtl8366.patch
+++ b/
target/linux/generic/patches-2.6.32/691-phy_rtl8366.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -14
1,4 +141
,29 @@ config MDIO_GPIO
+@@ -14
3,4 +143
,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
diff --git
a/target/linux/generic/patches-2.6.32/975-ssb_update.patch
b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
index 4d4d608532b1d8d0a7a8ba20e4689a0273640e15..0564fa3c7606e6d8bdfb1acf1539dce82d44bbde 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/975-ssb_update.patch
+++ b/
target/linux/generic/patches-2.6.32/975-ssb_update.patch
@@
-206,7
+206,7
@@
u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
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);
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 */
}
/* 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);
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)
}
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)
{
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. */
/* 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);
* Otherwise static always-on powercontrol will be used. */
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);