2024-03-13 13:56:59

by Andy Shevchenko

Subject: [PATCH v1 1/1] powerpc/52xx: Replace of_gpio.h by proper one

of_gpio.h is deprecated and subject to remove.
The driver doesn't use it directly, replace it
with what is really being used.

Signed-off-by: Andy Shevchenko <[email protected]>
---
arch/powerpc/platforms/52xx/mpc52xx_common.c | 2 --
arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index b4938e344f71..253421ffb4e5 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -12,12 +12,10 @@

#undef DEBUG

-#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
-#include <linux/of_gpio.h>
#include <linux/export.h>
#include <asm/io.h>
#include <asm/mpc52xx.h>
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 581059527c36..2bd6abcdc113 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -48,6 +48,7 @@
* the output mode. This driver does not change the output mode setting.
*/

+#include <linux/gpio/driver.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@@ -56,7 +57,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/property.h>
--
2.43.0.rc1.1.gbec44491f096

2024-04-03 10:48:17

by Andy Shevchenko

Subject: Re: [PATCH v1 1/1] powerpc/52xx: Replace of_gpio.h by proper one

On Wed, Mar 13, 2024 at 03:56:45PM +0200, Andy Shevchenko wrote:
> of_gpio.h is deprecated and subject to remove.
> The driver doesn't use it directly, replace it
> with what is really being used.

Any comments on this?

--
With Best Regards,
Andy Shevchenko

2024-04-04 23:59:10

by Michael Ellerman

Subject: Re: [PATCH v1 1/1] powerpc/52xx: Replace of_gpio.h by proper one

Andy Shevchenko <[email protected]> writes:
> On Wed, Mar 13, 2024 at 03:56:45PM +0200, Andy Shevchenko wrote:
>> of_gpio.h is deprecated and subject to remove.
>> The driver doesn't use it directly, replace it
>> with what is really being used.
>
> Any comments on this?

No comment :)

I'll take it for 6.10, or do you want me to sneak it in as a fix for 6.9?

cheers

2024-04-05 15:06:35

by Andy Shevchenko

Subject: Re: [PATCH v1 1/1] powerpc/52xx: Replace of_gpio.h by proper one

On Fri, Apr 05, 2024 at 10:58:55AM +1100, Michael Ellerman wrote:
> Andy Shevchenko <[email protected]> writes:
> > On Wed, Mar 13, 2024 at 03:56:45PM +0200, Andy Shevchenko wrote:
> >> of_gpio.h is deprecated and subject to remove.
> >> The driver doesn't use it directly, replace it
> >> with what is really being used.
> >
> > Any comments on this?
>
> No comment :)
>
> I'll take it for 6.10, or do you want me to sneak it in as a fix for 6.9?

Up to you and thank you!

--
With Best Regards,
Andy Shevchenko

2024-04-22 08:19:41

by Michael Ellerman

Subject: Re: [PATCH v1 1/1] powerpc/52xx: Replace of_gpio.h by proper one

On Wed, 13 Mar 2024 15:56:45 +0200, Andy Shevchenko wrote:
> of_gpio.h is deprecated and subject to remove.
> The driver doesn't use it directly, replace it
> with what is really being used.
>
>

Applied to powerpc/next.

[1/1] powerpc/52xx: Replace of_gpio.h by proper one
https://git.kernel.org/powerpc/c/676abf7c39267080ab81597c6d4f372a10c0fc21

cheers