[PATCH] Disable old OMAP RTC driver if RTC_DRV_OMAP is enabled

[PATCH] Disable old OMAP RTC driver if RTC_DRV_OMAP is enabled

[andrzej zaborowski]

Make the old RTC driver depend on !RTC_DRV_OMAP to avoid conflicts. It
makes the new driver in rtc class take precedence over the old one.

What's the status of the OMAP RTC in Character Devices?  Is it going
to be removed? Enabling both drivers results in an Oops on boot due to
name collision.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

Re: [PATCH] Disable old OMAP RTC driver if RTC_DRV_OMAP is enabled

[andrzej zaborowski]

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

This time with the actual change.

On 04/06/07, andrzej zaborowski <balrogg@gmail.com> wrote:
> Make the old RTC driver depend on !RTC_DRV_OMAP to avoid conflicts. It
> makes the new driver in rtc class take precedence over the old one.
>
> What's the status of the OMAP RTC in Character Devices?  Is it going
> to be removed? Enabling both drivers results in an Oops on boot due to
> name collision.
>
> Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

[-- Attachment #2: 0004-Disable-old-OMAP-RTC-driver-if-DRV_RTC_OMAP-is-enabled.txt --]
[-- Type: text/plain, Size: 746 bytes --]

From 98d5a946f93a4ead2acbce23f1ee2cdb80c24c96 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Mon, 4 Jun 2007 17:11:06 +0200
Subject: [PATCH] Disable old OMAP RTC driver if DRV_RTC_OMAP is enabled.

---
 drivers/char/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 8dd3475..d3ebf75 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -843,7 +843,7 @@ config EFI_RTC
 	depends on IA64
 config OMAP_RTC
 	bool "TI OMAP Real Time Clock"
-	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
+	depends on !RTC_DRV_OMAP && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730)
 	help
 	  Support for TI OMAP RTC
 
-- 
1.4.4.3


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Disable old OMAP RTC driver if RTC_DRV_OMAP is enabled

[Tony Lindgren]

* andrzej zaborowski <balrogg@gmail.com> [070604 07:25]:
> This time with the actual change.
>
> On 04/06/07, andrzej zaborowski <balrogg@gmail.com> wrote:
>> Make the old RTC driver depend on !RTC_DRV_OMAP to avoid conflicts. It
>> makes the new driver in rtc class take precedence over the old one.
>>
>> What's the status of the OMAP RTC in Character Devices?  Is it going
>> to be removed? Enabling both drivers results in an Oops on boot due to
>> name collision.

Yeah, let's get rid of it. Do you have a patch for that?

>> Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

> From 98d5a946f93a4ead2acbce23f1ee2cdb80c24c96 Mon Sep 17 00:00:00 2001
> From: Andrzej Zaborowski <balrog@zabor.org>
> Date: Mon, 4 Jun 2007 17:11:06 +0200
> Subject: [PATCH] Disable old OMAP RTC driver if DRV_RTC_OMAP is enabled.
> 
> ---
>  drivers/char/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
> index 8dd3475..d3ebf75 100644
> --- a/drivers/char/Kconfig
> +++ b/drivers/char/Kconfig
> @@ -843,7 +843,7 @@ config EFI_RTC
>  	depends on IA64
>  config OMAP_RTC
>  	bool "TI OMAP Real Time Clock"
> -	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
> +	depends on !RTC_DRV_OMAP && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730)
>  	help
>  	  Support for TI OMAP RTC
>  
> -- 
> 1.4.4.3
> 

Pushing this today.

Tony