From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbcFAVxR (ORCPT ); Wed, 1 Jun 2016 17:53:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41106 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbcFAVn4 (ORCPT ); Wed, 1 Jun 2016 17:43:56 -0400 From: Gerd Hoffmann To: linux-rpi-kernel@lists.infradead.org Cc: Eric Anholt , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Stephen Warren , Lee Jones , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-kernel@vger.kernel.org (open list) 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-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) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 { -- 1.8.3.1