| Message ID | 20210714121116.v2.1.I514d9aafff3a062f751b37d3fea7402f67595b86@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support to the mmsys driver to be a reset controller | expand |
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 <enric.balletbo@collabora.com> For the watchdog part: Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > > Changes in v2: > - Fix build test ERROR Reported-by: kernel test robot <lkp@intel.com> > > 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
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 <enric.balletbo@collabora.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > > Changes in v2: > - Fix build test ERROR Reported-by: kernel test robot <lkp@intel.com> > > 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 >
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
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 <enric.balletbo@collabora.com> --- Changes in v2: - Fix build test ERROR Reported-by: kernel test robot <lkp@intel.com> 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%)