From patchwork Tue Nov 12 14:16:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21465 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D5A123FBE for ; Tue, 12 Nov 2013 14:16:37 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y13sf7921312pdi.4 for ; Tue, 12 Nov 2013 06:16:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=N9GQsY2f+cd+88IOUaKbh4GpijhIlvoSo7pKvvNUr7Y=; b=fKSomhT5LG+0D5/x7R8uD92+kc2IGGVTqFDsLH6jOO6Vk/Yc/FMC1QUbBolkJ9eEL8 hN07jQ0vnhGtElD5idb4oWGQtsOuoeGh4GjGgy22+1khcxu4a/rDbJB+RYJlviQd3w+3 sTz58GCg071piIFs6vrMXJKHK52JLfrzH7V4a7nz8A/Ufxh9YfGpyzH4ajq+DmwI8dfV /DS/aBkNdRBd4nSX9YoqyuLJISahwMik4iFcMILfNgww8iKHuI2QrpwyTNooV7Xp00Pc bIZpIBoPVq+oKTYB3ML9Q+YCxItcHebURca/XS4gl87RJ3ce7XM185+F171cDQEogyvW /7gg== X-Gm-Message-State: ALoCoQl8Jrt+veCFn6EbVDQPtfXKSG7zM6QKb1Xr+nIUQpW3aC5PKmJKFaI/NQh91vZ7Lk7zEDas X-Received: by 10.66.6.70 with SMTP id y6mr11222730pay.22.1384265796213; Tue, 12 Nov 2013 06:16:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.72.68 with SMTP id b4ls100176qev.97.gmail; Tue, 12 Nov 2013 06:16:35 -0800 (PST) X-Received: by 10.52.35.136 with SMTP id h8mr24113060vdj.6.1384265795954; Tue, 12 Nov 2013 06:16:35 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id a6si12082944vdp.65.2013.11.12.06.16.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 06:16:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hu8so4324804vcb.14 for ; Tue, 12 Nov 2013 06:16:35 -0800 (PST) X-Received: by 10.221.6.195 with SMTP id ol3mr501763vcb.34.1384265795841; Tue, 12 Nov 2013 06:16:35 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp165750vcz; Tue, 12 Nov 2013 06:16:35 -0800 (PST) X-Received: by 10.194.21.225 with SMTP id y1mr1369861wje.60.1384265794896; Tue, 12 Nov 2013 06:16:34 -0800 (PST) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx.google.com with ESMTPS id ez4si11732546wjd.25.2013.11.12.06.16.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 06:16:34 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.182 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.182; Received: by mail-we0-f182.google.com with SMTP id x55so2079333wes.13 for ; Tue, 12 Nov 2013 06:16:34 -0800 (PST) X-Received: by 10.180.187.175 with SMTP id ft15mr16665037wic.20.1384265794366; Tue, 12 Nov 2013 06:16:34 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id y20sm8407987wib.0.2013.11.12.06.16.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 06:16:33 -0800 (PST) From: Linus Walleij To: devicetree@vger.kernel.org, Samuel Ortiz , Lee Jones Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland , Linus Walleij Subject: [PATCH 5/5 v2] ARM: ux500: adjust the TC3589x devices to the binding Date: Tue, 12 Nov 2013 15:16:25 +0100 Message-Id: <1384265785-11165-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- ChangeLog v1->v2: - Adjust DT to match the u32 rows/columns binding. --- 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 76d3ef13175f..61b180ea92ca 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 = <8>; + keypad,num-rows = <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 b2cd7bc2752f..6b271a410d03 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>;