linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
@ 2011-12-10 20:14 Fabio Estevam
  2011-12-12  8:47 ` [rtc-linux] " Jean-Christophe PLAGNIOL-VILLARD
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Fabio Estevam @ 2011-12-10 20:14 UTC (permalink / raw)
  To: rtc-linux; +Cc: a.zummo, kernel, linux-kernel, Fabio Estevam, Fabio Estevam

RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
"on-CPU RTC drivers" selection menu.

While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/rtc/Kconfig |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 53eb4e5..fdc32ba 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -613,27 +613,6 @@ config RTC_DRV_MSM6242
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-msm6242.
 
-config RTC_DRV_IMXDI
-	tristate "Freescale IMX DryIce Real Time Clock"
-	depends on ARCH_MX25
-	depends on RTC_CLASS
-	help
-	   Support for Freescale IMX DryIce RTC
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-imxdi".
-
-config RTC_MXC
-	tristate "Freescale MXC Real Time Clock"
-	depends on ARCH_MXC
-	depends on RTC_CLASS
-	help
-	   If you say yes here you get support for the Freescale MXC
-	   RTC module.
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-mxc".
-
 config RTC_DRV_BQ4802
 	tristate "TI BQ4802"
 	help
@@ -731,6 +710,16 @@ config RTC_DRV_DAVINCI
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-davinci.
 
+config RTC_DRV_IMXDI
+	tristate "Freescale IMX DryIce Real Time Clock"
+	depends on SOC_IMX25
+	depends on RTC_CLASS
+	help
+	   Support for Freescale IMX DryIce RTC
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-imxdi".
+
 config RTC_DRV_OMAP
 	tristate "TI OMAP1"
 	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
@@ -1070,4 +1059,15 @@ config RTC_DRV_PUV3
 	  This drive can also be built as a module. If so, the module
 	  will be called rtc-puv3.
 
+config RTC_MXC
+	tristate "Freescale MXC Real Time Clock"
+	depends on ARCH_MXC
+	depends on RTC_CLASS
+	help
+	   If you say yes here you get support for the Freescale MXC
+	   RTC module.
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-mxc".
+
 endif # RTC_CLASS
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [rtc-linux] [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-10 20:14 [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Fabio Estevam
@ 2011-12-12  8:47 ` Jean-Christophe PLAGNIOL-VILLARD
  2011-12-12  8:55 ` Wolfram Sang
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 10+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-12  8:47 UTC (permalink / raw)
  To: rtc-linux; +Cc: a.zummo, kernel, linux-kernel, Fabio Estevam, Fabio Estevam

On 18:14 Sat 10 Dec     , Fabio Estevam wrote:
> RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
> "on-CPU RTC drivers" selection menu.
> 
> While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.
is it freescale IP or third party IP?

Best Regards,
J.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-10 20:14 [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Fabio Estevam
  2011-12-12  8:47 ` [rtc-linux] " Jean-Christophe PLAGNIOL-VILLARD
@ 2011-12-12  8:55 ` Wolfram Sang
  2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
  2011-12-12 12:33 ` [PATCH " Fabio Estevam
  3 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2011-12-12  8:55 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: rtc-linux, a.zummo, kernel, linux-kernel, Fabio Estevam

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]


> +config RTC_MXC

