Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1344666
| From | Eric Anholt <eric@anholt.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups. |
| Date | 2016-02-26 21:50 +0100 |
| Message-ID | <r6xuN-j0-7@gated-at.bofh.it> (permalink) |
| References | <r6xuN-j0-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Since all of these pins were documented, we can use their names to
explain what's going on.
Signed-off-by: Eric Anholt <eric@anholt.net>
---
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 17 ++++++++++-------
arch/arm/boot/dts/bcm2835-rpi-a.dts | 17 ++++++++++-------
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 17 ++++++++++-------
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 17 ++++++++++-------
arch/arm/boot/dts/bcm2835-rpi-b.dts | 10 +++++++++-
arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 -----
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 17 ++++++++++-------
7 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 228614f..0a8b92e 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -21,11 +21,14 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
-
- /* I2S interface */
- i2s_alt0: i2s_alt0 {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pcm_gpio18
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index ddbbbbd..d093407 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -14,11 +14,14 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
-
- /* I2S interface */
- i2s_alt2: i2s_alt2 {
- brcm,pins = <28 29 30 31>;
- brcm,function = <BCM2835_FSEL_ALT2>;
- };
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pcm_gpio28
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index ef54050..c26b81d 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -21,11 +21,14 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
-
- /* I2S interface */
- i2s_alt0: i2s_alt0 {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pcm_gpio18
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index 86f1f2f..a5b606e 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -14,11 +14,14 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
-
- /* I2S interface */
- i2s_alt2: i2s_alt2 {
- brcm,pins = <28 29 30 31>;
- brcm,function = <BCM2835_FSEL_ALT2>;
- };
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pcm_gpio28
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 4859e9d..97e3c2f 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -14,5 +14,13 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &alt3>;
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 76bdbca..141b18c 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -37,11 +37,6 @@
brcm,function = <BCM2835_FSEL_GPIO_OUT>;
};
- alt0: alt0 {
- brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
-
alt3: alt3 {
brcm,pins = <48 49 50 51 52 53>;
brcm,function = <BCM2835_FSEL_ALT3>;
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index ff94666..52798ca 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -25,11 +25,14 @@
};
&gpio {
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
-
- /* I2S interface */
- i2s_alt0: i2s_alt0 {
- brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>;
- };
+ pinctrl-0 = <&i2c0_gpio0
+ &i2c1_gpio2
+ &gpclk0_gpio4
+ &gpclk1_gpio5
+ &spi0_gpio7
+ &pcm_gpio18
+ &pwm0_gpio40
+ &pwm1_gpio45
+ &gpioout
+ &alt3>;
};
--
2.7.0
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups. Eric Anholt <eric@anholt.net> - 2016-02-26 21:50 +0100
Re: [PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups. Stephen Warren <swarren@wwwdotorg.org> - 2016-03-03 22:30 +0100
Re: [PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups. Eric Anholt <eric@anholt.net> - 2016-03-03 23:40 +0100
Re: [PATCH 2/5] ARM: bcm2835: Replace alt0/i2s_alt[02] with standard groups. Stephen Warren <swarren@wwwdotorg.org> - 2016-03-03 23:40 +0100
csiph-web