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: 21063 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 76AD220D84 for ; Tue, 15 Oct 2013 21:22:28 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e12sf1650475vbg.8 for ; Tue, 15 Oct 2013 14:22:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state: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=EA5ixw8OZctcqkU9AjwIzXScwS+nSy9PxZ6VrGBpLZU=; b=CrYnh828g6LCdB7Xvm2yao2RRfHY0+smy0X+8nHJ2jlW1Otmn82FFccZe2pvpEL7te 95vNsrXH5rQUyy9wthEk1uxgt7QPOd1iy6UruJBtzsKVoj9Tm4VgFAGw4jIPj2vQ07k7 o6MDlVvE+hKJLbvd5ZiNOjrNkLDrVNoMKJ56d67mbDsiuSS5Sd/sS7QZnxPGfKjr1wxK wXxw1UV1uct6/MQ2ChuylmjAoPwsQN9vmx6JopBjSJaGVjT7PRjkZpiIwLCof0vzG0ed ag4LPtbtgF1LZ8PIF3M6VRaYpyMpB6YsglwbUrV2+G/ZHZEvD3QyVdzLkxqy+4/GkVdb PHoQ== X-Received: by 10.236.32.74 with SMTP id n50mr41453054yha.13.1381872148036; Tue, 15 Oct 2013 14:22:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.167 with SMTP id l7ls305925qeh.47.gmail; Tue, 15 Oct 2013 14:22:27 -0700 (PDT) X-Received: by 10.58.107.204 with SMTP id he12mr2268159veb.26.1381872147907; Tue, 15 Oct 2013 14:22:27 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id sw5si4026145veb.99.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:22:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so5408717vbe.41 for ; Tue, 15 Oct 2013 14:22:27 -0700 (PDT) X-Gm-Message-State: ALoCoQlf9+idNjKZJYixnFKI6KuyP9k0dq333SUgGzjtywZpvnIzjqa+eLBCUQL4MaU6dSzFQvGD X-Received: by 10.58.108.196 with SMTP id hm4mr2240318veb.28.1381872147829; Tue, 15 Oct 2013 14:22:27 -0700 (PDT) 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 u4csp329434vcz; Tue, 15 Oct 2013 14:22:27 -0700 (PDT) X-Received: by 10.180.109.165 with SMTP id ht5mr21240999wib.54.1381872146720; Tue, 15 Oct 2013 14:22:26 -0700 (PDT) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by mx.google.com with ESMTPS id dd1si27905299wjc.24.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:22:26 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.47 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.47; Received: by mail-wg0-f47.google.com with SMTP id c11so4379263wgh.2 for ; Tue, 15 Oct 2013 14:22:26 -0700 (PDT) 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 Cc: linux-kernel@vger.kernel.org, Samuel Ortiz , Lee Jones , Linus Walleij 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-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.212.54 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 --- 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>;