diff mbox series

MIPS: loongson32: Drop obsolete cpufreq platform device

Message ID 20230210110934.1379482-1-keguang.zhang@gmail.com (mailing list archive)
State Accepted
Commit e947925f10c250ba3ad2d905006b2e632510310c
Headers show
Series MIPS: loongson32: Drop obsolete cpufreq platform device | expand

Commit Message

Keguang Zhang Feb. 10, 2023, 11:09 a.m. UTC 
The obsolete cpufreq driver was removed, drop the platform device
and data accordingly.

Link: https://lore.kernel.org/all/20230112135342.3927338-1-keguang.zhang@gmail.com
Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
---
 .../mips/include/asm/mach-loongson32/cpufreq.h | 18 ------------------
 .../include/asm/mach-loongson32/platform.h     |  1 -
 arch/mips/loongson32/common/platform.c         | 16 ----------------
 arch/mips/loongson32/ls1b/board.c              |  1 -
 4 files changed, 36 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-loongson32/cpufreq.h


base-commit: 159c610af8cdf2b3c915e59162fc867b557cbe7e
prerequisite-patch-id: a73e24e76a88f519d85fdeb7230e93d53c61434a

Comments

Rafael J. Wysocki Feb. 13, 2023, 4:13 p.m. UTC | #1 
On Fri, Feb 10, 2023 at 12:10 PM Keguang Zhang <keguang.zhang@gmail.com> wrote:
>
> The obsolete cpufreq driver was removed, drop the platform device
> and data accordingly.

I'm going to pick up this one as 6.3 material unless there are any
objections, in which case please let me know.

Thanks!

