macintosh/via-pmu68k: Don't load driver on unsupported hardware

Don't load the via-pmu68k driver on early PowerBooks. The M50753 PMU
device found in those models was never supported by this driver.
Attempting to load the driver usually causes a boot hang.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Michael Schmitz <schmitzmic@gmail.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index c68054361615a32eef13ab46c17c99d75793baa0..7ccb799eeb57232308204b27a6e0333c1119b88e 100644 (file)
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -478,8 +478,7 @@ void mac_poweroff(void)
                cuda_shutdown();
 #endif
 #ifdef CONFIG_ADB_PMU68K
-       } else if (macintosh_config->adb_type == MAC_ADB_PB1
-               || macintosh_config->adb_type == MAC_ADB_PB2) {
+       } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
                pmu_shutdown();
 #endif
        }
@@ -520,8 +519,7 @@ void mac_reset(void)
                cuda_restart();
 #endif
 #ifdef CONFIG_ADB_PMU68K
-       } else if (macintosh_config->adb_type == MAC_ADB_PB1
-               || macintosh_config->adb_type == MAC_ADB_PB2) {
+       } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
                pmu_restart();
 #endif
        } else if (CPU_IS_030) {

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index d545ed45e482a573ff28694093790132781f86a0..bec8e1837d7de70ee298e86e344a0b0cc1aecc50 100644 (file)
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -175,9 +175,6 @@ static s8 pmu_data_len[256][2] = {
 int __init find_via_pmu(void)
 {
        switch (macintosh_config->adb_type) {
-       case MAC_ADB_PB1:
-               pmu_kind = PMU_68K_V1;
-               break;
        case MAC_ADB_PB2:
                pmu_kind = PMU_68K_V2;
                break;
@@ -785,7 +782,6 @@ pmu_enable_backlight(int on)
            /* first call: get current backlight value */
            if (backlight_level < 0) {
                switch(pmu_kind) {
-                   case PMU_68K_V1:
                    case PMU_68K_V2:
                        pmu_request(&req, NULL, 3, PMU_READ_NVRAM, 0x14, 0xe);
                        while (!req.complete)

diff --git a/include/uapi/linux/pmu.h b/include/uapi/linux/pmu.h
index 89cb1acea93a3d54385655d886ee657b31796d8f..e128f609281abbdc4a87b71ddcf18f2c87c1d73d 100644 (file)
--- a/include/uapi/linux/pmu.h
+++ b/include/uapi/linux/pmu.h
@@ -93,7 +93,7 @@ enum {
        PMU_HEATHROW_BASED,     /* PowerBook G3 series */
        PMU_PADDINGTON_BASED,   /* 1999 PowerBook G3 */
        PMU_KEYLARGO_BASED,     /* Core99 motherboard (PMU99) */
-       PMU_68K_V1,             /* 68K PMU, version 1 */
+       PMU_68K_V1,             /* Unused/deprecated */
        PMU_68K_V2,             /* 68K PMU, version 2 */
 };