From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932230Ab2DXJwF (ORCPT ); Tue, 24 Apr 2012 05:52:05 -0400 Received: from mail.work-microwave.de ([62.245.205.51]:57887 "EHLO work-microwave.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932170Ab2DXJwB (ORCPT ); Tue, 24 Apr 2012 05:52:01 -0400 From: Roland Stigge To: dmitry.torokhov@gmail.com, axel.lin@gmail.com, riyer@nvidia.com, michael.hennerich@analog.com, grant.likely@secretlab.ca, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kevin.wells@nxp.com, srinivas.bakki@nxp.com Cc: Roland Stigge Subject: [PATCH 2/2] ARM: LPC32xx: Make platform use key driver Date: Tue, 24 Apr 2012 11:51:08 +0200 Message-Id: <1335261068-18640-2-git-send-email-stigge@antcom.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1335261068-18640-1-git-send-email-stigge@antcom.de> References: <1335261068-18640-1-git-send-email-stigge@antcom.de> X-FEAS-SYSTEM-WL: rst@work-microwave.de, 192.168.11.78 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch connects the lpc32xx-key driver to the LPC32xx platform (via lpc32xx.dtsi), and more specifically to the reference board via its dts file. The clock.c file needs to be changed to match the automatic device name to its clock. Signed-off-by: Roland Stigge --- Applies to v3.4-rc4 + LPC32xx DT patches Please pick this patch for the arm-soc subsystem. arch/arm/boot/dts/lpc32xx.dtsi | 2 ++ arch/arm/boot/dts/phy3250.dts | 10 ++++++++++ arch/arm/mach-lpc32xx/clock.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) --- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi +++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi @@ -285,6 +285,8 @@ key@40050000 { compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; + interrupts = <54 0>; + status = "disable"; }; }; --- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts +++ linux-2.6/arch/arm/boot/dts/phy3250.dts @@ -124,6 +124,16 @@ tsc@40048000 { status = "okay"; }; + + key@40050000 { + status = "okay"; + nxp,matrix-size = <1>; + nxp,debounce-delay-ms = <3>; + nxp,scan-delay-ms = <34>; + key_1 { + linux,code = <2>; + }; + }; }; }; --- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c +++ linux-2.6/arch/arm/mach-lpc32xx/clock.c @@ -1131,7 +1131,7 @@ static struct clk_lookup lookups[] = { CLKDEV_INIT("31020300.i2c", NULL, &clk_i2c2), CLKDEV_INIT("dev:ssp0", NULL, &clk_ssp0), CLKDEV_INIT("dev:ssp1", NULL, &clk_ssp1), - CLKDEV_INIT("lpc32xx_keys.0", NULL, &clk_kscan), + CLKDEV_INIT("40050000.key", NULL, &clk_kscan), CLKDEV_INIT("lpc32xx-nand.0", "nand_ck", &clk_nand), CLKDEV_INIT("200b0000.flash", "nand_ck_mlc", &clk_nand_mlc), CLKDEV_INIT("40048000.adc", NULL, &clk_adc),