rpms/kernel/F-8 linux-2.6-pasemi-mdio-gpio.patch, NONE, 1.1 config-powerpc64, 1.5, 1.6 kernel.spec, 1.300, 1.301
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Fri Dec 14 22:24:16 UTC 2007
Author: dwmw2
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6791
Modified Files:
config-powerpc64 kernel.spec
Added Files:
linux-2.6-pasemi-mdio-gpio.patch
Log Message:
fix Electra network
linux-2.6-pasemi-mdio-gpio.patch:
--- NEW FILE linux-2.6-pasemi-mdio-gpio.patch ---
--- linux-2.6.23.ppc64/arch/powerpc/platforms/pasemi/gpio_mdio.c 2007-10-09 16:31:38.000000000 -0400
+++ linux-2.6.23.ppc64/arch/powerpc/platforms/pasemi/gpio_mdio.c 2007-12-14 12:01:17.000000000 -0500
@@ -218,45 +218,27 @@ static int __devinit gpio_mdio_probe(str
const struct of_device_id *match)
{
struct device *dev = &ofdev->dev;
- struct device_node *np = ofdev->node;
- struct device_node *gpio_np;
+ struct device_node *phy_dn, *np = ofdev->node;
struct mii_bus *new_bus;
- struct resource res;
struct gpio_priv *priv;
const unsigned int *prop;
- int err = 0;
+ int err;
int i;
- gpio_np = of_find_compatible_node(NULL, "gpio", "1682m-gpio");
-
- if (!gpio_np)
- return -ENODEV;
-
- err = of_address_to_resource(gpio_np, 0, &res);
- of_node_put(gpio_np);
-
- if (err)
- return -EINVAL;
-
- if (!gpio_regs)
- gpio_regs = ioremap(res.start, 0x100);
-
- if (!gpio_regs)
- return -EPERM;
-
+ err = -ENOMEM;
priv = kzalloc(sizeof(struct gpio_priv), GFP_KERNEL);
- if (priv == NULL)
- return -ENOMEM;
+ if (!priv)
+ goto out;
new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
- if (new_bus == NULL)
- return -ENOMEM;
+ if (!new_bus)
+ goto out_free_priv;
- new_bus->name = "pasemi gpio mdio bus",
- new_bus->read = &gpio_mdio_read,
- new_bus->write = &gpio_mdio_write,
- new_bus->reset = &gpio_mdio_reset,
+ new_bus->name = "pasemi gpio mdio bus";
+ new_bus->read = &gpio_mdio_read;
+ new_bus->write = &gpio_mdio_write;
+ new_bus->reset = &gpio_mdio_reset;
prop = of_get_property(np, "reg", NULL);
new_bus->id = *prop;
@@ -265,9 +247,24 @@ static int __devinit gpio_mdio_probe(str
new_bus->phy_mask = 0;
new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
- for(i = 0; i < PHY_MAX_ADDR; ++i)
- new_bus->irq[i] = irq_create_mapping(NULL, 10);
+ if (!new_bus->irq)
+ goto out_free_bus;
+
+ for (i = 0; i < PHY_MAX_ADDR; i++)
+ new_bus->irq[i] = NO_IRQ;
+
+ for (phy_dn = of_get_next_child(np, NULL);
+ phy_dn != NULL;
+ phy_dn = of_get_next_child(np, phy_dn)) {
+ const unsigned int *ip, *regp;
+
+ ip = of_get_property(phy_dn, "interrupts", NULL);
+ regp = of_get_property(phy_dn, "reg", NULL);
+ if (!ip || !regp || *regp >= PHY_MAX_ADDR)
+ continue;
+ new_bus->irq[*regp] = irq_create_mapping(NULL, *ip);
+ }
prop = of_get_property(np, "mdc-pin", NULL);
priv->mdc_pin = *prop;
@@ -280,17 +277,21 @@ static int __devinit gpio_mdio_probe(str
err = mdiobus_register(new_bus);
- if (0 != err) {
+ if (err != 0) {
printk(KERN_ERR "%s: Cannot register as MDIO bus, err %d\n",
new_bus->name, err);
- goto bus_register_fail;
+ goto out_free_irq;
}
return 0;
-bus_register_fail:
+out_free_irq:
+ kfree(new_bus->irq);
+out_free_bus:
kfree(new_bus);
-
+out_free_priv:
+ kfree(priv);
+out:
return err;
}
@@ -317,23 +318,46 @@ static struct of_device_id gpio_mdio_mat
},
{},
};
+MODULE_DEVICE_TABLE(of, gpio_mdio_match);
static struct of_platform_driver gpio_mdio_driver =
{
- .name = "gpio-mdio-bitbang",
.match_table = gpio_mdio_match,
.probe = gpio_mdio_probe,
.remove = gpio_mdio_remove,
+ .driver = {
+ .name = "gpio-mdio-bitbang",
+ },
};
int gpio_mdio_init(void)
{
+ struct device_node *np;
+
+ np = of_find_compatible_node(NULL, NULL, "1682m-gpio");
+ if (!np)
+ np = of_find_compatible_node(NULL, NULL,
+ "pasemi,pwrficient-gpio");
+ if (!np)
+ return -ENODEV;
+ gpio_regs = of_iomap(np, 0);
+ of_node_put(np);
+
+ if (!gpio_regs)
+ return -ENODEV;
+
return of_register_platform_driver(&gpio_mdio_driver);
}
+module_init(gpio_mdio_init);
void gpio_mdio_exit(void)
{
of_unregister_platform_driver(&gpio_mdio_driver);
+ if (gpio_regs)
+ iounmap(gpio_regs);
}
-device_initcall(gpio_mdio_init);
+module_exit(gpio_mdio_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Olof Johansson <olof at lixom.net>");
+MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-powerpc64,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-powerpc64 19 Sep 2007 22:19:45 -0000 1.5
+++ config-powerpc64 14 Dec 2007 22:23:39 -0000 1.6
@@ -76,8 +76,7 @@
CONFIG_VIOCD=m
CONFIG_VIOTAPE=m
-# virq_to_hw() requires irq_map[] to be exported. Ick.
-# CONFIG_PASEMI_MAC is not set
+CONFIG_PASEMI_MAC=m
CONFIG_SERIAL_OF_PLATFORM=m
CONFIG_PPC_PASEMI_IOMMU=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- kernel.spec 14 Dec 2007 16:37:31 -0000 1.300
+++ kernel.spec 14 Dec 2007 22:23:39 -0000 1.301
@@ -612,6 +612,7 @@
Patch113: linux-2.6-pasemi-5945-workaround.patch
Patch114: linux-2.6-pasemi-no-mpic-reset.patch
Patch115: linux-2.6-pasemi-mac.patch
+Patch116: linux-2.6-pasemi-gpio-mdio.patch
Patch120: linux-2.6-ibmvscsi-schizo.patch
Patch121: linux-2.6-pmac-zilog.patch
Patch130: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
@@ -1152,6 +1153,7 @@
ApplyPatch linux-2.6-pasemi-5945-workaround.patch
ApplyPatch linux-2.6-pasemi-no-mpic-reset.patch
ApplyPatch linux-2.6-pasemi-mac.patch
+ApplyPatch linux-2.6-pasemi-mdio-gpio.patch
# Fix up ibmvscsi for combined pSeries/iSeries build
ApplyPatch linux-2.6-ibmvscsi-schizo.patch
# Move pmac_zilog to its newly-registered device number
@@ -2039,6 +2041,9 @@
%changelog
+* Fri Dec 14 2007 David Woodhouse <dwmw2 at redhat.com> 2.6.23.9-92
+- Re-enable and fix pasemi-mac (and gpio-mdio)
+
* Fri Dec 14 2007 David Woodhouse <dwmw2 at redhat.com> 2.6.23.9-91
- PA Semi platform fixes
- Fix OProfile on non-Cell ppc64
More information about the fedora-extras-commits
mailing list