From patchwork Wed Oct 10 00:09:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 190515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ob0-f184.google.com (mail-ob0-f184.google.com [209.85.214.184]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id F139D2C0090 for ; Wed, 10 Oct 2012 11:09:50 +1100 (EST) Received: by mail-ob0-f184.google.com with SMTP id x4sf4666125obh.11 for ; Tue, 09 Oct 2012 17:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=/wV/ZFjQHgTwdZnbTGSJMj7qFKZGmZydjLl7cxXRuxY=; b=UOOoDF2g60Zyk93nto0qSSPEsbouaPQxOd4lu8jjdnWp/FIdZkBH6Ubd+2ebkieWbu RNevUm5UZSP1NBAv/PK6aYjWuG+C8DtkEivN9SClJIinex5jCS012PUyGMs2QaDXsOsY TN7GRWzgJn7rP0F5FUK2djt/einCgBaoXTIAOeOPVuI+6cBCusd2aDb9LXuwnWeBCAj7 DgLZpCgv37jN5l1vIJ8OeIBk9frs7oi4JRYhE0VGXRrg1OvG4UjNPz4JqYNGeZdwReo9 +PZc64qdD0UZ1MrKGi+jo6lcsPkF+SdR8EzA8EynATZaZJ3FaU/XD/8Z8hP6+onJtHDR rHrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:x-gm-message-state:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=/wV/ZFjQHgTwdZnbTGSJMj7qFKZGmZydjLl7cxXRuxY=; b=FLGXVfzLQAX59ZQna4jc+AVd3EQyDkeyu/D4wrN0Vf9EEt8idzEhOIPvHpWPKwSMk4 twdRDRsOuwcrJROlA/+6sW7uxnD9J5oxvl8LocoUwbSr5JKqSJMeodXmN64wycL551S1 +c8lhAI4OV0kEREscSioKJ8KmmPxu7+Fs+QEwHjHBWxsH6HhFv/+2x6V2rzQhSHA+AAC OkxqEvSVMrquW5h7L5iiRGHogV/5dgb/pi5J2aAJyuJO2XQyB2/fAyJiF7Pfm3k6vN6D 50QVBhGBifHmxJSklQlTbWU1p8iryg3FYp69tFKf3UQv37dvQ+ERAdF0qWCiIROrS5vK l5EA== Received: by 10.68.134.129 with SMTP id pk1mr5692108pbb.13.1349827787421; Tue, 09 Oct 2012 17:09:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.68.225.39 with SMTP id rh7ls151026pbc.7.gmail; Tue, 09 Oct 2012 17:09:47 -0700 (PDT) Received: by 10.66.79.6 with SMTP id f6mr4959937pax.3.1349827787039; Tue, 09 Oct 2012 17:09:47 -0700 (PDT) Received: by 10.66.79.6 with SMTP id f6mr4959936pax.3.1349827787029; Tue, 09 Oct 2012 17:09:47 -0700 (PDT) Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by gmr-mx.google.com with ESMTPS id nt8si17638pbb.1.2012.10.09.17.09.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 17:09:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of khilman@deeprootsystems.com) client-ip=209.85.160.45; Received: by mail-pb0-f45.google.com with SMTP id rp2so34097pbb.32 for ; Tue, 09 Oct 2012 17:09:46 -0700 (PDT) Received: by 10.68.213.138 with SMTP id ns10mr67942400pbc.157.1349827786505; Tue, 09 Oct 2012 17:09:46 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id uj3sm54723pbc.39.2012.10.09.17.09.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 17:09:45 -0700 (PDT) From: Kevin Hilman To: rtc-linux@googlegroups.com, Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Venu Byravarasu Subject: [rtc-linux] [PATCH] rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS Date: Tue, 9 Oct 2012 17:09:44 -0700 Message-Id: <1349827784-8646-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.9.2 X-Gm-Message-State: ALoCoQm7DcOF1lpyONVg+6uI6vkyYfguIgspZBUQBNyFsotwAr3Fy/0ykdEcOQyH1BsJraxi+7uo X-Original-Sender: khilman@deeprootsystems.com X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of khilman@deeprootsystems.com) smtp.mail=khilman@deeprootsystems.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Kevin Hilman commit 6b8029fab64164b5895d58d23229b75c82e3a6fc (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. Cc: Venu Byravarasu Cc: Andrew Morton Signed-off-by: Kevin Hilman Acked-by: Venu Byravarasu --- Targeted as a fix for v3.7-rc. Applies on Linus' master, just after merging "Andrew's patch bomb" commit 11126c611e10abb18b6f1ed0300c0548c3906b54 drivers/rtc/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index e069f17..19c03ab 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -59,6 +59,7 @@ comment "RTC interfaces" config RTC_INTF_SYSFS boolean "/sys/class/rtc/rtcN (sysfs)" depends on SYSFS + default RTC_CLASS help Say yes here if you want to use your RTCs using sysfs interfaces, /sys/class/rtc/rtc0 through /sys/.../rtcN. @@ -68,6 +69,7 @@ config RTC_INTF_SYSFS config RTC_INTF_PROC boolean "/proc/driver/rtc (procfs for rtcN)" depends on PROC_FS + default RTC_CLASS help Say yes here if you want to use your system clock RTC through the proc interface, /proc/driver/rtc. @@ -79,6 +81,7 @@ config RTC_INTF_PROC config RTC_INTF_DEV boolean "/dev/rtcN (character devices)" + default RTC_CLASS help Say yes here if you want to use your RTCs using the /dev interfaces, which "udev" sets up as /dev/rtc0 through