| Message ID | 20190620064753.32391-4-anup.patel@wdc.com |
|---|---|
| State | Superseded |
| Delegated to: | Andes |
| Headers | show |
| Series | Update SiFive Unleashed Drivers | expand |
On Thu, Jun 20, 2019 at 2:49 PM Anup Patel <Anup.Patel@wdc.com> wrote: > > The location and license header of DT bindings header for SiFive > clock driver has changed in upstream Linux hence this patch. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > drivers/clk/sifive/fu540-prci.c | 2 +- > include/dt-bindings/clk/sifive-fu540-prci.h | 29 ------------------- > include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++++++++++++ Shouldn't this be a "git mv"? > 3 files changed, 19 insertions(+), 30 deletions(-) > delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h > create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h > > diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c > index cdbf35e871..ceb318e062 100644 > --- a/drivers/clk/sifive/fu540-prci.c > +++ b/drivers/clk/sifive/fu540-prci.c > @@ -38,7 +38,7 @@ > > #include <linux/math64.h> > #include <linux/clk/analogbits-wrpll-cln28hpc.h> > -#include <dt-bindings/clk/sifive-fu540-prci.h> What about the existing U-Boot's <dt-bindings/clk/..> directory? With this commit, we introduced 2 clock device tree binding directories. > +#include <dt-bindings/clock/sifive-fu540-prci.h> > > /* > * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects: > diff --git a/include/dt-bindings/clk/sifive-fu540-prci.h b/include/dt-bindings/clk/sifive-fu540-prci.h > deleted file mode 100644 > index 531523ea62..0000000000 > --- a/include/dt-bindings/clk/sifive-fu540-prci.h > +++ /dev/null > @@ -1,29 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * Copyright (c) 2019 Western Digital Corporation or its affiliates. > - * > - * Copyright (C) 2018 SiFive, Inc. > - * Wesley Terpstra > - * Paul Walmsley > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - */ > - > -#ifndef __LINUX_CLK_SIFIVE_FU540_PRCI_H > -#define __LINUX_CLK_SIFIVE_FU540_PRCI_H > - > -/* Clock indexes for use by Device Tree data */ > - > -#define PRCI_CLK_COREPLL 0 > -#define PRCI_CLK_DDRPLL 1 > -#define PRCI_CLK_GEMGXLPLL 2 > -#define PRCI_CLK_TLCLK 3 > - > -#endif [snip] Regards, Bin
On Fri, Jun 21, 2019 at 12:46 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Thu, Jun 20, 2019 at 2:49 PM Anup Patel <Anup.Patel@wdc.com> wrote: > > > > The location and license header of DT bindings header for SiFive > > clock driver has changed in upstream Linux hence this patch. > > > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > > --- > > drivers/clk/sifive/fu540-prci.c | 2 +- > > include/dt-bindings/clk/sifive-fu540-prci.h | 29 ------------------- > > include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++++++++++++ > > Shouldn't this be a "git mv"? There are changes in comment block and #ifndef so GIT did not consider this as renaming. > > > 3 files changed, 19 insertions(+), 30 deletions(-) > > delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h > > create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h > > > > diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c > > index cdbf35e871..ceb318e062 100644 > > --- a/drivers/clk/sifive/fu540-prci.c > > +++ b/drivers/clk/sifive/fu540-prci.c > > @@ -38,7 +38,7 @@ > > > > #include <linux/math64.h> > > #include <linux/clk/analogbits-wrpll-cln28hpc.h> > > -#include <dt-bindings/clk/sifive-fu540-prci.h> > > What about the existing U-Boot's <dt-bindings/clk/..> directory? With > this commit, we introduced 2 clock device tree binding directories. Sure, I will remove the directory as well. Thanks for catching. > > > +#include <dt-bindings/clock/sifive-fu540-prci.h> > > > > /* > > * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects: > > diff --git a/include/dt-bindings/clk/sifive-fu540-prci.h b/include/dt-bindings/clk/sifive-fu540-prci.h > > deleted file mode 100644 > > index 531523ea62..0000000000 > > --- a/include/dt-bindings/clk/sifive-fu540-prci.h > > +++ /dev/null > > @@ -1,29 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0 */ > > -/* > > - * Copyright (c) 2019 Western Digital Corporation or its affiliates. > > - * > > - * Copyright (C) 2018 SiFive, Inc. > > - * Wesley Terpstra > > - * Paul Walmsley > > - * > > - * This program is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License version 2 as > > - * published by the Free Software Foundation. > > - * > > - * This program is distributed in the hope that it will be useful, > > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > - * GNU General Public License for more details. > > - */ > > - > > -#ifndef __LINUX_CLK_SIFIVE_FU540_PRCI_H > > -#define __LINUX_CLK_SIFIVE_FU540_PRCI_H > > - > > -/* Clock indexes for use by Device Tree data */ > > - > > -#define PRCI_CLK_COREPLL 0 > > -#define PRCI_CLK_DDRPLL 1 > > -#define PRCI_CLK_GEMGXLPLL 2 > > -#define PRCI_CLK_TLCLK 3 > > - > > -#endif > Regards, Anup
On Fri, Jun 21, 2019 at 4:54 PM Anup Patel <anup@brainfault.org> wrote: > > On Fri, Jun 21, 2019 at 12:46 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > On Thu, Jun 20, 2019 at 2:49 PM Anup Patel <Anup.Patel@wdc.com> wrote: > > > > > > The location and license header of DT bindings header for SiFive > > > clock driver has changed in upstream Linux hence this patch. > > > > > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > > > --- > > > drivers/clk/sifive/fu540-prci.c | 2 +- > > > include/dt-bindings/clk/sifive-fu540-prci.h | 29 ------------------- > > > include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++++++++++++ > > > > Shouldn't this be a "git mv"? > > There are changes in comment block and #ifndef so GIT did > not consider this as renaming. > > > > > > 3 files changed, 19 insertions(+), 30 deletions(-) > > > delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h > > > create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h > > > > > > diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c > > > index cdbf35e871..ceb318e062 100644 > > > --- a/drivers/clk/sifive/fu540-prci.c > > > +++ b/drivers/clk/sifive/fu540-prci.c > > > @@ -38,7 +38,7 @@ > > > > > > #include <linux/math64.h> > > > #include <linux/clk/analogbits-wrpll-cln28hpc.h> > > > -#include <dt-bindings/clk/sifive-fu540-prci.h> > > > > What about the existing U-Boot's <dt-bindings/clk/..> directory? With > > this commit, we introduced 2 clock device tree binding directories. > > Sure, I will remove the directory as well. Thanks for catching. I just realized that dt-bindings/clk directory is not empty so I cross-checked with Linux sources. Over there we have both dt-bindings/clk and dt-bindings/clock directories. For now, I will keep the dt-bindings/clk directory to be in-sync with Linux sources. > > > > > > +#include <dt-bindings/clock/sifive-fu540-prci.h> > > > > > > /* > > > * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects: > > > diff --git a/include/dt-bindings/clk/sifive-fu540-prci.h b/include/dt-bindings/clk/sifive-fu540-prci.h > > > deleted file mode 100644 > > > index 531523ea62..0000000000 > > > --- a/include/dt-bindings/clk/sifive-fu540-prci.h > > > +++ /dev/null > > > @@ -1,29 +0,0 @@ > > > -/* SPDX-License-Identifier: GPL-2.0 */ > > > -/* > > > - * Copyright (c) 2019 Western Digital Corporation or its affiliates. > > > - * > > > - * Copyright (C) 2018 SiFive, Inc. > > > - * Wesley Terpstra > > > - * Paul Walmsley > > > - * > > > - * This program is free software; you can redistribute it and/or modify > > > - * it under the terms of the GNU General Public License version 2 as > > > - * published by the Free Software Foundation. > > > - * > > > - * This program is distributed in the hope that it will be useful, > > > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > > > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > > - * GNU General Public License for more details. > > > - */ > > > - > > > -#ifndef __LINUX_CLK_SIFIVE_FU540_PRCI_H > > > -#define __LINUX_CLK_SIFIVE_FU540_PRCI_H > > > - > > > -/* Clock indexes for use by Device Tree data */ > > > - > > > -#define PRCI_CLK_COREPLL 0 > > > -#define PRCI_CLK_DDRPLL 1 > > > -#define PRCI_CLK_GEMGXLPLL 2 > > > -#define PRCI_CLK_TLCLK 3 > > > - > > > -#endif > > > > Regards, > Anup Regards, Anup
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c index cdbf35e871..ceb318e062 100644 --- a/drivers/clk/sifive/fu540-prci.c +++ b/drivers/clk/sifive/fu540-prci.c @@ -38,7 +38,7 @@ #include <linux/math64.h> #include <linux/clk/analogbits-wrpll-cln28hpc.h> -#include <dt-bindings/clk/sifive-fu540-prci.h> +#include <dt-bindings/clock/sifive-fu540-prci.h> /* * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects: diff --git a/include/dt-bindings/clk/sifive-fu540-prci.h b/include/dt-bindings/clk/sifive-fu540-prci.h deleted file mode 100644 index 531523ea62..0000000000 --- a/include/dt-bindings/clk/sifive-fu540-prci.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2019 Western Digital Corporation or its affiliates. - * - * Copyright (C) 2018 SiFive, Inc. - * Wesley Terpstra - * Paul Walmsley - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __LINUX_CLK_SIFIVE_FU540_PRCI_H -#define __LINUX_CLK_SIFIVE_FU540_PRCI_H - -/* Clock indexes for use by Device Tree data */ - -#define PRCI_CLK_COREPLL 0 -#define PRCI_CLK_DDRPLL 1 -#define PRCI_CLK_GEMGXLPLL 2 -#define PRCI_CLK_TLCLK 3 - -#endif diff --git a/include/dt-bindings/clock/sifive-fu540-prci.h b/include/dt-bindings/clock/sifive-fu540-prci.h new file mode 100644 index 0000000000..6a0b70a37d --- /dev/null +++ b/include/dt-bindings/clock/sifive-fu540-prci.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2018-2019 SiFive, Inc. + * Wesley Terpstra + * Paul Walmsley + */ + +#ifndef __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H +#define __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H + +/* Clock indexes for use by Device Tree data and the PRCI driver */ + +#define PRCI_CLK_COREPLL 0 +#define PRCI_CLK_DDRPLL 1 +#define PRCI_CLK_GEMGXLPLL 2 +#define PRCI_CLK_TLCLK 3 + +#endif
The location and license header of DT bindings header for SiFive clock driver has changed in upstream Linux hence this patch. Signed-off-by: Anup Patel <anup.patel@wdc.com> --- drivers/clk/sifive/fu540-prci.c | 2 +- include/dt-bindings/clk/sifive-fu540-prci.h | 29 ------------------- include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++++++++++++ 3 files changed, 19 insertions(+), 30 deletions(-) delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h