[POWERPC] pasemi: Broaden specific references to 1682M

There will be more product numbers in the future than just PA6T-1682M,
but they will share much of the features. Remove some of the explicit
references and compatibility checks with 1682M, and replace most of them
with the more generic term "PWRficient".

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Doug Thompson <dougthompson@xmission.com>

4 files changed, 22 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 735e1536cbfc..2f4dd6e4aac1 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -17,7 +17,7 @@ config PPC_PASEMI_IOMMU
         bool "PA Semi IOMMU support"
         depends on PPC_PASEMI
         help
-          IOMMU support for PA6T-1682M
+          IOMMU support for PA Semi PWRficient
 
 config PPC_PASEMI_IOMMU_DMA_FORCE
         bool "Force DMA engine to use IOMMU"
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index 1cfb8b0c8fec..8caa1667cf34 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -147,7 +147,10 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
         if (!cpu)
                 goto out;
 
-        dn = of_find_compatible_node(NULL, "sdc", "1682m-sdc");
+        dn = of_find_compatible_node(NULL, NULL, "1682m-sdc");
+        if (!dn)
+                dn = of_find_compatible_node(NULL, NULL,
+                                             "pasemi,pwrficient-sdc");
         if (!dn)
                 goto out;
         err = of_address_to_resource(dn, 0, &res);
@@ -160,7 +163,10 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 goto out;
         }
 
-        dn = of_find_compatible_node(NULL, "gizmo", "1682m-gizmo");
+        dn = of_find_compatible_node(NULL, NULL, "1682m-gizmo");
+        if (!dn)
+                dn = of_find_compatible_node(NULL, NULL,
+                                             "pasemi,pwrficient-gizmo");
         if (!dn) {
                 err = -ENODEV;
                 goto out_unmap_sdcasr;
@@ -292,7 +298,8 @@ static struct cpufreq_driver pas_cpufreq_driver = {
 
 static int __init pas_cpufreq_init(void)
 {
-        if (!machine_is_compatible("PA6T-1682M"))
+        if (!machine_is_compatible("PA6T-1682M") &&
+            !machine_is_compatible("pasemi,pwrficient"))
                 return -ENODEV;
 
         return cpufreq_register_driver(&pas_cpufreq_driver);
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 95d0c78cf634..b0298045df7e 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -333,7 +333,10 @@ int gpio_mdio_init(void)
 {
         struct device_node *np;
 
-        np = of_find_compatible_node(NULL, "gpio", "1682m-gpio");
+        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);
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 3d62060498b4..bd85853bc9da 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -362,8 +362,12 @@ static inline void pasemi_pcmcia_init(void)
 
 
 static struct of_device_id pasemi_bus_ids[] = {
+        /* Unfortunately needed for legacy firmwares */
         { .type = "localbus", },
         { .type = "sdc", },
+        /* These are the proper entries, which newer firmware uses */
+        { .compatible = "pasemi,localbus", },
+        { .compatible = "pasemi,sdc", },
         {},
 };
 
@@ -389,7 +393,8 @@ static int __init pas_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
-        if (!of_flat_dt_is_compatible(root, "PA6T-1682M"))
+        if (!of_flat_dt_is_compatible(root, "PA6T-1682M") &&
+            !of_flat_dt_is_compatible(root, "pasemi,pwrficient"))
                 return 0;
 
         hpte_init_native();
@@ -400,7 +405,7 @@ static int __init pas_probe(void)
 }
 
 define_machine(pasemi) {
-        .name                   = "PA Semi PA6T-1682M",
+        .name                   = "PA Semi PWRficient",
         .probe                  = pas_probe,
         .setup_arch             = pas_setup_arch,
         .init_early             = pas_init_early,