From patchwork Mon Aug 11 18:47:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4709201 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 A7E4A9F375 for ; Mon, 11 Aug 2014 18:50:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5CC42010B for ; Mon, 11 Aug 2014 18:50:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 121D0200D6 for ; Mon, 11 Aug 2014 18:50:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XGudZ-0002AC-K3; Mon, 11 Aug 2014 18:48:05 +0000 Received: from mail-qg0-f73.google.com ([209.85.192.73]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XGudX-000262-FX for linux-arm-kernel@lists.infradead.org; Mon, 11 Aug 2014 18:48:04 +0000 Received: by mail-qg0-f73.google.com with SMTP id q107so1131603qgd.2 for ; Mon, 11 Aug 2014 11:47:36 -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=ADEcTSqUM+u7F8Em9pvPepIAYrgGmJSDIlqClsK5Wb4=; b=IogvGkpIdf2T4fF3QpVMLZZJ5WKYuIuy5mAzgMQrlXoU7TSxBKx5Zs1uOveufvZKb7 pVk56tBD0x2GC/t65Ohfiy1I7acms4qqFeIgjiqxO00LhGmCx2AwYZ6P7Mf4Z4QwZ9AS iAA3HKElaFXOVv3KTGixtJvayCgng8zyBNY+AP4IfiSc+7TR45cMEXI4+fX6bszawhcC G63QwLW5v+mR/e/oaslhHJoWlXqtVDLNjkjSlwU9OrOgFjuFsgS/sQKjjRHQJeRtFJwL 7+5U5yjQomwT9Be815RaHz468TQx34JZIGO3u5vPUe5/XN3RuljY+/k93snVyg22/j0T hf3w== X-Gm-Message-State: ALoCoQnuUPaicYgleEPAVYSw6pMGRQlj8H5feN8Q3p6xv66flWR6DwPe30SD8s6Q8ChUthAFc1nR X-Received: by 10.236.150.110 with SMTP id y74mr16345688yhj.7.1407782856329; Mon, 11 Aug 2014 11:47:36 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id h42si537033yhj.3.2014.08.11.11.47.36 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Aug 2014 11:47:36 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 287245A4583; Mon, 11 Aug 2014 11:47:36 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id B5BCC806D7; Mon, 11 Aug 2014 11:47:35 -0700 (PDT) From: Doug Anderson To: Heiko Stuebner Subject: [PATCH] ARM: dts: Move the PMIC interrupt pinctrl line to rk3288-evb common Date: Mon, 11 Aug 2014 11:47:29 -0700 Message-Id: <1407782849-11056-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140811_114803_590526_0D90C842 X-CRM114-Status: GOOD ( 12.19 ) X-Spam-Score: -2.0 (--) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux@arm.linux.org.uk, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, Kever Yang , Doug Anderson , robh+dt@kernel.org, galak@codeaurora.org, Chris Zhong , Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 PMIC interrupt pinctrl line was added to the rk3288-evb-act8846, but it's the same line on both the ACT8846 version and the RK808 version. This makes a lot of sense since they share the same SoC daugherboard. Move the pinctrl definition to the common file so we can use it for the RK808 version. NOTE: The PMIC interrupt doesn't _actually_ go to the PMIC on the ACT8846 version of the board (it does on the RK808), but our convention is to label things as they're labelled on the schematics. In the very least you can argue that this is the interrupt from the PMIC daughtercard even if it doesn't actually go to the PMIC chip. Signed-off-by: Doug Anderson --- arch/arm/boot/dts/rk3288-evb-act8846.dts | 10 +--------- arch/arm/boot/dts/rk3288-evb.dtsi | 6 ++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts index 7d59ff4..a76dd44 100644 --- a/arch/arm/boot/dts/rk3288-evb-act8846.dts +++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts @@ -26,7 +26,7 @@ interrupts = <4 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; + pinctrl-0 = <&pmic_int>; #clock-cells = <0>; clock-output-names = "xin32k"; @@ -124,11 +124,3 @@ }; }; }; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = ; - }; - }; -}; diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 4f57209..ae3e10b 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -84,6 +84,12 @@ }; }; + pmic { + pmic_int: pmic-int { + rockchip,pins = ; + }; + }; + usb { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;