From patchwork Wed Jun 1 21:43:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9148417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BBB85600BC for ; Wed, 1 Jun 2016 22:03:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACCD82714B for ; Wed, 1 Jun 2016 22:03:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FAAF27151; Wed, 1 Jun 2016 22:03:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 41D222714B for ; Wed, 1 Jun 2016 22:03:46 +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 1b8EDv-0003Fj-GS; Wed, 01 Jun 2016 22:02:47 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b8Dw0-0007Ij-1d; Wed, 01 Jun 2016 21:44:24 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 839A246298; Wed, 1 Jun 2016 21:43:55 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u51Lhq9J001179; Wed, 1 Jun 2016 17:43:54 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 6BB5F81D29; Wed, 1 Jun 2016 23:43:54 +0200 (CEST) From: Gerd Hoffmann To: linux-rpi-kernel@lists.infradead.org Subject: [PATCH 18/32] ARM: bcm2835: Move most RPi default pin groups to their devices. Date: Wed, 1 Jun 2016 23:43:27 +0200 Message-Id: <1464817421-8519-19-git-send-email-kraxel@redhat.com> In-Reply-To: <1464817421-8519-1-git-send-email-kraxel@redhat.com> References: <1464817421-8519-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 01 Jun 2016 21:43:55 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160601_144416_550083_DF06A87A X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Lee Jones , Pawel Moll , Ian Campbell , Stephen Warren , Russell King , open list , Eric Anholt , Rob Herring , Kumar Gala , "moderated list:ARM PORT" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Anholt This way we can get the duplicated pin group definitions out of each RPi board file, and just leave the i2s variations in them. Signed-off-by: Eric Anholt Conflicts: arch/arm/boot/dts/bcm2835-rpi-b.dts arch/arm/boot/dts/bcm2835-rpi.dtsi --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 14 +++----------- arch/arm/boot/dts/bcm2835-rpi-a.dts | 14 +++----------- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 14 +++----------- arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 14 +++----------- arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 ------------ arch/arm/boot/dts/bcm2835-rpi.dtsi | 20 ++++++++++++++++++++ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 14 +++----------- 7 files changed, 35 insertions(+), 67 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index 5bd0bfe..670ae70 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -20,17 +20,9 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pcm_gpio18 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; +&i2s { + pinctrl-names = "default"; + pinctrl-0 = <&pcm_gpio18>; }; &hdmi { diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index ba1b0ac..e980637 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -13,17 +13,9 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pcm_gpio28 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; +&i2s { + pinctrl-names = "default"; + pinctrl-0 = <&pcm_gpio28>; }; &hdmi { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 609a5e8..312d977 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -21,17 +21,9 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pcm_gpio18 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; +&i2s { + pinctrl-names = "default"; + pinctrl-0 = <&pcm_gpio18>; }; &hdmi { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index 97de2d5..3d1d061 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -14,17 +14,9 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pcm_gpio28 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; +&i2s { + pinctrl-names = "default"; + pinctrl-0 = <&pcm_gpio28>; }; &hdmi { diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index bc59f7e..0f96582 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -14,18 +14,6 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; -}; - &hdmi { hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 7e65d16..a207693 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -31,6 +31,9 @@ &gpio { pinctrl-names = "default"; + pinctrl-0 = <&gpclk0_gpio4 + &gpclk1_gpio5 + &gpioout>; gpioout: gpioout { brcm,pins = <6>; @@ -39,11 +42,17 @@ }; &i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_gpio0>; + status = "okay"; clock-frequency = <100000>; }; &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_gpio2>; + status = "okay"; clock-frequency = <100000>; }; @@ -53,11 +62,17 @@ }; &sdhci { + pinctrl-names = "default"; + pinctrl-0 = <&emmc_gpio48>; + status = "okay"; bus-width = <4>; }; &pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>; + status = "okay"; }; @@ -73,3 +88,8 @@ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; status = "okay"; }; + +&spi { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_gpio7>; +}; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index b4cbffe..e6e1791 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -25,17 +25,9 @@ }; }; -&gpio { - pinctrl-0 = <&i2c0_gpio0 - &i2c1_gpio2 - &gpclk0_gpio4 - &gpclk1_gpio5 - &spi0_gpio7 - &pcm_gpio18 - &pwm0_gpio40 - &pwm1_gpio45 - &emmc_gpio48 - &gpioout>; +&i2s { + pinctrl-names = "default"; + pinctrl-0 = <&pcm_gpio18>; }; &hdmi {