All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Finn Thain <fthain@telegraphics.com.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Michael Schmitz <schmitzmic@gmail.com>,
	linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
	linux-m68k <linux-m68k@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 08/11] macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver
Date: Mon, 4 Jun 2018 13:55:26 +0200	[thread overview]
Message-ID: <CAMuHMdVheowFa8bx0fg-_Dvx+TMZhPbvouTs82Y3tq1gtSpRMQ@mail.gmail.com> (raw)
In-Reply-To: <de8edb03dbd2fd25b53d0bdf9c6d65adf9aa0aa3.1527909627.git.fthain@telegraphics.com.au>

Hi Finn,

On Sat, Jun 2, 2018 at 5:27 AM, Finn Thain <fthain@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@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

WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Finn Thain <fthain@telegraphics.com.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Michael Schmitz <schmitzmic@gmail.com>,
	linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
	linux-m68k <linux-m68k@lists.linux-m68k.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 08/11] macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver
Date: Mon, 4 Jun 2018 13:55:26 +0200	[thread overview]
Message-ID: <CAMuHMdVheowFa8bx0fg-_Dvx+TMZhPbvouTs82Y3tq1gtSpRMQ@mail.gmail.com> (raw)
In-Reply-To: <de8edb03dbd2fd25b53d0bdf9c6d65adf9aa0aa3.1527909627.git.fthain@telegraphics.com.au>

Hi Finn,

On Sat, Jun 2, 2018 at 5:27 AM, Finn Thain <fthain@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@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

  parent reply	other threads:[~2018-06-04 11:55 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-02  3:27 [PATCH 00/11] macintosh: Resolve various PMU driver problems Finn Thain
2018-06-02  3:27 ` Finn Thain
2018-06-02  3:27 ` [PATCH 01/11] macintosh/via-pmu: Fix section mismatch warning Finn Thain
2018-06-02  3:27   ` Finn Thain
2018-06-02  3:27   ` [PATCH 02/11] macintosh/via-pmu: Add missing mmio accessors Finn Thain
2018-06-02  3:27     ` Finn Thain
2018-06-02  3:27     ` [PATCH 03/11] macintosh/via-pmu: Don't clear shift register interrupt flag twice Finn Thain
2018-06-02  3:27       ` Finn Thain
2018-06-02  3:27       ` [PATCH 04/11] macintosh/via-pmu: Enhance state machine with new 'uninitialized' state Finn Thain
2018-06-02  3:27         ` Finn Thain
2018-06-02  3:27         ` [PATCH 05/11] macintosh/via-pmu: Replace via pointer with via1 and via2 pointers Finn Thain
2018-06-02  3:27           ` Finn Thain
2018-06-02  3:27           ` [PATCH 06/11] macintosh/via-pmu: Add support for m68k PowerBooks Finn Thain
2018-06-02  3:27             ` Finn Thain
2018-06-02  3:27             ` [PATCH 07/11] macintosh/via-pmu: Make CONFIG_PPC_PMAC Kconfig deps explicit Finn Thain
2018-06-02  3:27               ` Finn Thain
2018-06-02  3:27               ` [PATCH 08/11] macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver Finn Thain
2018-06-02  3:27                 ` Finn Thain
2018-06-02  3:27                 ` [PATCH 09/11] macintosh: Use common code to access RTC Finn Thain
2018-06-02  3:27                   ` Finn Thain
2018-06-02  3:27                   ` [PATCH 10/11] macintosh/via-pmu: Clean up interrupt statistics Finn Thain
2018-06-02  3:27                     ` Finn Thain
2018-06-02  3:27                     ` [PATCH 11/11] macintosh/via-pmu: Disambiguate " Finn Thain
2018-06-02  3:27                       ` Finn Thain
2018-06-04 12:00                     ` [PATCH 10/11] macintosh/via-pmu: Clean up " Geert Uytterhoeven
2018-06-04 12:00                       ` Geert Uytterhoeven
2018-06-04 11:55                 ` Geert Uytterhoeven [this message]
2018-06-04 11:55                   ` [PATCH 08/11] macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver Geert Uytterhoeven
2018-06-06  6:57                   ` Finn Thain
2018-06-06  7:15                     ` Geert Uytterhoeven
2018-06-07  5:29                       ` Finn Thain
2018-06-04 11:48       ` [PATCH 03/11] macintosh/via-pmu: Don't clear shift register interrupt flag twice Geert Uytterhoeven
2018-06-04 11:48         ` Geert Uytterhoeven
2018-06-04 11:46     ` [PATCH 02/11] macintosh/via-pmu: Add missing mmio accessors Geert Uytterhoeven
2018-06-04 11:46       ` Geert Uytterhoeven
2018-06-04 11:44   ` [PATCH 01/11] macintosh/via-pmu: Fix section mismatch warning Geert Uytterhoeven
2018-06-04 11:44     ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMuHMdVheowFa8bx0fg-_Dvx+TMZhPbvouTs82Y3tq1gtSpRMQ@mail.gmail.com \
    --to=geert@linux-m68k.org \
    --cc=benh@kernel.crashing.org \
    --cc=fthain@telegraphics.com.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=schmitzmic@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.