Commit 8dc08395 authored by Kevin Hilman's avatar Kevin Hilman Committed by Linus Torvalds
Browse files

rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS 



Commit 6b8029fa ("rtc: kconfig: remove unnecessary dependencies")
removed various 'depends on RTC_CLASS' dependencies but also removed a
few 'default RTC_CLASS' statements, which actually changed default
behavior.

This resulted in the various RTC interfaces (sysfs, proc, dev) all being
disabled by default, even when RTC_CLASS is enabled:

   # CONFIG_RTC_INTF_SYSFS is not set
   # CONFIG_RTC_INTF_PROC is not set
   # CONFIG_RTC_INTF_DEV is not set

which is different from previous behavior (all of these where enabled.)

To fix, add back the 'default RTC_CLASS' statments to each of the
RTC_INTF_* options.

I noticed this because some RTC tests started failing on my TI OMAP
platforms because /dev/rtc0 was not present anymore, even though the
driver was present and RTC_CLASS was enabled.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fdb8d561

drivers/rtc/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ comment "RTC interfaces" 
config RTC_INTF_SYSFS

config RTC_INTF_SYSFS

	boolean "/sys/class/rtc/rtcN (sysfs)"

	boolean "/sys/class/rtc/rtcN (sysfs)"

	depends on SYSFS

	depends on SYSFS

	default RTC_CLASS

	help

	help

	  Say yes here if you want to use your RTCs using sysfs interfaces,

	  Say yes here if you want to use your RTCs using sysfs interfaces,

	  /sys/class/rtc/rtc0 through /sys/.../rtcN.

	  /sys/class/rtc/rtc0 through /sys/.../rtcN.
@@ -68,6 +69,7 @@ config RTC_INTF_SYSFS 
config RTC_INTF_PROC

config RTC_INTF_PROC

	boolean "/proc/driver/rtc (procfs for rtcN)"

	boolean "/proc/driver/rtc (procfs for rtcN)"

	depends on PROC_FS

	depends on PROC_FS

	default RTC_CLASS

	help

	help

	  Say yes here if you want to use your system clock RTC through

	  Say yes here if you want to use your system clock RTC through

	  the proc interface, /proc/driver/rtc.

	  the proc interface, /proc/driver/rtc.
@@ -79,6 +81,7 @@ config RTC_INTF_PROC 




config RTC_INTF_DEV

config RTC_INTF_DEV

	boolean "/dev/rtcN (character devices)"

	boolean "/dev/rtcN (character devices)"

	default RTC_CLASS

	help

	help

	  Say yes here if you want to use your RTCs using the /dev

	  Say yes here if you want to use your RTCs using the /dev

	  interfaces, which "udev" sets up as /dev/rtc0 through

	  interfaces, which "udev" sets up as /dev/rtc0 through