> Link: https://lore.kernel.org/all/20230112135342.3927338-1-keguang.zhang@gmail.com
> Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> ---
>  .../mips/include/asm/mach-loongson32/cpufreq.h | 18 ------------------
>  .../include/asm/mach-loongson32/platform.h     |  1 -
>  arch/mips/loongson32/common/platform.c         | 16 ----------------
>  arch/mips/loongson32/ls1b/board.c              |  1 -
>  4 files changed, 36 deletions(-)
>  delete mode 100644 arch/mips/include/asm/mach-loongson32/cpufreq.h
>
> diff --git a/arch/mips/include/asm/mach-loongson32/cpufreq.h b/arch/mips/include/asm/mach-loongson32/cpufreq.h
> deleted file mode 100644
> index e422a32883ae..000000000000
> --- a/arch/mips/include/asm/mach-loongson32/cpufreq.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (c) 2014 Zhang, Keguang <keguang.zhang@gmail.com>
> - *
> - * Loongson 1 CPUFreq platform support.
> - */
> -
> -#ifndef __ASM_MACH_LOONGSON32_CPUFREQ_H
> -#define __ASM_MACH_LOONGSON32_CPUFREQ_H
> -
> -struct plat_ls1x_cpufreq {
> -       const char      *clk_name;      /* CPU clk */
> -       const char      *osc_clk_name;  /* OSC clk */
> -       unsigned int    max_freq;       /* in kHz */
> -       unsigned int    min_freq;       /* in kHz */
> -};
> -
> -#endif /* __ASM_MACH_LOONGSON32_CPUFREQ_H */
> diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
> index e3fe93ba1bdb..2cdcfb5f6012 100644
> --- a/arch/mips/include/asm/mach-loongson32/platform.h
> +++ b/arch/mips/include/asm/mach-loongson32/platform.h
> @@ -12,7 +12,6 @@
>  #include <nand.h>
>
>  extern struct platform_device ls1x_uart_pdev;
> -extern struct platform_device ls1x_cpufreq_pdev;
>  extern struct platform_device ls1x_eth0_pdev;
>  extern struct platform_device ls1x_eth1_pdev;
>  extern struct platform_device ls1x_ehci_pdev;
> diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c
> index 311dc1580bbd..64d7979394e6 100644
> --- a/arch/mips/loongson32/common/platform.c
> +++ b/arch/mips/loongson32/common/platform.c
> @@ -15,7 +15,6 @@
>
>  #include <platform.h>
>  #include <loongson1.h>
> -#include <cpufreq.h>
>  #include <dma.h>
>  #include <nand.h>
>
> @@ -62,21 +61,6 @@ void __init ls1x_serial_set_uartclk(struct platform_device *pdev)
>                 p->uartclk = clk_get_rate(clk);
>  }
>
> -/* CPUFreq */
> -static struct plat_ls1x_cpufreq ls1x_cpufreq_pdata = {
> -       .clk_name       = "cpu_clk",
> -       .osc_clk_name   = "osc_clk",
> -       .max_freq       = 266 * 1000,
> -       .min_freq       = 33 * 1000,
> -};
> -
> -struct platform_device ls1x_cpufreq_pdev = {
> -       .name           = "ls1x-cpufreq",
> -       .dev            = {
> -               .platform_data = &ls1x_cpufreq_pdata,
> -       },
> -};
> -
>  /* Synopsys Ethernet GMAC */
>  static struct stmmac_mdio_bus_data ls1x_mdio_bus_data = {
>         .phy_mask       = 0,
> diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c
> index 727e06718dab..fed8d432ef20 100644
> --- a/arch/mips/loongson32/ls1b/board.c
> +++ b/arch/mips/loongson32/ls1b/board.c
> @@ -35,7 +35,6 @@ static const struct gpio_led_platform_data ls1x_led_pdata __initconst = {
>
>  static struct platform_device *ls1b_platform_devices[] __initdata = {
>         &ls1x_uart_pdev,
> -       &ls1x_cpufreq_pdev,
>         &ls1x_eth0_pdev,
>         &ls1x_eth1_pdev,
>         &ls1x_ehci_pdev,
>
> base-commit: 159c610af8cdf2b3c915e59162fc867b557cbe7e
> prerequisite-patch-id: a73e24e76a88f519d85fdeb7230e93d53c61434a
> --
> 2.34.1
>
diff mbox series

Patch

diff --git a/arch/mips/include/asm/mach-loongson32/cpufreq.h b/arch/mips/include/asm/mach-loongson32/cpufreq.h
deleted file mode 100644
index e422a32883ae..000000000000
--- a/arch/mips/include/asm/mach-loongson32/cpufreq.h
+++ /dev/null
@@ -1,18 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (c) 2014 Zhang, Keguang <keguang.zhang@gmail.com>
- *
- * Loongson 1 CPUFreq platform support.
- */
-
-#ifndef __ASM_MACH_LOONGSON32_CPUFREQ_H
-#define __ASM_MACH_LOONGSON32_CPUFREQ_H
-
-struct plat_ls1x_cpufreq {
-	const char	*clk_name;	/* CPU clk */
-	const char	*osc_clk_name;	/* OSC clk */
-	unsigned int	max_freq;	/* in kHz */
-	unsigned int	min_freq;	/* in kHz */
-};
-
-#endif /* __ASM_MACH_LOONGSON32_CPUFREQ_H */
diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
index e3fe93ba1bdb..2cdcfb5f6012 100644
--- a/arch/mips/include/asm/mach-loongson32/platform.h
+++ b/arch/mips/include/asm/mach-loongson32/platform.h
@@ -12,7 +12,6 @@ 
 #include <nand.h>
 
 extern struct platform_device ls1x_uart_pdev;
-extern struct platform_device ls1x_cpufreq_pdev;
 extern struct platform_device ls1x_eth0_pdev;
 extern struct platform_device ls1x_eth1_pdev;
 extern struct platform_device ls1x_ehci_pdev;
diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c
index 311dc1580bbd..64d7979394e6 100644
--- a/arch/mips/loongson32/common/platform.c
+++ b/arch/mips/loongson32/common/platform.c
@@ -15,7 +15,6 @@ 
 
 #include <platform.h>
 #include <loongson1.h>
-#include <cpufreq.h>
 #include <dma.h>
 #include <nand.h>
 
@@ -62,21 +61,6 @@  void __init ls1x_serial_set_uartclk(struct platform_device *pdev)
 		p->uartclk = clk_get_rate(clk);
 }
 
-/* CPUFreq */
-static struct plat_ls1x_cpufreq ls1x_cpufreq_pdata = {
-	.clk_name	= "cpu_clk",
-	.osc_clk_name	= "osc_clk",
-	.max_freq	= 266 * 1000,
-	.min_freq	= 33 * 1000,
-};
-
-struct platform_device ls1x_cpufreq_pdev = {
-	.name		= "ls1x-cpufreq",
-	.dev		= {
-		.platform_data = &ls1x_cpufreq_pdata,
-	},
-};
-
 /* Synopsys Ethernet GMAC */
 static struct stmmac_mdio_bus_data ls1x_mdio_bus_data = {
 	.phy_mask	= 0,
diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c
index 727e06718dab..fed8d432ef20 100644
--- a/arch/mips/loongson32/ls1b/board.c
+++ b/arch/mips/loongson32/ls1b/board.c
@@ -35,7 +35,6 @@  static const struct gpio_led_platform_data ls1x_led_pdata __initconst = {
 
 static struct platform_device *ls1b_platform_devices[] __initdata = {
 	&ls1x_uart_pdev,
-	&ls1x_cpufreq_pdev,
 	&ls1x_eth0_pdev,
 	&ls1x_eth1_pdev,
 	&ls1x_ehci_pdev,