RTC_DRV_MXC for consistency while we are here?

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v2 1/2] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-10 20:14 [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Fabio Estevam
  2011-12-12  8:47 ` [rtc-linux] " Jean-Christophe PLAGNIOL-VILLARD
  2011-12-12  8:55 ` Wolfram Sang
@ 2011-12-12 12:33 ` Fabio Estevam
  2011-12-12 12:48   ` Wolfram Sang
                     ` (2 more replies)
  2011-12-12 12:33 ` [PATCH " Fabio Estevam
  3 siblings, 3 replies; 10+ messages in thread
From: Fabio Estevam @ 2011-12-12 12:33 UTC (permalink / raw)
  To: rtc-linux; +Cc: a.zummo, kernel, linux-kernel, w.sang, Fabio Estevam

RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
"on-CPU RTC drivers" selection menu.

While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- No changes. Only introduced a new patch in the series
for renaming RTC_MXC to RTC_DRV_MXC 

 drivers/rtc/Kconfig |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 53eb4e5..fdc32ba 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -613,27 +613,6 @@ config RTC_DRV_MSM6242
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-msm6242.
 
-config RTC_DRV_IMXDI
-	tristate "Freescale IMX DryIce Real Time Clock"
-	depends on ARCH_MX25
-	depends on RTC_CLASS
-	help
-	   Support for Freescale IMX DryIce RTC
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-imxdi".
-
-config RTC_MXC
-	tristate "Freescale MXC Real Time Clock"
-	depends on ARCH_MXC
-	depends on RTC_CLASS
-	help
-	   If you say yes here you get support for the Freescale MXC
-	   RTC module.
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-mxc".
-
 config RTC_DRV_BQ4802
 	tristate "TI BQ4802"
 	help
@@ -731,6 +710,16 @@ config RTC_DRV_DAVINCI
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-davinci.
 
+config RTC_DRV_IMXDI
+	tristate "Freescale IMX DryIce Real Time Clock"
+	depends on SOC_IMX25
+	depends on RTC_CLASS
+	help
+	   Support for Freescale IMX DryIce RTC
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-imxdi".
+
 config RTC_DRV_OMAP
 	tristate "TI OMAP1"
 	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
@@ -1070,4 +1059,15 @@ config RTC_DRV_PUV3
 	  This drive can also be built as a module. If so, the module
 	  will be called rtc-puv3.
 
+config RTC_MXC
+	tristate "Freescale MXC Real Time Clock"
+	depends on ARCH_MXC
+	depends on RTC_CLASS
+	help
+	   If you say yes here you get support for the Freescale MXC
+	   RTC module.
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-mxc".
+
 endif # RTC_CLASS
-- 
1.7.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
  2011-12-10 20:14 [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Fabio Estevam
                   ` (2 preceding siblings ...)
  2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
@ 2011-12-12 12:33 ` Fabio Estevam
  2011-12-12 12:48   ` Wolfram Sang
  3 siblings, 1 reply; 10+ messages in thread
From: Fabio Estevam @ 2011-12-12 12:33 UTC (permalink / raw)
  To: rtc-linux; +Cc: a.zummo, kernel, linux-kernel, w.sang, Fabio Estevam

In order to keep consistency with other rtc drivers,rename CONFIG_RTC_MXC
to CONFIG_RTC_DRV_MXC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v4_v5_defconfig |    2 +-
 arch/arm/configs/mx3_defconfig       |    2 +-
 arch/arm/configs/mx5_defconfig       |    2 +-
 drivers/rtc/Kconfig                  |    2 +-
 drivers/rtc/Makefile                 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 11a4192..bb22ead 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -149,7 +149,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_IMXDI=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
index cb0717f..b69bd64 100644
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
@@ -128,7 +128,7 @@ CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_MXC=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_DMADEVICES=y
 # CONFIG_DNOTIFY is not set
 CONFIG_TMPFS=y
diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/mx5_defconfig
index d0d8dfe..fb17fd9 100644
--- a/arch/arm/configs/mx5_defconfig
+++ b/arch/arm/configs/mx5_defconfig
@@ -132,7 +132,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index a5ed7cc..5a8efee 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1059,7 +1059,7 @@ config RTC_DRV_PUV3
 	  This drive can also be built as a module. If so, the module
 	  will be called rtc-puv3.
 
-config RTC_MXC
+config RTC_DRV_MXC
 	tristate "Freescale MXC Real Time Clock"
 	depends on ARCH_MXC
 	depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e69823..1e1d26e 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_RTC_DRV_M41T94)	+= rtc-m41t94.o
 obj-$(CONFIG_RTC_DRV_M48T35)	+= rtc-m48t35.o
 obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o
 obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o
-obj-$(CONFIG_RTC_MXC)		+= rtc-mxc.o
+obj-$(CONFIG_RTC_DRV_MXC)	+= rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX8925)	+= rtc-max8925.o
 obj-$(CONFIG_RTC_DRV_MAX8998)	+= rtc-max8998.o
-- 
1.7.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 1/2] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
@ 2011-12-12 12:48   ` Wolfram Sang
  2012-01-04 16:20     ` Fabio Estevam
  2012-02-08 13:09   ` [RESEND PATCH " Fabio Estevam
  2012-02-08 13:09   ` [RESEND PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC Fabio Estevam
  2 siblings, 1 reply; 10+ messages in thread
From: Wolfram Sang @ 2011-12-12 12:48 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: rtc-linux, a.zummo, kernel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

On Mon, Dec 12, 2011 at 10:33:06AM -0200, Fabio Estevam wrote:
> RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
> "on-CPU RTC drivers" selection menu.
> 
> While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
  2011-12-12 12:33 ` [PATCH " Fabio Estevam
@ 2011-12-12 12:48   ` Wolfram Sang
  0 siblings, 0 replies; 10+ messages in thread
From: Wolfram Sang @ 2011-12-12 12:48 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: rtc-linux, a.zummo, kernel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

On Mon, Dec 12, 2011 at 10:33:07AM -0200, Fabio Estevam wrote:
> In order to keep consistency with other rtc drivers,rename CONFIG_RTC_MXC
> to CONFIG_RTC_DRV_MXC.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

Thanks!

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 1/2] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-12 12:48   ` Wolfram Sang
@ 2012-01-04 16:20     ` Fabio Estevam
  0 siblings, 0 replies; 10+ messages in thread
From: Fabio Estevam @ 2012-01-04 16:20 UTC (permalink / raw)
  To: a.zummo; +Cc: rtc-linux, Wolfram Sang, kernel, linux-kernel

On 12/12/2011 10:48 AM, Wolfram Sang wrote:
> On Mon, Dec 12, 2011 at 10:33:06AM -0200, Fabio Estevam wrote:
>> RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
>> "on-CPU RTC drivers" selection menu.
>>
>> While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
> 

Alessandro, ping?



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [RESEND PATCH v2 1/2] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
  2011-12-12 12:48   ` Wolfram Sang
@ 2012-02-08 13:09   ` Fabio Estevam
  2012-02-08 13:09   ` [RESEND PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC Fabio Estevam
  2 siblings, 0 replies; 10+ messages in thread
From: Fabio Estevam @ 2012-02-08 13:09 UTC (permalink / raw)
  To: linux-kernel; +Cc: rtc-linux, w.sang, akpm, Fabio Estevam

RTC_DRV_IMXDI and RTC_MXC are on-chip RTC modules, so move them under 
"on-CPU RTC drivers" selection menu.

While at it change the dependency of RTC_DRV_IMXDI from ARCH_MX25 to SOC_IMX25.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Andrew, 

I got no reaction from Alessandro on this patch series.

If you think this is OK, can this be applied?

Changes since v1:
- No changes. Only introduced a new patch in the series
for renaming RTC_MXC to RTC_DRV_MXC 

 drivers/rtc/Kconfig |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 53eb4e5..fdc32ba 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -613,27 +613,6 @@ config RTC_DRV_MSM6242
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-msm6242.
 
-config RTC_DRV_IMXDI
-	tristate "Freescale IMX DryIce Real Time Clock"
-	depends on ARCH_MX25
-	depends on RTC_CLASS
-	help
-	   Support for Freescale IMX DryIce RTC
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-imxdi".
-
-config RTC_MXC
-	tristate "Freescale MXC Real Time Clock"
-	depends on ARCH_MXC
-	depends on RTC_CLASS
-	help
-	   If you say yes here you get support for the Freescale MXC
-	   RTC module.
-
-	   This driver can also be built as a module, if so, the module
-	   will be called "rtc-mxc".
-
 config RTC_DRV_BQ4802
 	tristate "TI BQ4802"
 	help
@@ -731,6 +710,16 @@ config RTC_DRV_DAVINCI
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-davinci.
 
+config RTC_DRV_IMXDI
+	tristate "Freescale IMX DryIce Real Time Clock"
+	depends on SOC_IMX25
+	depends on RTC_CLASS
+	help
+	   Support for Freescale IMX DryIce RTC
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-imxdi".
+
 config RTC_DRV_OMAP
 	tristate "TI OMAP1"
 	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
@@ -1070,4 +1059,15 @@ config RTC_DRV_PUV3
 	  This drive can also be built as a module. If so, the module
 	  will be called rtc-puv3.
 
+config RTC_MXC
+	tristate "Freescale MXC Real Time Clock"
+	depends on ARCH_MXC
+	depends on RTC_CLASS
+	help
+	   If you say yes here you get support for the Freescale MXC
+	   RTC module.
+
+	   This driver can also be built as a module, if so, the module
+	   will be called "rtc-mxc".
+
 endif # RTC_CLASS
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [RESEND PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
  2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
  2011-12-12 12:48   ` Wolfram Sang
  2012-02-08 13:09   ` [RESEND PATCH " Fabio Estevam
@ 2012-02-08 13:09   ` Fabio Estevam
  2 siblings, 0 replies; 10+ messages in thread
From: Fabio Estevam @ 2012-02-08 13:09 UTC (permalink / raw)
  To: linux-kernel; +Cc: rtc-linux, w.sang, akpm, Fabio Estevam

In order to keep consistency with other rtc drivers,rename CONFIG_RTC_MXC
to CONFIG_RTC_DRV_MXC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
---
 arch/arm/configs/imx_v4_v5_defconfig |    2 +-
 arch/arm/configs/mx3_defconfig       |    2 +-
 arch/arm/configs/mx5_defconfig       |    2 +-
 drivers/rtc/Kconfig                  |    2 +-
 drivers/rtc/Makefile                 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 11a4192..bb22ead 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -149,7 +149,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_IMXDI=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
index cb0717f..b69bd64 100644
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
@@ -128,7 +128,7 @@ CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_MXC=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_DMADEVICES=y
 # CONFIG_DNOTIFY is not set
 CONFIG_TMPFS=y
diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/mx5_defconfig
index d0d8dfe..fb17fd9 100644
--- a/arch/arm/configs/mx5_defconfig
+++ b/arch/arm/configs/mx5_defconfig
@@ -132,7 +132,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_MXC=y
+CONFIG_RTC_DRV_MXC=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index a5ed7cc..5a8efee 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1059,7 +1059,7 @@ config RTC_DRV_PUV3
 	  This drive can also be built as a module. If so, the module
 	  will be called rtc-puv3.
 
-config RTC_MXC
+config RTC_DRV_MXC
 	tristate "Freescale MXC Real Time Clock"
 	depends on ARCH_MXC
 	depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e69823..1e1d26e 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_RTC_DRV_M41T94)	+= rtc-m41t94.o
 obj-$(CONFIG_RTC_DRV_M48T35)	+= rtc-m48t35.o
 obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o
 obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o
-obj-$(CONFIG_RTC_MXC)		+= rtc-mxc.o
+obj-$(CONFIG_RTC_DRV_MXC)	+= rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX8925)	+= rtc-max8925.o
 obj-$(CONFIG_RTC_DRV_MAX8998)	+= rtc-max8998.o
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-02-08 13:09 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-10 20:14 [PATCH] rtc: Kconfig: Place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Fabio Estevam
2011-12-12  8:47 ` [rtc-linux] " Jean-Christophe PLAGNIOL-VILLARD
2011-12-12  8:55 ` Wolfram Sang
2011-12-12 12:33 ` [PATCH v2 1/2] " Fabio Estevam
2011-12-12 12:48   ` Wolfram Sang
2012-01-04 16:20     ` Fabio Estevam
2012-02-08 13:09   ` [RESEND PATCH " Fabio Estevam
2012-02-08 13:09   ` [RESEND PATCH v2 2/2] rtc: Rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC Fabio Estevam
2011-12-12 12:33 ` [PATCH " Fabio Estevam
2011-12-12 12:48   ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).