2021-07-14 10:12:41

by Enric Balletbo i Serra

Subject: [PATCH v2 1/7] arm64: dts: mediatek: Move reset controller constants into common location

The DT binding includes for reset controllers are located in
include/dt-bindings/reset/. Move the Mediatek reset constants in there.

Signed-off-by: Enric Balletbo i Serra <[email protected]>
---

Changes in v2:
- Fix build test ERROR Reported-by: kernel test robot <[email protected]>

arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +-
drivers/watchdog/mtk_wdt.c | 6 +++---
.../dt-bindings/{reset-controller => reset}/mt2712-resets.h | 0
.../dt-bindings/{reset-controller => reset}/mt8183-resets.h | 0
.../dt-bindings/{reset-controller => reset}/mt8192-resets.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename include/dt-bindings/{reset-controller => reset}/mt2712-resets.h (100%)
rename include/dt-bindings/{reset-controller => reset}/mt8183-resets.h (100%)
rename include/dt-bindings/{reset-controller => reset}/mt8192-resets.h (100%)

diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index 96473d88f391..4ef0b5b23047 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -11,7 +11,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/memory/mt8183-larb-port.h>
#include <dt-bindings/power/mt8183-power.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
+#include <dt-bindings/reset/mt8183-resets.h>
#include <dt-bindings/phy/phy.h>
#include <dt-bindings/thermal/thermal.h>
#include "mt8183-pinfunc.h"
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 16b6aff324a7..6986bc740465 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -9,9 +9,9 @@
* Based on sunxi_wdt.c
*/

-#include <dt-bindings/reset-controller/mt2712-resets.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
-#include <dt-bindings/reset-controller/mt8192-resets.h>
+#include <dt-bindings/reset/mt2712-resets.h>
+#include <dt-bindings/reset/mt8183-resets.h>
+#include <dt-bindings/reset/mt8192-resets.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
diff --git a/include/dt-bindings/reset-controller/mt2712-resets.h b/include/dt-bindings/reset/mt2712-resets.h
similarity index 100%
rename from include/dt-bindings/reset-controller/mt2712-resets.h
rename to include/dt-bindings/reset/mt2712-resets.h
diff --git a/include/dt-bindings/reset-controller/mt8183-resets.h b/include/dt-bindings/reset/mt8183-resets.h
similarity index 100%
rename from include/dt-bindings/reset-controller/mt8183-resets.h
rename to include/dt-bindings/reset/mt8183-resets.h
diff --git a/include/dt-bindings/reset-controller/mt8192-resets.h b/include/dt-bindings/reset/mt8192-resets.h
similarity index 100%
rename from include/dt-bindings/reset-controller/mt8192-resets.h
rename to include/dt-bindings/reset/mt8192-resets.h
--
2.30.2

2021-07-30 05:06:13

by Guenter Roeck

Subject: Re: [PATCH v2 1/7] arm64: dts: mediatek: Move reset controller constants into common location

On Wed, Jul 14, 2021 at 12:11:35PM +0200, Enric Balletbo i Serra wrote:
> The DT binding includes for reset controllers are located in
> include/dt-bindings/reset/. Move the Mediatek reset constants in there.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>

For the watchdog part:

Reviewed-by: Guenter Roeck <[email protected]>

> ---
>
> Changes in v2:
> - Fix build test ERROR Reported-by: kernel test robot <[email protected]>
>
> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +-
> drivers/watchdog/mtk_wdt.c | 6 +++---
> .../dt-bindings/{reset-controller => reset}/mt2712-resets.h | 0
> .../dt-bindings/{reset-controller => reset}/mt8183-resets.h | 0
> .../dt-bindings/{reset-controller => reset}/mt8192-resets.h | 0
> 5 files changed, 4 insertions(+), 4 deletions(-)
> rename include/dt-bindings/{reset-controller => reset}/mt2712-resets.h (100%)
> rename include/dt-bindings/{reset-controller => reset}/mt8183-resets.h (100%)
> rename include/dt-bindings/{reset-controller => reset}/mt8192-resets.h (100%)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> index 96473d88f391..4ef0b5b23047 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> @@ -11,7 +11,7 @@
> #include <dt-bindings/interrupt-controller/irq.h>
> #include <dt-bindings/memory/mt8183-larb-port.h>
> #include <dt-bindings/power/mt8183-power.h>
> -#include <dt-bindings/reset-controller/mt8183-resets.h>
> +#include <dt-bindings/reset/mt8183-resets.h>
> #include <dt-bindings/phy/phy.h>
> #include <dt-bindings/thermal/thermal.h>
> #include "mt8183-pinfunc.h"
> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> index 16b6aff324a7..6986bc740465 100644
> --- a/drivers/watchdog/mtk_wdt.c
> +++ b/drivers/watchdog/mtk_wdt.c
> @@ -9,9 +9,9 @@
> * Based on sunxi_wdt.c
> */
>
> -#include <dt-bindings/reset-controller/mt2712-resets.h>
> -#include <dt-bindings/reset-controller/mt8183-resets.h>
> -#include <dt-bindings/reset-controller/mt8192-resets.h>
> +#include <dt-bindings/reset/mt2712-resets.h>
> +#include <dt-bindings/reset/mt8183-resets.h>
> +#include <dt-bindings/reset/mt8192-resets.h>
> #include <linux/delay.h>
> #include <linux/err.h>
> #include <linux/init.h>
> diff --git a/include/dt-bindings/reset-controller/mt2712-resets.h b/include/dt-bindings/reset/mt2712-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt2712-resets.h
> rename to include/dt-bindings/reset/mt2712-resets.h
> diff --git a/include/dt-bindings/reset-controller/mt8183-resets.h b/include/dt-bindings/reset/mt8183-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt8183-resets.h
> rename to include/dt-bindings/reset/mt8183-resets.h
> diff --git a/include/dt-bindings/reset-controller/mt8192-resets.h b/include/dt-bindings/reset/mt8192-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt8192-resets.h
> rename to include/dt-bindings/reset/mt8192-resets.h

