From patchwork Thu Oct 3 11:30:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20776 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 528FF266EC for ; Thu, 3 Oct 2013 11:30:58 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht10sf3082092vcb.1 for ; Thu, 03 Oct 2013 04:30:58 -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=+P0YijXGti6utSaGQH7Latz2SNCMTRIhysAdJNvBhrY=; b=aAB6wLXD3LUvLvC3Ar8XziGcep2evKa+alStI6fjtg2CMFHYfTPwF40ARtykC2Yyu8 PJg82dTKBtAfQUF05bCT1ORFDpJRF2jErc0PxBNGS5dbFh7f3VFQr6KMrmE0/NzTc93y dOty4/Ue4LfhXl/D6rzV+I84HGDdwvwMQiWgfjBfeCVPSkdDGFjhCHbXZrOu95XjWVZq 2fZP7Waq2oxneQPDnNImRPfGPKa4M8zbs+TBpOtxKeYkuy09LDHdTddAPl21+oJ1aB7X sQkLKa0uuYtln20YFeB4oJFjsMZ7qe/33MxoqKhOEOqjwrK0Jbj/wyRB6qnbT5xK06Jp T5jg== X-Received: by 10.236.135.79 with SMTP id t55mr7449241yhi.39.1380799858161; Thu, 03 Oct 2013 04:30:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.133 with SMTP id h5ls339584qej.54.gmail; Thu, 03 Oct 2013 04:30:58 -0700 (PDT) X-Received: by 10.58.179.104 with SMTP id df8mr387243vec.26.1380799857997; Thu, 03 Oct 2013 04:30:57 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id s17si1606821vcu.89.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:30:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id cz12so1630073veb.32 for ; Thu, 03 Oct 2013 04:30:57 -0700 (PDT) X-Gm-Message-State: ALoCoQn/QLjRPAEM7qkJam460inzkYWCyGpJKlZS7blmxHJtuW2i55FZdgYXd72d0FnMgXzVtGYV X-Received: by 10.58.67.9 with SMTP id j9mr6894582vet.3.1380799857884; Thu, 03 Oct 2013 04:30:57 -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 u4csp170423vcz; Thu, 3 Oct 2013 04:30:57 -0700 (PDT) X-Received: by 10.14.122.132 with SMTP id t4mr12151743eeh.20.1380799856804; Thu, 03 Oct 2013 04:30:56 -0700 (PDT) Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by mx.google.com with ESMTPS id z9si5463687eeo.346.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:30:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.176 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.176; Received: by mail-ea0-f176.google.com with SMTP id q16so1027557ead.35 for ; Thu, 03 Oct 2013 04:30:56 -0700 (PDT) X-Received: by 10.14.224.198 with SMTP id x46mr2804344eep.53.1380799856269; Thu, 03 Oct 2013 04:30:56 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id h45sm14705589eeg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:30:55 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Lee Jones , devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 06/10] ARM: ux500: move TC35892 at 0x42 to hrefprev60 Date: Thu, 3 Oct 2013 13:30:47 +0200 Message-Id: <1380799847-25928-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.128.173 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 TC35892 was mounted as a GPIO expander on the HREF prior to v60 and not in later versions, which instead use the Nomadik GPIO directly, so move it over to the hrefprev60 DTS file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href.dtsi | 22 ---------------------- arch/arm/boot/dts/ste-hrefprev60.dts | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index a561bc3..aa3f020 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -41,28 +41,6 @@ status = "okay"; }; - i2c@80004000 { - tc3589x@42 { - compatible = "tc3589x"; - reg = <0x42>; - interrupt-parent = <&gpio6>; - interrupts = <25 IRQ_TYPE_EDGE_RISING>; - - interrupt-controller; - #interrupt-cells = <2>; - - tc3589x_gpio: tc3589x_gpio { - compatible = "tc3589x-gpio"; - interrupts = <0 IRQ_TYPE_EDGE_RISING>; - - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - }; - }; - }; - i2c@80128000 { lp5521@33 { compatible = "national,lp5521"; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index 767fa21..5016dc9 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts @@ -30,6 +30,26 @@ compatible = "tps61052"; reg = <0x33>; }; + + tc3589x@42 { + compatible = "tc3589x"; + reg = <0x42>; + interrupt-parent = <&gpio6>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + + tc3589x_gpio: tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; + }; }; i2c@80110000 {