[PATCH 08/11] macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver

[Geert Uytterhoeven]

Hi Finn,

On Sat, Jun 2, 2018 at 5:27 AM, Finn Thain <fthain at telegraphics.com.au> wrote:
> Now that the PowerMac via-pmu driver supports m68k PowerBooks,
> switch over to that driver and remove the via-pmu68k driver.

Thanks!

> Don't call pmu_shutdown() or pmu_restart() on early PowerBooks:
> the PMU device found in these PowerBooks isn't supported.

Shouldn't that be a separate patch?

> --- a/arch/m68k/mac/misc.c
> +++ b/arch/m68k/mac/misc.c

> @@ -477,9 +445,8 @@ void mac_poweroff(void)
>                    macintosh_config->adb_type == MAC_ADB_CUDA) {
>                 cuda_shutdown();
>  #endif
> -#ifdef CONFIG_ADB_PMU68K
> -       } else if (macintosh_config->adb_type == MAC_ADB_PB1
> -               || macintosh_config->adb_type == MAC_ADB_PB2) {
> +#ifdef CONFIG_ADB_PMU
> +       } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
>                 pmu_shutdown();
>  #endif
>         }
> @@ -519,9 +486,8 @@ void mac_reset(void)
>                    macintosh_config->adb_type == MAC_ADB_CUDA) {
>                 cuda_restart();
>  #endif
> -#ifdef CONFIG_ADB_PMU68K
> -       } else if (macintosh_config->adb_type == MAC_ADB_PB1
> -               || macintosh_config->adb_type == MAC_ADB_PB2) {
> +#ifdef CONFIG_ADB_PMU
> +       } else if (macintosh_config->adb_type == MAC_ADB_PB2) {
>                 pmu_restart();
>  #endif
>         } else if (CPU_IS_030) {

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds