From patchwork Fri Nov 20 01:46:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Sigurdsson X-Patchwork-Id: 7663821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 78A999F2E2 for ; Fri, 20 Nov 2015 01:52:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB22D204D1 for ; Fri, 20 Nov 2015 01:52:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0DDD204A0 for ; Fri, 20 Nov 2015 01:52:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zzaqd-00060X-No; Fri, 20 Nov 2015 01:50:47 +0000 Received: from dd34104.kasserver.com ([85.13.151.79]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzanV-0002I2-UI for linux-arm-kernel@lists.infradead.org; Fri, 20 Nov 2015 01:47:43 +0000 Received: from localhost.localdomain (HSI-KBW-149-172-55-237.hsi13.kabel-badenwuerttemberg.de [149.172.55.237]) by dd34104.kasserver.com (Postfix) with ESMTPSA id CA4016C80940; Fri, 20 Nov 2015 02:47:13 +0100 (CET) From: Timo Sigurdsson To: tyler.baker@linaro.org, info@gerhard-bertelsmann.de, plaes@plaes.org, rafael.j.wysocki@intel.com, linux@arm.linux.org.uk, maxime.ripard@free-electrons.com, carlo@caione.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, wens@csie.org Subject: [PATCH v2 2/3] ARM: sunxi: Really enable LRADC keys in sunxi_defconfig Date: Fri, 20 Nov 2015 02:46:18 +0100 Message-Id: <1447983979-12751-2-git-send-email-public_timo.s@silentcreek.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447983979-12751-1-git-send-email-public_timo.s@silentcreek.de> References: <1447724578-4786-1-git-send-email-public_timo.s@silentcreek.de> <1447983979-12751-1-git-send-email-public_timo.s@silentcreek.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151119_174734_877072_0B15E8DF X-CRM114-Status: UNSURE ( 8.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sunxi@googlegroups.com, Timo Sigurdsson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit be8becb81bdc ("ARM: sunxi_defconfig: Enable LRADC keys (KEYBOARD_SUN4I_LRADC)") added CONFIG_KEYBOARD_SUN4I_LRADC=y to sunxi_defconfig. However, it depends on CONFIG_KEYBOARD which is explicitly disabled in sunxi_defconfig. Hence, the LRADC keys were never actually enabled. Remove the line disabling CONFIG_KEYBOARD in order to really enable KEYBOARD_SUN4I_LRADC. Signed-off-by: Timo Sigurdsson Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 0bbc2ee..90252ca 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -60,7 +60,6 @@ CONFIG_STMMAC_ETH=y # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_AXP20X_PEK=y