From patchwork Fri Feb 26 18:19:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 589294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 23B231401CD for ; Sat, 27 Feb 2016 07:49:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932880AbcBZUs7 (ORCPT ); Fri, 26 Feb 2016 15:48:59 -0500 Received: from anholt.net ([50.246.234.109]:44554 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933860AbcBZUrg (ORCPT ); Fri, 26 Feb 2016 15:47:36 -0500 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 989F52C9C076; Fri, 26 Feb 2016 10:19:17 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id S9XsSWMiq3Jy; Fri, 26 Feb 2016 10:19:16 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id B182F2C9C073; Fri, 26 Feb 2016 10:19:16 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 4367DF0045B; Fri, 26 Feb 2016 10:19:16 -0800 (PST) From: Eric Anholt To: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephen Warren , Lee Jones , Florian Fainelli , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, Linus Walleij , linux-gpio@vger.kernel.org, Stefan Wahren , Eric Anholt Subject: [PATCH 3/5] ARM: bcm2835: Move the emmc pin group to bcm283x.dtsi. Date: Fri, 26 Feb 2016 10:19:14 -0800 Message-Id: <1456510756-15337-4-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456510756-15337-1-git-send-email-eric@anholt.net> References: <1456510756-15337-1-git-send-email-eric@anholt.net> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org While it's not documented in the public PDF, it is internally. This is a standard pin group for the 283x, not rpi-specific. Signed-off-by: Eric Anholt --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-a.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 ----- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 ++-- arch/arm/boot/dts/bcm283x.dtsi | 4 ++++ 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index 0a8b92e..1db6835 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -29,6 +29,6 @@ &pcm_gpio18 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index d093407..25d2114 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -22,6 +22,6 @@ &pcm_gpio28 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index c26b81d..d8057b8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -29,6 +29,6 @@ &pcm_gpio18 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index a5b606e..e7dbff4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -22,6 +22,6 @@ &pcm_gpio28 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 97e3c2f..d154049 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -21,6 +21,6 @@ &spi0_gpio7 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 141b18c..eff27b0 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -36,11 +36,6 @@ brcm,pins = <6>; brcm,function = ; }; - - alt3: alt3 { - brcm,pins = <48 49 50 51 52 53>; - brcm,function = ; - }; }; &i2c0 { diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 52798ca..3e9226f 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -33,6 +33,6 @@ &pcm_gpio18 &pwm0_gpio40 &pwm1_gpio45 - &gpioout - &alt3>; + &emmc_gpio48 + &gpioout>; }; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index e91198e..70a6814 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -232,6 +232,10 @@ brcm,pins = <32 33>; brcm,function = ; }; + emmc_gpio48: emmc_gpio48 { + brcm,pins = <48 49 50 51 52 53>; + brcm,function = ; + }; spi1_gpio16: spi1_gpio16 { brcm,pins = <16 17 18 19 20 21>; brcm,function = ;