From patchwork Tue Oct 15 21:22:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3048691 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 603509F243 for ; Tue, 15 Oct 2013 21:23:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 620EA2042B for ; Tue, 15 Oct 2013 21:23:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53F0B2042A for ; Tue, 15 Oct 2013 21:23:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWC4s-0006vF-95; Tue, 15 Oct 2013 21:22:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWC4p-0006Sf-MO; Tue, 15 Oct 2013 21:22:51 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWC4m-0006Qf-4u for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2013 21:22:48 +0000 Received: by mail-wg0-f49.google.com with SMTP id x12so6555260wgg.28 for ; Tue, 15 Oct 2013 14:22:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EA5ixw8OZctcqkU9AjwIzXScwS+nSy9PxZ6VrGBpLZU=; b=SfABsw2Qt2LL5mrFFsmUH4ptwy0SFxfw1Pgj+AEQJjCcKABrcNQmZXDIDJi+WiI647 d+DV9w7b3JRsQVVnJAhmwOYYmR21rsUq9cTGE+5wJIm2v46pNK54fYmYV2jrWFwvHDoF d+sed0q9mmrhzn8Crs+oiJ5dzSmkQuVYxXbOa+kP8lL6WqUzGO7vFLlh+YbPiW0fQ0Uu 3cPzpqBM7TRySFa0AAvcCVQguopO1n5ypeBw/9LPSQhx6LCR+Y48ffd+1LB/Uyr97B9a HLCc/JiWmlBAJwS1780zMl+z+ZM1ZoS5MkSnBe0NzZG4chCy3KpX3jFGDzNAXokecodw MyNw== X-Gm-Message-State: ALoCoQkIH+Reu4n/hni9hXtdX75O9xXuMkhx10lm13CREbuzpkWNtcvUjEQoPvbEXa/3iryvolai X-Received: by 10.194.175.66 with SMTP id by2mr3585717wjc.59.1381872146291; Tue, 15 Oct 2013 14:22:26 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id e5sm429644wiy.2.2013.10.15.14.22.24 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Tue, 15 Oct 2013 14:22:25 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 5/5] ARM: ux500: adjust the TC3589x devices to the binding Date: Tue, 15 Oct 2013 23:22:20 +0200 Message-Id: <1381872140-23509-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131015_172248_304459_FDB8F953 X-CRM114-Status: GOOD ( 11.85 ) X-Spam-Score: -2.6 (--) Cc: Linus Walleij , Lee Jones , linux-kernel@vger.kernel.org, Samuel Ortiz X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.7 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 The TC3589x devices appearing in the ST Ericsson device trees are adjusted to use the new binding so this is in a good shape, and we add the keypad on the TVK1281618 UIB so this is working again. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 39 +++++++++++++++++++++++++----- arch/arm/boot/dts/ste-hrefprev60.dtsi | 8 +++--- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 76d3ef1..4c539bb 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -15,26 +15,53 @@ / { soc { - /* Add Synaptics touch screen, TC35892 keypad etc here */ + /* Add Synaptics touch screen, TC35893 keypad etc here */ i2c@80004000 { - tc3589x@44 { - compatible = "tc3589x"; + tc35893@44 { + compatible = "toshiba,tc35893"; reg = <0x44>; interrupt-parent = <&gpio6>; interrupts = <26 IRQ_TYPE_EDGE_RISING>; interrupt-controller; - #interrupt-cells = <2>; + #interrupt-cells = <1>; tc3589x_gpio { - compatible = "tc3589x-gpio"; - interrupts = <0 IRQ_TYPE_EDGE_RISING>; + compatible = "toshiba,tc3589x-gpio"; + interrupts = <0>; interrupt-controller; #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>; }; + tc3589x_keypad { + compatible = "toshiba,tc3589x-keypad"; + interrupts = <6>; + debounce-delay-ms = <4>; + keypad,num-columns = /bits/ 8 <8>; + keypad,num-rows = /bits/ 8 <8>; + linux,no-autorepeat; + linux,wakeup; + linux,keymap = <0x0301006b + 0x04010066 + 0x06040072 + 0x040200d7 + 0x0303006a + 0x0205000e + 0x0607008b + 0x0500001c + 0x0403000b + 0x03040034 + 0x05020067 + 0x0305006c + 0x040500e7 + 0x0005009e + 0x06020073 + 0x01030039 + 0x07060069 + 0x050500d9>; + }; }; }; }; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index b2cd7bc..6b271a4 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -28,18 +28,18 @@ reg = <0x33>; }; - tc3589x@42 { - compatible = "tc3589x"; + tc35892@42 { + compatible = "toshiba,tc35892"; reg = <0x42>; interrupt-parent = <&gpio6>; interrupts = <25 IRQ_TYPE_EDGE_RISING>; interrupt-controller; - #interrupt-cells = <2>; + #interrupt-cells = <1>; tc3589x_gpio: tc3589x_gpio { compatible = "tc3589x-gpio"; - interrupts = <0 IRQ_TYPE_EDGE_RISING>; + interrupts = <0>; interrupt-controller; #interrupt-cells = <2>;