From: Eric Anholt <eric@anholt.net>
To: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Stephen Warren <swarren@wwwdotorg.org>,
Lee Jones <lee@kernel.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
devicetree@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org,
Stefan Wahren <stefan.wahren@i2se.com>,
Eric Anholt <eric@anholt.net>
Subject: [PATCH 5/5] ARM: bcm2835: Move most RPi default pin groups to their devices.
Date: Fri, 26 Feb 2016 10:19:16 -0800 [thread overview]
Message-ID: <1456510756-15337-6-git-send-email-eric@anholt.net> (raw)
In-Reply-To: <1456510756-15337-1-git-send-email-eric@anholt.net>
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 <eric@anholt.net>
---
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 1db6835..a00cbbe 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -20,15 +20,7 @@
};
};
-&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>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 25d2114..23e6b6f 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -13,15 +13,7 @@
};
};
-&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>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index d8057b8..029b589 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -20,15 +20,7 @@
};
};
-&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>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index e7dbff4..da1bc27 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -13,15 +13,7 @@
};
};
-&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>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index d154049..df275d4 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -12,15 +12,3 @@
};
};
};
-
-&gpio {
- pinctrl-0 = <&i2c0_gpio0
- &i2c1_gpio2
- &gpclk0_gpio4
- &gpclk1_gpio5
- &spi0_gpio7
- &pwm0_gpio40
- &pwm1_gpio45
- &emmc_gpio48
- &gpioout>;
-};
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index eff27b0..b8efd41 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,14 +62,25 @@
};
&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";
};
&usb {
power-domains = <&power RPI_POWER_DOMAIN_USB>;
};
+
+&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 3e9226f..ae2bc91 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -24,15 +24,7 @@
};
};
-&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>;
};
--
2.7.0
next prev parent reply other threads:[~2016-02-26 20:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 18:19 [PATCH 0/5] BCM2835 pinctrl DT rework (resend) Eric Anholt
2016-02-26 18:19 ` [PATCH 1/5] ARM: bcm2835: Define standard pinctrl groups in the gpio node Eric Anholt
2016-03-03 21:20 ` Stephen Warren
2016-03-03 22:23 ` Eric Anholt
2016-03-03 22:32 ` Stephen Warren
2016-03-04 9:27 ` Martin Sperl
2016-02-26 18:19 ` [PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups Eric Anholt
2016-03-03 21:26 ` Stephen Warren
2016-03-03 22:28 ` Eric Anholt
2016-03-03 22:34 ` Stephen Warren
2016-03-08 8:24 ` Linus Walleij
2016-03-08 16:42 ` Stephen Warren
2016-02-26 18:19 ` [PATCH 3/5] ARM: bcm2835: Move the emmc pin group to bcm283x.dtsi Eric Anholt
2016-02-26 18:19 ` [PATCH 4/5] ARM: bcm2835: Add a group for mapping pins 48-53 to sdhost Eric Anholt
2016-02-26 18:19 ` Eric Anholt [this message]
2016-03-08 8:25 ` [PATCH 5/5] ARM: bcm2835: Move most RPi default pin groups to their devices Linus Walleij
[not found] <1456425661-26123-1-git-send-email-eric@anholt.net>
2016-02-25 18:41 ` Eric Anholt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456510756-15337-6-git-send-email-eric@anholt.net \
--to=eric@anholt.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=lee@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=stefan.wahren@i2se.com \
--cc=swarren@wwwdotorg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox