openwrt/upstream - upstream openwrt

diff options

author	Gabor Juhos <juhosg@openwrt.org>	2009-05-05 19:21:39 +0000
committer	Gabor Juhos <juhosg@openwrt.org>	2009-05-05 19:21:39 +0000
commit	ed861cf5e9e7af0e25d6562baf5ebe6ef9edb6e1 (patch)
tree	f3961749d7642fc6ec2147a7221cfb17a79c6837
parent	744a09fa4bb2506f0169b99a1a7af2519ab7c14c (diff)
download	upstream-ed861cf5e9e7af0e25d6562baf5ebe6ef9edb6e1.tar.gz upstream-ed861cf5e9e7af0e25d6562baf5ebe6ef9edb6e1.tar.bz2 upstream-ed861cf5e9e7af0e25d6562baf5ebe6ef9edb6e1.zip

use dev_name() inste

The mvebu gpio driver can also perform PWM on some pins. Us the
pwm-fan driver to control the fan of the WRT1900AC, giving us fine
grain control over its speed and hence noise.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/boot/dts/armada-xp-wrt1900ac.dts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -412,13 +412,11 @@
 		};
 	};
 
-	gpio_fan {
+	pwm_fan {
 		/* SUNON HA4010V4-0000-C99 */
-		compatible = "gpio-fan";
-		gpios = <&gpio0 24 0>;
 
-		gpio-fan,speed-map = <0    0
-				      4500 1>;
+		compatible = "pwm-fan";
+		pwms = <&gpio0 24 4000 0>;
 	};
 
 	mvsw61xx {

->mii_bus->phy_map[phy_addr]->phy_id);

if (phydev == NULL)

@@ -233,12 +233,12 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)

ret = -ENODEV;

break;

case 1:

- ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,

+ ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),

&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);

if (IS_ERR(ag->phy_dev)) {

printk(KERN_ERR "%s: could not connect to PHY at %s\n",

- dev->name, phydev->dev.bus_id);

+ dev->name, dev_name(&phydev->dev));

return PTR_ERR(ag->phy_dev);

}

@@ -252,7 +252,7 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)

printk(KERN_DEBUG "%s: connected to PHY at %s "

"[uid=%08x, driver=%s]\n",

- dev->name, phydev->dev.bus_id,

+ dev->name, dev_name(&phydev->dev),

phydev->phy_id, phydev->drv->name);

ag->link = 0;

diff --git a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
index 1c05a64c58f..5b929e1db99 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c

@@ -79,7 +79,7 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver,

res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

if (!res) {

dev_dbg(&pdev->dev, "no IRQ specified for %s\n",

- pdev->dev.bus_id);

+ dev_name(&pdev->dev));

return -ENODEV;

}

irq = res->start;

@@ -87,11 +87,11 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver,

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

if (!res) {

dev_dbg(&pdev->dev, "no base address specified for %s\n",

- pdev->dev.bus_id);

+ dev_name(&pdev->dev));

return -ENODEV;

}

- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);

+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

if (!hcd)

return -ENOMEM;

@@ -205,7 +205,7 @@ static int ehci_ar71xx_driver_probe(struct platform_device *pdev)

pdata = pdev->dev.platform_data;

if (!pdata) {

dev_err(&pdev->dev, "no platform data specified for %s\n",

- pdev->dev.bus_id);

+ dev_name(&pdev->dev));

return -ENODEV;

}

diff --git a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
index 30fb9e0395e..48457e013b7 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c

@@ -30,19 +30,19 @@ static int usb_hcd_ar71xx_probe(const struct hc_driver *driver,

res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

if (!res) {

dev_dbg(&pdev->dev, "no IRQ specified for %s\n",

- pdev->dev.bus_id);

+ dev_name(&pdev->dev));

return -ENODEV;

}

irq = res->start;

- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);

+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

if (!hcd)

return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

if (!res) {

dev_dbg(&pdev->dev, "no base address specified for %s\n",

- pdev->dev.bus_id);

+ dev_name(&pdev->dev));

ret = -ENODEV;

goto err_put_hcd;

}

diff --git a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index d85cc116918..00000000000
--- a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null

