Commit 54c99077 authored by Finn Thain's avatar Finn Thain Committed by Michael Ellerman

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: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c2f028b6
...@@ -478,8 +478,7 @@ void mac_poweroff(void) ...@@ -478,8 +478,7 @@ void mac_poweroff(void)
cuda_shutdown(); cuda_shutdown();
#endif #endif
#ifdef CONFIG_ADB_PMU68K #ifdef CONFIG_ADB_PMU68K
} else if (macintosh_config->adb_type == MAC_ADB_PB1 } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
|| macintosh_config->adb_type == MAC_ADB_PB2) {
pmu_shutdown(); pmu_shutdown();
#endif #endif
} }
...@@ -520,8 +519,7 @@ void mac_reset(void) ...@@ -520,8 +519,7 @@ void mac_reset(void)
cuda_restart(); cuda_restart();
#endif #endif
#ifdef CONFIG_ADB_PMU68K #ifdef CONFIG_ADB_PMU68K
} else if (macintosh_config->adb_type == MAC_ADB_PB1 } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
|| macintosh_config->adb_type == MAC_ADB_PB2) {
pmu_restart(); pmu_restart();
#endif #endif
} else if (CPU_IS_030) { } else if (CPU_IS_030) {
......
...@@ -175,9 +175,6 @@ static s8 pmu_data_len[256][2] = { ...@@ -175,9 +175,6 @@ static s8 pmu_data_len[256][2] = {
int __init find_via_pmu(void) int __init find_via_pmu(void)
{ {
switch (macintosh_config->adb_type) { switch (macintosh_config->adb_type) {
case MAC_ADB_PB1:
pmu_kind = PMU_68K_V1;
break;
case MAC_ADB_PB2: case MAC_ADB_PB2:
pmu_kind = PMU_68K_V2; pmu_kind = PMU_68K_V2;
break; break;
...@@ -785,7 +782,6 @@ pmu_enable_backlight(int on) ...@@ -785,7 +782,6 @@ pmu_enable_backlight(int on)
/* first call: get current backlight value */ /* first call: get current backlight value */
if (backlight_level < 0) { if (backlight_level < 0) {
switch(pmu_kind) { switch(pmu_kind) {
case PMU_68K_V1:
case PMU_68K_V2: case PMU_68K_V2:
pmu_request(&req, NULL, 3, PMU_READ_NVRAM, 0x14, 0xe); pmu_request(&req, NULL, 3, PMU_READ_NVRAM, 0x14, 0xe);
while (!req.complete) while (!req.complete)
......
...@@ -93,7 +93,7 @@ enum { ...@@ -93,7 +93,7 @@ enum {
PMU_HEATHROW_BASED, /* PowerBook G3 series */ PMU_HEATHROW_BASED, /* PowerBook G3 series */
PMU_PADDINGTON_BASED, /* 1999 PowerBook G3 */ PMU_PADDINGTON_BASED, /* 1999 PowerBook G3 */
PMU_KEYLARGO_BASED, /* Core99 motherboard (PMU99) */ 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 */ PMU_68K_V2, /* 68K PMU, version 2 */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment