3 files changed, 39 insertions, 24 deletions

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 47d841ecf2e2..de7fce9cb6eb 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,21 +1,36 @@
-menu "Platform support"
-       depends on PPC_82xx
-
 choice
-       prompt "Machine Type"
-       default MPC82xx_ADS
+        prompt "Machine Type"
+        depends on PPC_82xx
+        default MPC82xx_ADS
 
 config MPC82xx_ADS
-       bool "Freescale MPC82xx ADS"
-       select DEFAULT_UIMAGE
-       select PQ2ADS
-       select 8272
-       select 8260
-       select CPM2
-       select FSL_SOC
-       help
-         This option enables support for the MPC8272 ADS board
+        bool "Freescale MPC82xx ADS"
+        select DEFAULT_UIMAGE
+        select PQ2ADS
+        select 8272
+        select 8260
+        select FSL_SOC
+        help
+        This option enables support for the MPC8272 ADS board
 
 endchoice
 
-endmenu
+config PQ2ADS
+        bool
+        default n
+
+config 8260
+        bool
+        depends on 6xx
+        select CPM2
+        help
+          The MPC8260 is a typical embedded CPU made by Freescale.  Selecting
+          this option means that you wish to build a kernel for a machine with
+          an 8260 class CPU.
+
+config 8272
+        bool
+        select 8260
+        help
+          The MPC8272 CPM has a different internal dpram setup than other CPM2
+          devices
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c
index 74e7892cdfcf..cc9900d2e5ee 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx.c
@@ -55,17 +55,17 @@
 static int __init get_freq(char *name, unsigned long *val)
 {
         struct device_node *cpu;
-        unsigned int *fp;
+        const unsigned int *fp;
         int found = 0;
 
         /* The cpu node should have timebase and clock frequency properties */
         cpu = of_find_node_by_type(NULL, "cpu");
 
         if (cpu) {
-                fp = (unsigned int *)get_property(cpu, name, NULL);
+                fp = of_get_property(cpu, name, NULL);
                 if (fp) {
                         found = 1;
-                        *val = *fp++;
+                        *val = *fp;
                 }
 
                 of_node_put(cpu);
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 7334c1a15b90..47cb09f08052 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -456,7 +456,7 @@ void m82xx_pci_init_irq(void)
                 iounmap(immap);
                 return;
         }
-        irq_map = get_property(np, "interrupt-map", &size);
+        irq_map = of_get_property(np, "interrupt-map", &size);
         if ((!irq_map) || (size <= 7)) {
                 printk(KERN_INFO "No interrupt-map property of pci node\n");
                 iounmap(immap);
@@ -481,7 +481,7 @@ void m82xx_pci_init_irq(void)
         }
         pci_pic_node = of_node_get(np);
         /* PCI interrupt controller registers: status and mask */
-        regs = get_property(np, "reg", &size);
+        regs = of_get_property(np, "reg", &size);
         if ((!regs) || (size <= 2)) {
                 printk(KERN_INFO "No reg property in pci pic node\n");
                 iounmap(immap);
@@ -521,20 +521,20 @@ void __init add_bridge(struct device_node *np)
         struct pci_controller *hose;
         struct resource r;
         const int *bus_range;
-        const void *ptr;
+        const uint *ptr;
 
         memset(&r, 0, sizeof(r));
         if (of_address_to_resource(np, 0, &r)) {
                 printk(KERN_INFO "No PCI reg property in device tree\n");
                 return;
         }
-        if (!(ptr = get_property(np, "clock-frequency", NULL))) {
+        if (!(ptr = of_get_property(np, "clock-frequency", NULL))) {
                 printk(KERN_INFO "No clock-frequency property in PCI node");
                 return;
         }
-        pci_clk_frq = *(uint *) ptr;
+        pci_clk_frq = *ptr;
         of_node_put(np);
-        bus_range = get_property(np, "bus-range", &len);
+        bus_range = of_get_property(np, "bus-range", &len);
         if (bus_range == NULL || len < 2 * sizeof(int)) {
                 printk(KERN_WARNING "Can't get bus-range for %s, assume"
                        " bus 0\n", np->full_name);