sparc64: fix typo in property

There is a typo in a comment that propagated into code:
upa-portis instead of upa-portid

This problem was detected by code inspection.

Fixes: eea9833453bd ("sparc64: broken %tick frequency on spitfire cpus"
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reported-by: Steven Sistare <steven.sistare@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 20cc5d80a4719cb0059f950de1ffaadf4b585e1c..baeaeed6499391e368240be85baa2698e81a2600 100644 (file)
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -381,7 +381,7 @@ bool arch_find_n_match_cpu_physical_id(struct device_node *cpun,
        int this_cpu_id;
 
        /* On hypervisor based platforms we interrogate the 'reg'
-        * property.  On everything else we look for a 'upa-portis',
+        * property.  On everything else we look for a 'upa-portid',
         * 'portid', or 'cpuid' property.
         */
 

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index f584c53e769a6e898f436c94eb48c8283d43e161..564f0e46ffd4d8ae5b0ef2be6a4395b903aca762 100644 (file)
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -175,8 +175,8 @@ static unsigned long cpuid_to_freq(phandle node, int cpuid)
        if (prom_getproperty(node, "device_type", type, sizeof(type)) != -1)
                is_cpu_node = (strcmp(type, "cpu") == 0);
 
-       /* try upa-portis then cpuid to get cpuid, see prom_64.c */
-       if (is_cpu_node && (prom_getint(node, "upa-portis") == cpuid ||
+       /* try upa-portid then cpuid to get cpuid, see prom_64.c */
+       if (is_cpu_node && (prom_getint(node, "upa-portid") == cpuid ||
                            prom_getint(node, "cpuid") == cpuid))
                freq = prom_getintdefault(node, "clock-frequency", 0);
        if (!freq)