Re: [PATCH v1 3/5] platform/x86: intel_scu_wdt: Move driver from arch/x86

[Guenter Roeck <linux@roeck-us.net>]

On 1/22/21 4:31 AM, Andy Shevchenko wrote:
> The ACPI-enabled Intel MID platforms neither have WDAT table nor proper IDs
> to instantiate watchdog device. In order to keep them working move the board
> code from arch/x86 to drivers/platform/x86.
> 
> Note, the complete SFI support is going to be removed, that's why PDx86
> has been chosen as a new home for it. This is the only device which needs
> additional code so far.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

Not sure if I like the new name (seems to be a bit misleading), but still

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  arch/x86/platform/intel-mid/device_libs/Makefile          | 1 -
>  drivers/platform/x86/Kconfig                              | 8 ++++++++
>  drivers/platform/x86/Makefile                             | 1 +
>  .../platform/x86/intel_scu_wdt.c                          | 0
>  4 files changed, 9 insertions(+), 1 deletion(-)
>  rename arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c => drivers/platform/x86/intel_scu_wdt.c (100%)
> 
> diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
> index 480fed21cc7d..918edac9ab9a 100644
> --- a/arch/x86/platform/intel-mid/device_libs/Makefile
> +++ b/arch/x86/platform/intel-mid/device_libs/Makefile
> @@ -30,4 +30,3 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
>  obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
>  obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_mrfld_power_btn.o
>  obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o
> -obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 4a5798a0ce0c..0bb85eabace1 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1424,6 +1424,14 @@ config INTEL_SCU_PLATFORM
>  	  and SCU (sometimes called PMC as well). The driver currently
>  	  supports Intel Elkhart Lake and compatible platforms.
>  
> +config INTEL_SCU_WDT
> +	bool
> +	default INTEL_SCU_PCI
> +	depends on INTEL_MID_WATCHDOG
> +	help
> +	  This is a specific platform code to instantiate watchdog device
> +	  on ACPI-based Intel MID platforms.
> +
>  config INTEL_SCU_IPC_UTIL
>  	tristate "Intel SCU IPC utility driver"
>  	depends on INTEL_SCU
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 728ccc226a29..19306450d791 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -146,6 +146,7 @@ obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
>  obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
>  obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
>  obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
> +obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
>  obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
>  obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
>  					   intel_telemetry_pltdrv.o \
> diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c b/drivers/platform/x86/intel_scu_wdt.c
> similarity index 100%
> rename from arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
> rename to drivers/platform/x86/intel_scu_wdt.c
>