[U-Boot] [PATCH v5 3/8] clk: sifive: Sync-up DT bindings header with upstream Linux

[Bin Meng]

On Thu, Jun 20, 2019 at 2:49 PM Anup Patel <Anup.Patel at 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 at 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