Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 files changed, 34 insertions, 41 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 4612725965df..9b8d7d9dbe86 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1260,9 +1260,10 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
                 return -ENODEV;
         }
-        prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
+        prop_addr = of_get_property(macio_get_of_node(mdev),
+                        "mac-address", NULL);
         if (prop_addr == NULL) {
-                prop_addr = get_property(macio_get_of_node(mdev),
+                prop_addr = of_get_property(macio_get_of_node(mdev),
                                 "local-mac-address", NULL);
                 if (prop_addr == NULL) {
                         printk(KERN_ERR "BMAC: Can't get mac-address\n");
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index c7a5614e66c0..a1bd2d861d92 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2603,14 +2603,13 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
         int i = 0;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (!dn_log_port_id) {
                         ehea_error("bad device node: eth_dn name=%s",
@@ -2645,12 +2644,12 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (dn_log_port_id)
                         if (*dn_log_port_id == logical_port_id)
@@ -2774,7 +2773,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
                                         const struct of_device_id *id)
 {
         struct ehea_adapter *adapter;
-        u64 *adapter_handle;
+        const u64 *adapter_handle;
         int ret;
 
         if (!dev || !dev->ofdev.node) {
@@ -2791,7 +2790,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
 
         adapter->ebus_dev = dev;
 
-        adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
+        adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle",
                                             NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index b3bd62394958..52b9332810c5 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                 return -ENODEV;
         }
 
-        addr = get_property(mace, "mac-address", NULL);
+        addr = of_get_property(mace, "mac-address", NULL);
         if (addr == NULL) {
-                addr = get_property(mace, "local-mac-address", NULL);
+                addr = of_get_property(mace, "local-mac-address", NULL);
                 if (addr == NULL) {
                         printk(KERN_ERR "Can't get mac-address for MACE %s\n",
                                mace->full_name);
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 76fe9dd8e841..07eb9b24a97f 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -80,7 +80,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
                 return -ENOENT;
         }
 
-        maddr = get_property(dn, "mac-address", NULL);
+        maddr = of_get_property(dn, "mac-address", NULL);
         if (maddr == NULL) {
                 dev_warn(&pdev->dev,
                          "no mac address in device tree, not configuring\n");
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 230da14b1b68..c15e97253ede 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1830,7 +1830,7 @@ try_host_fw:
         if (!dn)
                 goto out_err;
 
-        fw_prop = get_property(dn, "firmware", &fw_size);
+        fw_prop = of_get_property(dn, "firmware", &fw_size);
         if (!fw_prop)
                 goto out_err;
 
@@ -2236,7 +2236,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
         if (!dn)
                 return -EIO;
 
-        mac = get_property(dn, "local-mac-address", NULL);
+        mac = of_get_property(dn, "local-mac-address", NULL);
         if (!mac)
                 return -EIO;
         memcpy(addr.sa_data, mac, ETH_ALEN);
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 5da73212ac91..432803855034 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2903,7 +2903,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
         struct net_device *dev = gp->dev;
         const unsigned char *addr;
 
-        addr = get_property(gp->of_node, "local-mac-address", NULL);
+        addr = of_get_property(gp->of_node, "local-mac-address", NULL);
         if (addr == NULL) {
 #ifdef CONFIG_SPARC
                 addr = idprom->id_ethaddr;
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 56a110ca5e6f..61843fd57525 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -451,7 +451,7 @@ static int bcm5421_init(struct mii_phy* phy)
         if (phy->platform_data) {
                 struct device_node *np = of_get_parent(phy->platform_data);
                 int can_low_power = 1;
-                if (np == NULL || get_property(np, "no-autolowpower", NULL))
+                if (np == NULL || of_get_property(np, "no-autolowpower", NULL))
                         can_low_power = 0;
                 if (can_low_power) {
                         /* Enable automatic low-power */
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 0bfc2c9c1c08..1aabc91f6458 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -82,6 +82,7 @@ struct tsi108_prv_data {
         unsigned int phy;               /* Index of PHY for this interface */
         unsigned int irq_num;
         unsigned int id;
+        unsigned int phy_type;
 
         struct timer_list timer;/* Timer that triggers the check phy function */
         unsigned int rxtail;    /* Next entry in rxring to read */
@@ -1256,11 +1257,11 @@ static void tsi108_init_phy(struct net_device *dev)
         if (i == 0)
                 printk(KERN_ERR "%s function time out \n", __FUNCTION__);
 
-#if (TSI108_PHY_TYPE == PHY_BCM54XX)    /* Broadcom BCM54xx PHY */
-        tsi108_write_mii(data, 0x09, 0x0300);
-        tsi108_write_mii(data, 0x10, 0x1020);
-        tsi108_write_mii(data, 0x1c, 0x8c00);
-#endif
+        if (data->phy_type == TSI108_PHY_BCM54XX) {
+                tsi108_write_mii(data, 0x09, 0x0300);
+                tsi108_write_mii(data, 0x10, 0x1020);
+                tsi108_write_mii(data, 0x1c, 0x8c00);
+        }
 
         tsi108_write_mii(data,
                          MII_BMCR,
@@ -1587,6 +1588,7 @@ tsi108_init_one(struct platform_device *pdev)
         data->mii_if.supports_gmii = mii_check_gmii_support(&data->mii_if);
 
         data->phy = einfo->phy;
+        data->phy_type = einfo->phy_type;
         data->irq_num = einfo->irq_num;
         data->id = pdev->id;
         dev->open = tsi108_open;
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/tsi108_eth.h
index 77a769df228a..5a77ae6c5f36 100644
--- a/drivers/net/tsi108_eth.h
+++ b/drivers/net/tsi108_eth.h
@@ -43,15 +43,6 @@
         in_be32((data->phyregs + (offset)))
 
 /*
- * PHY Configuration Options
- *
- * NOTE: Enable set of definitions corresponding to your board type
- */
-#define PHY_MV88E       1       /* Marvel 88Exxxx PHY */
-#define PHY_BCM54XX     2       /* Broardcom BCM54xx PHY */
-#define TSI108_PHY_TYPE PHY_MV88E
-
-/*
  * TSI108 GIGE port registers
  */
 
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 16b9acdabbe8..d7aff8189377 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3787,7 +3787,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        prop = get_property(np, "device-id", NULL);
+        prop = of_get_property(np, "device-id", NULL);
         ucc_num = *prop - 1;
         if ((ucc_num < 0) || (ucc_num > 7))
                 return -ENODEV;
@@ -3795,9 +3795,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ug_info = &ugeth_info[ucc_num];
         ug_info->uf_info.ucc_num = ucc_num;
 
-        prop = get_property(np, "rx-clock", NULL);
+        prop = of_get_property(np, "rx-clock", NULL);
         ug_info->uf_info.rx_clock = *prop;
-        prop = get_property(np, "tx-clock", NULL);
+        prop = of_get_property(np, "tx-clock", NULL);
         ug_info->uf_info.tx_clock = *prop;
         err = of_address_to_resource(np, 0, &res);
         if (err)
@@ -3806,23 +3806,23 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ug_info->uf_info.regs = res.start;
         ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
 
-        ph = get_property(np, "phy-handle", NULL);
+        ph = of_get_property(np, "phy-handle", NULL);
         phy = of_find_node_by_phandle(*ph);
 
         if (phy == NULL)
                 return -ENODEV;
 
         /* set the PHY address */
-        prop = get_property(phy, "reg", NULL);
+        prop = of_get_property(phy, "reg", NULL);
         if (prop == NULL)
                 return -1;
         ug_info->phy_address = *prop;
 
         /* get the phy interface type, or default to MII */
-        prop = get_property(np, "interface-type", NULL);
+        prop = of_get_property(np, "interface-type", NULL);
         if (!prop) {
                 /* handle interface property present in old trees */
-                prop = get_property(phy, "interface", NULL);
+                prop = of_get_property(phy, "interface", NULL);
                 if (prop != NULL)
                         phy_interface = enet_to_phy_interface[*prop];
                 else
@@ -3832,10 +3832,10 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         }
 
         /* get speed, or derive from interface */
-        prop = get_property(np, "max-speed", NULL);
+        prop = of_get_property(np, "max-speed", NULL);
         if (!prop) {
                 /* handle interface property present in old trees */
-                prop = get_property(phy, "interface", NULL);
+                prop = of_get_property(phy, "interface", NULL);
                 if (prop != NULL)
                         max_speed = enet_to_speed[*prop];
         } else {
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 73b5a538e8f4..27a1ef3b7b06 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -172,7 +172,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
         while ((child = of_get_next_child(np, child)) != NULL) {
                 int irq = irq_of_parse_and_map(child, 0);
                 if (irq != NO_IRQ) {
-                        const u32 *id = get_property(child, "reg", NULL);
+                        const u32 *id = of_get_property(child, "reg", NULL);
                         new_bus->irq[*id] = irq;
                 }
         }
@@ -203,7 +203,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
                 if ((res.start >= tempres.start) &&
                     (res.end <= tempres.end)) {
                         /* set this UCC to be the MII master */
-                        const u32 *id = get_property(tempnp, "device-id", NULL);
+                        const u32 *id = of_get_property(tempnp, "device-id", NULL);
                         if (id == NULL)
                                 goto bus_register_fail;