Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[kernel/kernel-generic.git] / arch / arm / mach-at91 / setup.c

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 2ecd169..e8491e7 100644 (file)
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -360,7 +360,7 @@ static void at91_dt_rstc(void)
 
        of_id = of_match_node(rstc_ids, np);
        if (!of_id)
-               panic("AT91: rtsc no restart function availlable\n");
+               panic("AT91: rtsc no restart function available\n");
 
        arm_pm_restart = of_id->data;
 
@@ -380,7 +380,7 @@ static void at91_dt_ramc(void)
 
        np = of_find_matching_node(NULL, ramc_ids);
        if (!np)
-               panic("unable to find compatible ram conroller node in dtb\n");
+               panic("unable to find compatible ram controller node in dtb\n");
 
        at91_ramc_base[0] = of_iomap(np, 0);
        if (!at91_ramc_base[0])
@@ -430,7 +430,7 @@ static void at91_dt_shdwc(void)
 
        np = of_find_matching_node(NULL, shdwc_ids);
        if (!np) {
-               pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
+               pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
                return;
        }
 
@@ -446,7 +446,7 @@ static void at91_dt_shdwc(void)
 
        if (!of_property_read_u32(np, "atmel,wakeup-counter", &reg)) {
                if (reg > AT91_SHDW_CPTWK0_MAX) {
-                       pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n",
+                       pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
                                reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
                        reg = AT91_SHDW_CPTWK0_MAX;
                }