Re: [PATCH 01/12] dt-bindings: sunxi: Update clock/reset binding headers

[Andre Przywara <andre.przywara@arm.com>]

On Wed, 27 Apr 2022 15:31:20 -0500
Samuel Holland <samuel@sholland.org> wrote:

> Some devicetree updates make use of newly-exposed clocks and resets.
> To support that, copy the binding headers from the Linux v5.18-rc1 tag.
> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Confirmed to be identical to the files in the Linux tree.
Also it only adds definitions, so is harmless to U-Boot.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

> ---
> 
>  include/dt-bindings/clock/sun50i-a64-ccu.h    |  2 +-
>  include/dt-bindings/clock/sun5i-ccu.h         | 13 ++-----------
>  include/dt-bindings/clock/sun6i-a31-ccu.h     |  2 ++
>  include/dt-bindings/clock/sun8i-a23-a33-ccu.h |  2 ++
>  include/dt-bindings/clock/sun8i-h3-ccu.h      |  2 +-
>  include/dt-bindings/clock/sun8i-v3s-ccu.h     |  4 ++++
>  include/dt-bindings/reset/sun5i-ccu.h         | 11 +----------
>  include/dt-bindings/reset/sun8i-v3s-ccu.h     |  3 +++
>  8 files changed, 16 insertions(+), 23 deletions(-)
> 
> diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h
> index 318eb15c41..175892189e 100644
> --- a/include/dt-bindings/clock/sun50i-a64-ccu.h
> +++ b/include/dt-bindings/clock/sun50i-a64-ccu.h
> @@ -113,7 +113,7 @@
>  #define CLK_USB_OHCI0		91
>  
>  #define CLK_USB_OHCI1		93
> -
> +#define CLK_DRAM		94
>  #define CLK_DRAM_VE		95
>  #define CLK_DRAM_CSI		96
>  #define CLK_DRAM_DEINTERLACE	97
> diff --git a/include/dt-bindings/clock/sun5i-ccu.h b/include/dt-bindings/clock/sun5i-ccu.h
> index 81f34d477a..75fe5619c3 100644
> --- a/include/dt-bindings/clock/sun5i-ccu.h
> +++ b/include/dt-bindings/clock/sun5i-ccu.h
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Copyright 2016 Maxime Ripard
>   *
>   * Maxime Ripard <maxime.ripard@free-electrons.com>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * 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 _DT_BINDINGS_CLK_SUN5I_H_
> @@ -100,7 +91,7 @@
>  #define CLK_AVS			96
>  #define CLK_HDMI		97
>  #define CLK_GPU			98
> -
> +#define CLK_MBUS		99
>  #define CLK_IEP			100
>  
>  #endif /* _DT_BINDINGS_CLK_SUN5I_H_ */
> diff --git a/include/dt-bindings/clock/sun6i-a31-ccu.h b/include/dt-bindings/clock/sun6i-a31-ccu.h
> index c5d1334018..39878d9dce 100644
> --- a/include/dt-bindings/clock/sun6i-a31-ccu.h
> +++ b/include/dt-bindings/clock/sun6i-a31-ccu.h
> @@ -49,6 +49,8 @@
>  
>  #define CLK_PLL_VIDEO1_2X	13
>  
> +#define CLK_PLL_MIPI		15
> +
>  #define CLK_CPU			18
>  
>  #define CLK_AHB1_MIPIDSI	23
> diff --git a/include/dt-bindings/clock/sun8i-a23-a33-ccu.h b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> index f8222b6b2c..eb524d0bbd 100644
> --- a/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> +++ b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> @@ -43,6 +43,8 @@
>  #ifndef _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
>  #define _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
>  
> +#define CLK_PLL_MIPI		13
> +
>  #define CLK_CPUX		18
>  
>  #define CLK_BUS_MIPI_DSI	23
> diff --git a/include/dt-bindings/clock/sun8i-h3-ccu.h b/include/dt-bindings/clock/sun8i-h3-ccu.h
> index 30d2d15373..5d4ada2c22 100644
> --- a/include/dt-bindings/clock/sun8i-h3-ccu.h
> +++ b/include/dt-bindings/clock/sun8i-h3-ccu.h
> @@ -126,7 +126,7 @@
>  #define CLK_USB_OHCI1		93
>  #define CLK_USB_OHCI2		94
>  #define CLK_USB_OHCI3		95
> -
> +#define CLK_DRAM		96
>  #define CLK_DRAM_VE		97
>  #define CLK_DRAM_CSI		98
>  #define CLK_DRAM_DEINTERLACE	99
> diff --git a/include/dt-bindings/clock/sun8i-v3s-ccu.h b/include/dt-bindings/clock/sun8i-v3s-ccu.h
> index c0d5d5599c..014ac6123d 100644
> --- a/include/dt-bindings/clock/sun8i-v3s-ccu.h
> +++ b/include/dt-bindings/clock/sun8i-v3s-ccu.h
> @@ -104,4 +104,8 @@
>  
>  #define CLK_MIPI_CSI		73
>  
> +/* Clocks not available on V3s */
> +#define CLK_BUS_I2S0		75
> +#define CLK_I2S0		76
> +
>  #endif /* _DT_BINDINGS_CLK_SUN8I_V3S_H_ */
> diff --git a/include/dt-bindings/reset/sun5i-ccu.h b/include/dt-bindings/reset/sun5i-ccu.h
> index c2b9726b50..40cc22ae76 100644
> --- a/include/dt-bindings/reset/sun5i-ccu.h
> +++ b/include/dt-bindings/reset/sun5i-ccu.h
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Copyright 2016 Maxime Ripard
>   *
>   * Maxime Ripard <maxime.ripard@free-electrons.com>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * 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 _RST_SUN5I_H_
> diff --git a/include/dt-bindings/reset/sun8i-v3s-ccu.h b/include/dt-bindings/reset/sun8i-v3s-ccu.h
> index b58ef21a2e..b6790173af 100644
> --- a/include/dt-bindings/reset/sun8i-v3s-ccu.h
> +++ b/include/dt-bindings/reset/sun8i-v3s-ccu.h
> @@ -75,4 +75,7 @@
>  #define RST_BUS_UART1		50
>  #define RST_BUS_UART2		51
>  
> +/* Reset lines not available on V3s */
> +#define RST_BUS_I2S0		52
> +
>  #endif /* _DT_BINDINGS_RST_SUN8I_H3_H_ */