Skip to contentSkip to conversation

x86/platform/intel-mid: Rename platform_wdt to platform_mrfld_wdt

PATCH New Andy Shevchenko 2 participants 2 messages Nov 18, 2016 – Nov 21, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/platform/intel-mid: Rename platform_wdt to platform_mrfld_wdt

Rename the watchdog platform library file to explicitly show that is used only on Intel Merrifield platforms.

---
This one depends on http://marc.info/?l=linux-kernel&m=147948798906252&w=2

 arch/x86/platform/intel-mid/device_libs/Makefile                        | 2 +-
 .../intel-mid/device_libs/{platform_wdt.c => platform_mrfld_wdt.c}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/x86/platform/intel-mid/device_libs/{platform_wdt.c => platform_mrfld_wdt.c} (97%)
arch/x86/platform/intel-mid/device_libs/Makefile +1 -1
index 429d08b..dd6cfa4 100644
@@ -28,4 +28,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
 obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
 # MISC Devices
 obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
-obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
+obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o
arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c renamed from arch/x86/platform/intel-mid/device_libs/platform_wdt.c +1 -1
similarity index 97%
rename from arch/x86/platform/intel-mid/device_libs/platform_wdt.c
rename to arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
index 0bc9ae3..e2125f8 100644
@@ -1,5 +1,5 @@
 /*
- * platform_wdt.c: Watchdog platform library file
+ * Intel Merrifield watchdog platform device library file
  *
  * (C) Copyright 2014 Intel Corporation
  * Author: David Cohen <[email protected]>
Signature · 1 line
2.10.2
#1 lore raw
x86/platform/intel-mid: Rename platform_wdt to platform_mrfld_wdt
Commit-ID:  e5dce2868818ca8706924f7bdc7939d481eefab0
Gitweb:     http://git.kernel.org/tip/e5dce2868818ca8706924f7bdc7939d481eefab0
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Fri, 18 Nov 2016 19:27:23 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 21 Nov 2016 11:07:11 +0100

x86/platform/intel-mid: Rename platform_wdt to platform_mrfld_wdt

Rename the watchdog platform library file to explicitly show that is used only on Intel Merrifield platforms.

---
 arch/x86/platform/intel-mid/device_libs/Makefile                        | 2 +-
 .../intel-mid/device_libs/{platform_wdt.c => platform_mrfld_wdt.c}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/platform/intel-mid/device_libs/Makefile +1 -1
index 429d08b..dd6cfa4 100644
@@ -28,4 +28,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
 obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
 # MISC Devices
 obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
-obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
+obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o
arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c renamed from arch/x86/platform/intel-mid/device_libs/platform_wdt.c +1 -1
similarity index 97%
rename from arch/x86/platform/intel-mid/device_libs/platform_wdt.c
rename to arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
index 4f96cd0..3f1f1c7 100644
@@ -1,5 +1,5 @@
 /*
- * platform_wdt.c: Watchdog platform library file
+ * Intel Merrifield watchdog platform device library file
  *
  * (C) Copyright 2014 Intel Corporation
  * Author: David Cohen <[email protected]>