2021-08-06 23:12:23

by Matthias Brugger

Subject: Re: [PATCH v2 1/7] arm64: dts: mediatek: Move reset controller constants into common location

On 14/07/2021 12:11, Enric Balletbo i Serra wrote:
> The DT binding includes for reset controllers are located in
> include/dt-bindings/reset/. Move the Mediatek reset constants in there.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>

Reviewed-by: Matthias Brugger <[email protected]>

> ---
>
> Changes in v2:
> - Fix build test ERROR Reported-by: kernel test robot <[email protected]>
>
> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +-
> drivers/watchdog/mtk_wdt.c | 6 +++---
> .../dt-bindings/{reset-controller => reset}/mt2712-resets.h | 0
> .../dt-bindings/{reset-controller => reset}/mt8183-resets.h | 0
> .../dt-bindings/{reset-controller => reset}/mt8192-resets.h | 0
> 5 files changed, 4 insertions(+), 4 deletions(-)
> rename include/dt-bindings/{reset-controller => reset}/mt2712-resets.h (100%)
> rename include/dt-bindings/{reset-controller => reset}/mt8183-resets.h (100%)
> rename include/dt-bindings/{reset-controller => reset}/mt8192-resets.h (100%)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> index 96473d88f391..4ef0b5b23047 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> @@ -11,7 +11,7 @@
> #include <dt-bindings/interrupt-controller/irq.h>
> #include <dt-bindings/memory/mt8183-larb-port.h>
> #include <dt-bindings/power/mt8183-power.h>
> -#include <dt-bindings/reset-controller/mt8183-resets.h>
> +#include <dt-bindings/reset/mt8183-resets.h>
> #include <dt-bindings/phy/phy.h>
> #include <dt-bindings/thermal/thermal.h>
> #include "mt8183-pinfunc.h"
> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> index 16b6aff324a7..6986bc740465 100644
> --- a/drivers/watchdog/mtk_wdt.c
> +++ b/drivers/watchdog/mtk_wdt.c
> @@ -9,9 +9,9 @@
> * Based on sunxi_wdt.c
> */
>
> -#include <dt-bindings/reset-controller/mt2712-resets.h>
> -#include <dt-bindings/reset-controller/mt8183-resets.h>
> -#include <dt-bindings/reset-controller/mt8192-resets.h>
> +#include <dt-bindings/reset/mt2712-resets.h>
> +#include <dt-bindings/reset/mt8183-resets.h>
> +#include <dt-bindings/reset/mt8192-resets.h>
> #include <linux/delay.h>
> #include <linux/err.h>
> #include <linux/init.h>
> diff --git a/include/dt-bindings/reset-controller/mt2712-resets.h b/include/dt-bindings/reset/mt2712-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt2712-resets.h
> rename to include/dt-bindings/reset/mt2712-resets.h
> diff --git a/include/dt-bindings/reset-controller/mt8183-resets.h b/include/dt-bindings/reset/mt8183-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt8183-resets.h
> rename to include/dt-bindings/reset/mt8183-resets.h
> diff --git a/include/dt-bindings/reset-controller/mt8192-resets.h b/include/dt-bindings/reset/mt8192-resets.h
> similarity index 100%
> rename from include/dt-bindings/reset-controller/mt8192-resets.h
> rename to include/dt-bindings/reset/mt8192-resets.h
>