@@ -1,46 +0,0 @@

---- a/drivers/net/ag71xx/ag71xx_ethtool.c

-+++ b/drivers/net/ag71xx/ag71xx_ethtool.c

-@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(s

- strcpy(info->driver, ag->pdev->dev.driver->name);

- strcpy(info->version, AG71XX_DRV_VERSION);

-- strcpy(info->bus_info, ag->pdev->dev.bus_id);

-+ strcpy(info->bus_info, dev_name(&ag->pdev->dev));

- }

- static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)

---- a/drivers/net/ag71xx/ag71xx_phy.c

-+++ b/drivers/net/ag71xx/ag71xx_phy.c

-@@ -213,7 +213,7 @@ static int ag71xx_phy_connect_multi(stru

- DBG("%s: PHY found at %s, uid=%08x\n",

- dev->name,

-- ag->mii_bus->phy_map[phy_addr]->dev.bus_id,

-+ dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),

- ag->mii_bus->phy_map[phy_addr]->phy_id);

- if (phydev == NULL)

-@@ -229,12 +229,12 @@ static int ag71xx_phy_connect_multi(stru

- ret = -ENODEV;

- break;

- case 1:

-- ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,

-+ ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),

- &ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);

- if (IS_ERR(ag->phy_dev)) {

- printk(KERN_ERR "%s: could not connect to PHY at %s\n",

-- dev->name, phydev->dev.bus_id);

-+ dev->name, dev_name(&phydev->dev));

- return PTR_ERR(ag->phy_dev);

- }

-@@ -248,7 +248,7 @@ static int ag71xx_phy_connect_multi(stru

- printk(KERN_DEBUG "%s: connected to PHY at %s "

- "[uid=%08x, driver=%s]\n",

-- dev->name, phydev->dev.bus_id,

-+ dev->name, dev_name(&phydev->dev),

- phydev->phy_id, phydev->drv->name);

- ag->link = 0;

diff --git a/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index 131029f380b..00000000000
--- a/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null

@@ -1,34 +0,0 @@

---- a/drivers/usb/host/ehci-ar71xx.c

-+++ b/drivers/usb/host/ehci-ar71xx.c

-@@ -79,7 +79,7 @@ static int ehci_ar71xx_probe(const struc

- res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

- if (!res) {

- dev_dbg(&pdev->dev, "no IRQ specified for %s\n",

-- pdev->dev.bus_id);

-+ dev_name(&pdev->dev));

- return -ENODEV;

- }

- irq = res->start;

-@@ -87,11 +87,11 @@ static int ehci_ar71xx_probe(const struc

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

- if (!res) {

- dev_dbg(&pdev->dev, "no base address specified for %s\n",

-- pdev->dev.bus_id);

-+ dev_name(&pdev->dev));

- return -ENODEV;

- }

-- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);

-+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

- if (!hcd)

- return -ENOMEM;

-@@ -205,7 +205,7 @@ static int ehci_ar71xx_driver_probe(stru

- pdata = pdev->dev.platform_data;

- if (!pdata) {

- dev_err(&pdev->dev, "no platform data specified for %s\n",

-- pdev->dev.bus_id);

-+ dev_name(&pdev->dev));

- return -ENODEV;

- }

diff --git a/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index 4660bc15569..00000000000
--- a/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null

@@ -1,25 +0,0 @@

---- a/drivers/usb/host/ohci-ar71xx.c

-+++ b/drivers/usb/host/ohci-ar71xx.c

-@@ -30,19 +30,19 @@ static int usb_hcd_ar71xx_probe(const st

- res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

- if (!res) {

- dev_dbg(&pdev->dev, "no IRQ specified for %s\n",

-- pdev->dev.bus_id);

-+ dev_name(&pdev->dev));

- return -ENODEV;

- }

- irq = res->start;

-- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);

-+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

- if (!hcd)

- return -ENOMEM;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

- if (!res) {

- dev_dbg(&pdev->dev, "no base address specified for %s\n",

-- pdev->dev.bus_id);

-+ dev_name(&pdev->dev));

- ret = -ENODEV;

- goto err_put_hcd;

- }


context:
space:
mode: