diff mbox series

[U-Boot,v9,5/9] clk: sifive: Drop GEMGXL clock driver

Message ID 20190625063030.6200-6-anup.patel@wdc.com
State Accepted
Commit 8633edeb2a1de97f03cededf3c7fc8956bcec61e
Delegated to: Joe Hershberger
Headers show
Series Update SiFive Unleashed Drivers | expand

Commit Message

Anup Patel June 25, 2019, 6:31 a.m. UTC 
The GEMGXL clock driver is now directly part of Cadence MACB
ethernet driver in upstream Linux kernel. There is no separate
GEMGXL clock driver in upstream Linux kernel hence we drop
GEMGXL clock driver from U-Boot as well.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
 board/sifive/fu540/Kconfig       |  1 -
 drivers/clk/sifive/Kconfig       |  7 ----
 drivers/clk/sifive/Makefile      |  2 --
 drivers/clk/sifive/gemgxl-mgmt.c | 60 --------------------------------
 4 files changed, 70 deletions(-)
 delete mode 100644 drivers/clk/sifive/gemgxl-mgmt.c

Comments

Rick Chen July 19, 2019, 5:52 a.m. UTC | #1 
> > From: Anup Patel [mailto:Anup.Patel@wdc.com]
> > Sent: Tuesday, June 25, 2019 2:32 PM
> > To: Rick Jian-Zhi Chen(陳建志); Bin Meng; Lukas Auer; Simon Glass
> > Cc: Ramon Fried; Joe Hershberger; Palmer Dabbelt; Paul Walmsley; Troy
> > Benjegerdes; Atish Patra; Alistair Francis; U-Boot Mailing List; Anup Patel
> > Subject: [PATCH v9 5/9] clk: sifive: Drop GEMGXL clock driver
> >
> > The GEMGXL clock driver is now directly part of Cadence MACB ethernet driver
> > in upstream Linux kernel. There is no separate GEMGXL clock driver in upstream
> > Linux kernel hence we drop GEMGXL clock driver from U-Boot as well.
> >
> > Signed-off-by: Anup Patel <anup.patel@wdc.com>
> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> > ---
> >  board/sifive/fu540/Kconfig       |  1 -
> >  drivers/clk/sifive/Kconfig       |  7 ----
> >  drivers/clk/sifive/Makefile      |  2 --
> >  drivers/clk/sifive/gemgxl-mgmt.c | 60 --------------------------------
> >  4 files changed, 70 deletions(-)
> >  delete mode 100644 drivers/clk/sifive/gemgxl-mgmt.c
> >
> > diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig index
> > 8eb5e304ab..f46437901d 100644
> > --- a/board/sifive/fu540/Kconfig
> > +++ b/board/sifive/fu540/Kconfig
> > @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
> >       imply CMD_PING
> >       imply CLK_SIFIVE
> >       imply CLK_SIFIVE_FU540_PRCI
> > -     imply CLK_SIFIVE_GEMGXL_MGMT
> >       imply DOS_PARTITION
> >       imply EFI_PARTITION
> >       imply IP_DYN
> > diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig index
> > d90be1943f..c4d0a1f9b1 100644
> > --- a/drivers/clk/sifive/Kconfig
> > +++ b/drivers/clk/sifive/Kconfig
> > @@ -14,10 +14,3 @@ config CLK_SIFIVE_FU540_PRCI
> >         Supports the Power Reset Clock interface (PRCI) IP block found in
> >         FU540 SoCs.  If this kernel is meant to run on a SiFive FU540 SoC,
> >         enable this driver.
> > -
> > -config CLK_SIFIVE_GEMGXL_MGMT
> > -     bool "GEMGXL management for SiFive FU540 SoCs"
> > -     depends on CLK_SIFIVE
> > -     help
> > -       Supports the GEMGXL management IP block found in FU540 SoCs to
> > -       control GEM TX clock operation mode for 10/100/1000 Mbps.
> > diff --git a/drivers/clk/sifive/Makefile b/drivers/clk/sifive/Makefile index
> > 0813360ca7..b224279afb 100644
> > --- a/drivers/clk/sifive/Makefile
> > +++ b/drivers/clk/sifive/Makefile
> > @@ -1,5 +1,3 @@
> >  # SPDX-License-Identifier: GPL-2.0+
> >
> >  obj-$(CONFIG_CLK_SIFIVE_FU540_PRCI)          += fu540-prci.o
> > -
> > -obj-$(CONFIG_CLK_SIFIVE_GEMGXL_MGMT)         += gemgxl-mgmt.o
> > diff --git a/drivers/clk/sifive/gemgxl-mgmt.c b/drivers/clk/sifive/gemgxl-mgmt.c
> > deleted file mode 100644
> > index eb37416b5e..0000000000
> > --- a/drivers/clk/sifive/gemgxl-mgmt.c
> > +++ /dev/null
> > @@ -1,60 +0,0 @@
> > -// SPDX-License-Identifier: GPL-2.0+
> > -/*
> > - * Copyright (C) 2019, Bin Meng <bmeng.cn@gmail.com>
> > - */
> > -
> > -#include <common.h>
> > -#include <clk-uclass.h>
> > -#include <dm.h>
> > -#include <asm/io.h>
> > -
> > -struct gemgxl_mgmt_regs {
> > -     __u32 tx_clk_sel;
> > -};
> > -
> > -struct gemgxl_mgmt_platdata {
> > -     struct gemgxl_mgmt_regs *regs;
> > -};
> > -
> > -static int gemgxl_mgmt_ofdata_to_platdata(struct udevice *dev) -{
> > -     struct gemgxl_mgmt_platdata *plat = dev_get_platdata(dev);
> > -
> > -     plat->regs = (struct gemgxl_mgmt_regs *)dev_read_addr(dev);
> > -
> > -     return 0;
> > -}
> > -
> > -static ulong gemgxl_mgmt_set_rate(struct clk *clk, ulong rate) -{
> > -     struct gemgxl_mgmt_platdata *plat = dev_get_platdata(clk->dev);
> > -
> > -     /*
> > -      * GEMGXL TX clock operation mode:
> > -      *
> > -      * 0 = GMII mode. Use 125 MHz gemgxlclk from PRCI in TX logic
> > -      *     and output clock on GMII output signal GTX_CLK
> > -      * 1 = MII mode. Use MII input signal TX_CLK in TX logic
> > -      */
> > -     writel(rate != 125000000, &plat->regs->tx_clk_sel);
> > -
> > -     return 0;
> > -}
> > -
> > -const struct clk_ops gemgxl_mgmt_ops = {
> > -     .set_rate = gemgxl_mgmt_set_rate,
> > -};
> > -
> > -static const struct udevice_id gemgxl_mgmt_match[] = {
> > -     { .compatible = "sifive,cadencegemgxlmgmt0", },
> > -     { /* sentinel */ }
> > -};
> > -
> > -U_BOOT_DRIVER(sifive_gemgxl_mgmt) = {
> > -     .name = "sifive-gemgxl-mgmt",
> > -     .id = UCLASS_CLK,
> > -     .of_match = gemgxl_mgmt_match,
> > -     .ofdata_to_platdata = gemgxl_mgmt_ofdata_to_platdata,
> > -     .platdata_auto_alloc_size = sizeof(struct gemgxl_mgmt_platdata),
> > -     .ops = &gemgxl_mgmt_ops,
> > -};

Applied to u-boot-riscv/master, thanks!

Rick
diff mbox series

Patch

diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig
index 8eb5e304ab..f46437901d 100644
--- a/board/sifive/fu540/Kconfig
+++ b/board/sifive/fu540/Kconfig
@@ -28,7 +28,6 @@  config BOARD_SPECIFIC_OPTIONS # dummy
 	imply CMD_PING
 	imply CLK_SIFIVE
 	imply CLK_SIFIVE_FU540_PRCI
-	imply CLK_SIFIVE_GEMGXL_MGMT
 	imply DOS_PARTITION
 	imply EFI_PARTITION
 	imply IP_DYN
diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig
index d90be1943f..c4d0a1f9b1 100644
--- a/drivers/clk/sifive/Kconfig
+++ b/drivers/clk/sifive/Kconfig
@@ -14,10 +14,3 @@  config CLK_SIFIVE_FU540_PRCI
 	  Supports the Power Reset Clock interface (PRCI) IP block found in
 	  FU540 SoCs.  If this kernel is meant to run on a SiFive FU540 SoC,
 	  enable this driver.
-
-config CLK_SIFIVE_GEMGXL_MGMT
-	bool "GEMGXL management for SiFive FU540 SoCs"
-	depends on CLK_SIFIVE
-	help
-	  Supports the GEMGXL management IP block found in FU540 SoCs to
-	  control GEM TX clock operation mode for 10/100/1000 Mbps.
diff --git a/drivers/clk/sifive/Makefile b/drivers/clk/sifive/Makefile
index 0813360ca7..b224279afb 100644
--- a/drivers/clk/sifive/Makefile
+++ b/drivers/clk/sifive/Makefile
@@ -1,5 +1,3 @@ 
 # SPDX-License-Identifier: GPL-2.0+
 
 obj-$(CONFIG_CLK_SIFIVE_FU540_PRCI)		+= fu540-prci.o
-
-obj-$(CONFIG_CLK_SIFIVE_GEMGXL_MGMT)		+= gemgxl-mgmt.o
diff --git a/drivers/clk/sifive/gemgxl-mgmt.c b/drivers/clk/sifive/gemgxl-mgmt.c
deleted file mode 100644
index eb37416b5e..0000000000
--- a/drivers/clk/sifive/gemgxl-mgmt.c
+++ /dev/null
@@ -1,60 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2019, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#include <common.h>
-#include <clk-uclass.h>
-#include <dm.h>
-#include <asm/io.h>
-
-struct gemgxl_mgmt_regs {
-	__u32 tx_clk_sel;
-};
-
-struct gemgxl_mgmt_platdata {
-	struct gemgxl_mgmt_regs *regs;
-};
-
-static int gemgxl_mgmt_ofdata_to_platdata(struct udevice *dev)
-{
-	struct gemgxl_mgmt_platdata *plat = dev_get_platdata(dev);
-
-	plat->regs = (struct gemgxl_mgmt_regs *)dev_read_addr(dev);
-
-	return 0;
-}
-
-static ulong gemgxl_mgmt_set_rate(struct clk *clk, ulong rate)
-{
-	struct gemgxl_mgmt_platdata *plat = dev_get_platdata(clk->dev);
-
-	/*
-	 * GEMGXL TX clock operation mode:
-	 *
-	 * 0 = GMII mode. Use 125 MHz gemgxlclk from PRCI in TX logic
-	 *     and output clock on GMII output signal GTX_CLK
-	 * 1 = MII mode. Use MII input signal TX_CLK in TX logic
-	 */
-	writel(rate != 125000000, &plat->regs->tx_clk_sel);
-
-	return 0;
-}
-
-const struct clk_ops gemgxl_mgmt_ops = {
-	.set_rate = gemgxl_mgmt_set_rate,
-};
-
-static const struct udevice_id gemgxl_mgmt_match[] = {
-	{ .compatible = "sifive,cadencegemgxlmgmt0", },
-	{ /* sentinel */ }
-};
-
-U_BOOT_DRIVER(sifive_gemgxl_mgmt) = {
-	.name = "sifive-gemgxl-mgmt",
-	.id = UCLASS_CLK,
-	.of_match = gemgxl_mgmt_match,
-	.ofdata_to_platdata = gemgxl_mgmt_ofdata_to_platdata,
-	.platdata_auto_alloc_size = sizeof(struct gemgxl_mgmt_platdata),
-	.ops = &gemgxl_mgmt_ops,
-};