[PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[Stefan Wahren]

This patch series contains DT improvements for the Raspberry Pi.

Patch 1,2: Add missing vendor prefix and root compatible properties
Patch 3,4: Use constants for pin function instead of error-prone numbers

Changes in V2:
- add all currently known Raspberry Pi boards to binding documentation 
  as suggested by Stephen Warren

Stefan Wahren (4):
  dt-bindings: Add vendor prefix for Raspberry Pi
  dt-bindings: Add root properties for Raspberry Pi
  ARM: bcm2835: Add header file for pinctrl constants
  ARM: bcm2835: Use pinctrl header

 Documentation/devicetree/bindings/arm/bcm2835.txt  |   31 ++++++++++++++++++--
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts           |    4 +--
 arch/arm/boot/dts/bcm2835-rpi-b.dts                |    4 +--
 arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    8 ++---
 arch/arm/boot/dts/bcm2835.dtsi                     |    3 +-
 include/dt-bindings/pinctrl/bcm2835.h              |   27 +++++++++++++++++
 7 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 include/dt-bindings/pinctrl/bcm2835.h

-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 RESEND 1/4] dt-bindings: Add vendor prefix for Raspberry Pi

[Stefan Wahren]

Since the prefix is already in use, we need to add it in the
vendor list.

Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
---
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 5d2251a..0546f73 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -136,6 +136,7 @@ radxa	Radxa
 raidsonic	RaidSonic Technology GmbH
 ralink	Mediatek/Ralink Technology Corp.
 ramtron	Ramtron International
+raspberrypi	Raspberry Pi Foundation
 realtek Realtek Semiconductor Corp.
 renesas	Renesas Electronics Corporation
 ricoh	Ricoh Co. Ltd.
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 RESEND 2/4] dt-bindings: Add root properties for Raspberry Pi

[Stefan Wahren]

This patch adds root compatible properties for the following boards:
- Raspberry Pi Model A
- Raspberry Pi Model A+
- Raspberry Pi Model B
- Raspberry Pi Model B (no P5)
- Raspberry Pi Model B rev2
- Raspberry Pi Model B+
- Raspberry Pi Compute Module

Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
---
 Documentation/devicetree/bindings/arm/bcm2835.txt |   31 +++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm2835.txt
index ac68348..c78576b 100644
--- a/Documentation/devicetree/bindings/arm/bcm2835.txt
+++ b/Documentation/devicetree/bindings/arm/bcm2835.txt
@@ -1,8 +1,35 @@
 Broadcom BCM2835 device tree bindings
 -------------------------------------------
 
-Boards with the BCM2835 SoC shall have the following properties:
+Raspberry Pi Model A
+Required root node properties:
+compatible = "raspberrypi,model-a", "brcm,bcm2835";
 
-Required root node property:
+Raspberry Pi Model A+
+Required root node properties:
+compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
 
+Raspberry Pi Model B
+Required root node properties:
+compatible = "raspberrypi,model-b", "brcm,bcm2835";
+
+Raspberry Pi Model B (no P5)
+early model B with I2C0 rather than I2C1 routed to the expansion header
+Required root node properties:
+compatible = "raspberrypi,model-b-i2c0", "brcm,bcm2835";
+
+Raspberry Pi Model B rev2
+Required root node properties:
+compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
+
+Raspberry Pi Model B+
+Required root node properties:
+compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
+
+Raspberry Pi Compute Module
+Required root node properties:
+compatible = "raspberrypi,compute-module", "brcm,bcm2835";
+
+Generic BCM2835 board
+Required root node properties:
 compatible = "brcm,bcm2835";
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 RESEND 3/4] ARM: bcm2835: Add header file for pinctrl constants

[Stefan Wahren]

This new header file defines pincontrol constants to use
from bcm2835 DTS files for pincontrol properties option.

Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
---
 include/dt-bindings/pinctrl/bcm2835.h |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 include/dt-bindings/pinctrl/bcm2835.h

diff --git a/include/dt-bindings/pinctrl/bcm2835.h b/include/dt-bindings/pinctrl/bcm2835.h
new file mode 100644
index 0000000..6f0bc37
--- /dev/null
+++ b/include/dt-bindings/pinctrl/bcm2835.h
@@ -0,0 +1,27 @@
+/*
+ * Header providing constants for bcm2835 pinctrl bindings.
+ *
+ * Copyright (C) 2015 Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#ifndef __DT_BINDINGS_PINCTRL_BCM2835_H__
+#define __DT_BINDINGS_PINCTRL_BCM2835_H__
+
+/* brcm,function property */
+#define BCM2835_FSEL_GPIO_IN	0
+#define BCM2835_FSEL_GPIO_OUT	1
+#define BCM2835_FSEL_ALT5	2
+#define BCM2835_FSEL_ALT4	3
+#define BCM2835_FSEL_ALT0	4
+#define BCM2835_FSEL_ALT1	5
+#define BCM2835_FSEL_ALT2	6
+#define BCM2835_FSEL_ALT3	7
+
+#endif /* __DT_BINDINGS_PINCTRL_BCM2835_H__ */
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Stefan Wahren]

This patch converts all bcm2835 dts and dtsi files to use the pinctrl
header file.

Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
---
 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |    4 ++--
 arch/arm/boot/dts/bcm2835-rpi-b.dts      |    4 ++--
 arch/arm/boot/dts/bcm2835-rpi.dtsi       |    8 ++++----
 arch/arm/boot/dts/bcm2835.dtsi           |    3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index e479515..668442b 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "bcm2835-rpi.dtsi"
+#include "bcm2835-rpi.dtsi"
 
 / {
 	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
@@ -25,6 +25,6 @@
 	/* I2S interface */
 	i2s_alt0: i2s_alt0 {
 		brcm,pins = <18 19 20 21>;
-		brcm,function = <4>; /* alt0 */
+		brcm,function = <BCM2835_FSEL_ALT0>;
 	};
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index bafa46f..ee89b79 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "bcm2835-rpi.dtsi"
+#include "bcm2835-rpi.dtsi"
 
 / {
 	compatible = "raspberrypi,model-b", "brcm,bcm2835";
@@ -18,6 +18,6 @@
 	/* I2S interface */
 	i2s_alt2: i2s_alt2 {
 		brcm,pins = <28 29 30 31>;
-		brcm,function = <6>; /* alt2 */
+		brcm,function = <BCM2835_FSEL_ALT2>;
 	};
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index c706448..46780bb 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -1,4 +1,4 @@
-/include/ "bcm2835.dtsi"
+#include "bcm2835.dtsi"
 
 / {
 	memory {
@@ -21,17 +21,17 @@
 
 	gpioout: gpioout {
 		brcm,pins = <6>;
-		brcm,function = <1>; /* GPIO out */
+		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 = <4>; /* alt0 */
+		brcm,function = <BCM2835_FSEL_ALT0>;
 	};
 
 	alt3: alt3 {
 		brcm,pins = <48 49 50 51 52 53>;
-		brcm,function = <7>; /* alt3 */
+		brcm,function = <BCM2835_FSEL_ALT3>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 3342cb1..be9c914 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -1,4 +1,5 @@
-/include/ "skeleton.dtsi"
+#include <dt-bindings/pinctrl/bcm2835.h>
+#include "skeleton.dtsi"
 
 / {
 	compatible = "brcm,bcm2835";
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[Rob Herring]

On Thu, Jan 29, 2015 at 12:10 PM, Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> wrote:
> This patch series contains DT improvements for the Raspberry Pi.
>
> Patch 1,2: Add missing vendor prefix and root compatible properties
> Patch 3,4: Use constants for pin function instead of error-prone numbers
>
> Changes in V2:
> - add all currently known Raspberry Pi boards to binding documentation
>   as suggested by Stephen Warren
>
> Stefan Wahren (4):
>   dt-bindings: Add vendor prefix for Raspberry Pi
>   dt-bindings: Add root properties for Raspberry Pi
>   ARM: bcm2835: Add header file for pinctrl constants
>   ARM: bcm2835: Use pinctrl header
>
>  Documentation/devicetree/bindings/arm/bcm2835.txt  |   31 ++++++++++++++++++--
>  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
>  arch/arm/boot/dts/bcm2835-rpi-b-plus.dts           |    4 +--
>  arch/arm/boot/dts/bcm2835-rpi-b.dts                |    4 +--
>  arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    8 ++---
>  arch/arm/boot/dts/bcm2835.dtsi                     |    3 +-
>  include/dt-bindings/pinctrl/bcm2835.h              |   27 +++++++++++++++++
>  7 files changed, 67 insertions(+), 11 deletions(-)
>  create mode 100644 include/dt-bindings/pinctrl/bcm2835.h

Who do you intend to apply this? For the DT binding parts:

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[Stefan Wahren]

Am 04.02.2015 um 03:47 schrieb Rob Herring:
> On Thu, Jan 29, 2015 at 12:10 PM, Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> wrote:
>> This patch series contains DT improvements for the Raspberry Pi.
>>
>> Patch 1,2: Add missing vendor prefix and root compatible properties
>> Patch 3,4: Use constants for pin function instead of error-prone numbers
>>
>> Changes in V2:
>> - add all currently known Raspberry Pi boards to binding documentation
>>   as suggested by Stephen Warren
>>
>> Stefan Wahren (4):
>>   dt-bindings: Add vendor prefix for Raspberry Pi
>>   dt-bindings: Add root properties for Raspberry Pi
>>   ARM: bcm2835: Add header file for pinctrl constants
>>   ARM: bcm2835: Use pinctrl header
>>
>>  Documentation/devicetree/bindings/arm/bcm2835.txt  |   31 ++++++++++++++++++--
>>  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
>>  arch/arm/boot/dts/bcm2835-rpi-b-plus.dts           |    4 +--
>>  arch/arm/boot/dts/bcm2835-rpi-b.dts                |    4 +--
>>  arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    8 ++---
>>  arch/arm/boot/dts/bcm2835.dtsi                     |    3 +-
>>  include/dt-bindings/pinctrl/bcm2835.h              |   27 +++++++++++++++++
>>  7 files changed, 67 insertions(+), 11 deletions(-)
>>  create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
> Who do you intend to apply this? 

I thought of Stephen and Lee.

> For the DT binding parts:
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Thanks

Stefan

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[Stephen Warren]

On 02/03/2015 07:47 PM, Rob Herring wrote:
> On Thu, Jan 29, 2015 at 12:10 PM, Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> wrote:
>> This patch series contains DT improvements for the Raspberry Pi.
>>
>> Patch 1,2: Add missing vendor prefix and root compatible properties
>> Patch 3,4: Use constants for pin function instead of error-prone numbers
>>
>> Changes in V2:
>> - add all currently known Raspberry Pi boards to binding documentation
>>    as suggested by Stephen Warren
>>
>> Stefan Wahren (4):
>>    dt-bindings: Add vendor prefix for Raspberry Pi
>>    dt-bindings: Add root properties for Raspberry Pi
>>    ARM: bcm2835: Add header file for pinctrl constants
>>    ARM: bcm2835: Use pinctrl header
>>
>>   Documentation/devicetree/bindings/arm/bcm2835.txt  |   31 ++++++++++++++++++--
>>   .../devicetree/bindings/vendor-prefixes.txt        |    1 +
>>   arch/arm/boot/dts/bcm2835-rpi-b-plus.dts           |    4 +--
>>   arch/arm/boot/dts/bcm2835-rpi-b.dts                |    4 +--
>>   arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    8 ++---
>>   arch/arm/boot/dts/bcm2835.dtsi                     |    3 +-
>>   include/dt-bindings/pinctrl/bcm2835.h              |   27 +++++++++++++++++
>>   7 files changed, 67 insertions(+), 11 deletions(-)
>>   create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
>
> Who do you intend to apply this? For the DT binding parts:
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

I assume Lee Jones will take this through the Tegra tree, to avoid any 
potential conflicts with other changes to these files in that tree.

I do still want to double-check with the Pi Foundation's downstream tree 
what compatible values they use. If they already have board-specific 
values, and they're sane, it'd be nice to align with those. 
Unfortunately, I haven't got around to that yet:-(
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Stephen Warren]

On 01/29/2015 11:10 AM, Stefan Wahren wrote:
> This patch converts all bcm2835 dts and dtsi files to use the pinctrl
> header file.

The series,
Reviewed-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>

Sorry for taking a while with this.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Stefan Wahren]

> Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> hat am 9. Februar 2015 um 19:09
> geschrieben:
>
>
> On 01/29/2015 11:10 AM, Stefan Wahren wrote:
> > This patch converts all bcm2835 dts and dtsi files to use the pinctrl
> > header file.
>
> The series,
> Reviewed-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>
> Sorry for taking a while with this.

Fine, but is this series already applied?

Stefan
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Stephen Warren]

On 02/21/2015 04:39 AM, Stefan Wahren wrote:
>> Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> hat am 9. Februar 2015 um 19:09
>> geschrieben:
>>
>>
>> On 01/29/2015 11:10 AM, Stefan Wahren wrote:
>>> This patch converts all bcm2835 dts and dtsi files to use the pinctrl
>>> header file.
>>
>> The series,
>> Reviewed-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
>>
>> Sorry for taking a while with this.
>
> Fine, but is this series already applied?

It doesn't look like it. I was under the impression that Lee was 
applying bcm2835 patches now, hence why I simply gave my reviewed-by tag 
rather than doing anything else. Lee, can you comment?
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Lee Jones]

On Mon, 23 Feb 2015, Stephen Warren wrote:

> On 02/21/2015 04:39 AM, Stefan Wahren wrote:
> >>Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> hat am 9. Februar 2015 um 19:09
> >>geschrieben:
> >>
> >>
> >>On 01/29/2015 11:10 AM, Stefan Wahren wrote:
> >>>This patch converts all bcm2835 dts and dtsi files to use the pinctrl
> >>>header file.
> >>
> >>The series,
> >>Reviewed-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
> >>
> >>Sorry for taking a while with this.
> >
> >Fine, but is this series already applied?
> 
> It doesn't look like it. I was under the impression that Lee was
> applying bcm2835 patches now, hence why I simply gave my reviewed-by
> tag rather than doing anything else. Lee, can you comment?

All I can do is apologise.  My filters are working correct, but my
notifications were shot for some reason.  Anyway, I'm back on it now.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 1/4] dt-bindings: Add vendor prefix for Raspberry Pi

[Lee Jones]

On Thu, 29 Jan 2015, Stefan Wahren wrote:

> Since the prefix is already in use, we need to add it in the
> vendor list.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
> ---
>  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
>  1 file changed, 1 insertion(+)

Applied, with Rob's Ack.

> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
> index 5d2251a..0546f73 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@ -136,6 +136,7 @@ radxa	Radxa
>  raidsonic	RaidSonic Technology GmbH
>  ralink	Mediatek/Ralink Technology Corp.
>  ramtron	Ramtron International
> +raspberrypi	Raspberry Pi Foundation
>  realtek Realtek Semiconductor Corp.
>  renesas	Renesas Electronics Corporation
>  ricoh	Ricoh Co. Ltd.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 2/4] dt-bindings: Add root properties for Raspberry Pi

[Lee Jones]

On Thu, 29 Jan 2015, Stefan Wahren wrote:

> This patch adds root compatible properties for the following boards:
> - Raspberry Pi Model A
> - Raspberry Pi Model A+
> - Raspberry Pi Model B
> - Raspberry Pi Model B (no P5)
> - Raspberry Pi Model B rev2
> - Raspberry Pi Model B+
> - Raspberry Pi Compute Module
> 
> Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/arm/bcm2835.txt |   31 +++++++++++++++++++--
>  1 file changed, 29 insertions(+), 2 deletions(-)

Applied, with Rob's Ack.

> diff --git a/Documentation/devicetree/bindings/arm/bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm2835.txt
> index ac68348..c78576b 100644
> --- a/Documentation/devicetree/bindings/arm/bcm2835.txt
> +++ b/Documentation/devicetree/bindings/arm/bcm2835.txt
> @@ -1,8 +1,35 @@
>  Broadcom BCM2835 device tree bindings
>  -------------------------------------------
>  
> -Boards with the BCM2835 SoC shall have the following properties:
> +Raspberry Pi Model A
> +Required root node properties:
> +compatible = "raspberrypi,model-a", "brcm,bcm2835";
>  
> -Required root node property:
> +Raspberry Pi Model A+
> +Required root node properties:
> +compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
>  
> +Raspberry Pi Model B
> +Required root node properties:
> +compatible = "raspberrypi,model-b", "brcm,bcm2835";
> +
> +Raspberry Pi Model B (no P5)
> +early model B with I2C0 rather than I2C1 routed to the expansion header
> +Required root node properties:
> +compatible = "raspberrypi,model-b-i2c0", "brcm,bcm2835";
> +
> +Raspberry Pi Model B rev2
> +Required root node properties:
> +compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
> +
> +Raspberry Pi Model B+
> +Required root node properties:
> +compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
> +
> +Raspberry Pi Compute Module
> +Required root node properties:
> +compatible = "raspberrypi,compute-module", "brcm,bcm2835";
> +
> +Generic BCM2835 board
> +Required root node properties:
>  compatible = "brcm,bcm2835";
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 3/4] ARM: bcm2835: Add header file for pinctrl constants

[Lee Jones]

On Thu, 29 Jan 2015, Stefan Wahren wrote:

> This new header file defines pincontrol constants to use
> from bcm2835 DTS files for pincontrol properties option.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
> ---
>  include/dt-bindings/pinctrl/bcm2835.h |   27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>  create mode 100644 include/dt-bindings/pinctrl/bcm2835.h

Applied with Rob's Ack.

NB: And Stephen's for the set.

> diff --git a/include/dt-bindings/pinctrl/bcm2835.h b/include/dt-bindings/pinctrl/bcm2835.h
> new file mode 100644
> index 0000000..6f0bc37
> --- /dev/null
> +++ b/include/dt-bindings/pinctrl/bcm2835.h
> @@ -0,0 +1,27 @@
> +/*
> + * Header providing constants for bcm2835 pinctrl bindings.
> + *
> + * Copyright (C) 2015 Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
> + *
> + * The code contained herein is licensed under the GNU General Public
> + * License. You may obtain a copy of the GNU General Public License
> + * Version 2 at the following locations:
> + *
> + * http://www.opensource.org/licenses/gpl-license.html
> + * http://www.gnu.org/copyleft/gpl.html
> + */
> +
> +#ifndef __DT_BINDINGS_PINCTRL_BCM2835_H__
> +#define __DT_BINDINGS_PINCTRL_BCM2835_H__
> +
> +/* brcm,function property */
> +#define BCM2835_FSEL_GPIO_IN	0
> +#define BCM2835_FSEL_GPIO_OUT	1
> +#define BCM2835_FSEL_ALT5	2
> +#define BCM2835_FSEL_ALT4	3
> +#define BCM2835_FSEL_ALT0	4
> +#define BCM2835_FSEL_ALT1	5
> +#define BCM2835_FSEL_ALT2	6
> +#define BCM2835_FSEL_ALT3	7
> +
> +#endif /* __DT_BINDINGS_PINCTRL_BCM2835_H__ */
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 4/4] ARM: bcm2835: Use pinctrl header

[Lee Jones]

On Thu, 29 Jan 2015, Stefan Wahren wrote:

> This patch converts all bcm2835 dts and dtsi files to use the pinctrl
> header file.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>
> ---
>  arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |    4 ++--
>  arch/arm/boot/dts/bcm2835-rpi-b.dts      |    4 ++--
>  arch/arm/boot/dts/bcm2835-rpi.dtsi       |    8 ++++----
>  arch/arm/boot/dts/bcm2835.dtsi           |    3 ++-
>  4 files changed, 10 insertions(+), 9 deletions(-)

Applied with Rob's Ack.

NB: And Stephen's for the set.

> diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
> index e479515..668442b 100644
> --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
> +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
> @@ -1,5 +1,5 @@
>  /dts-v1/;
> -/include/ "bcm2835-rpi.dtsi"
> +#include "bcm2835-rpi.dtsi"
>  
>  / {
>  	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
> @@ -25,6 +25,6 @@
>  	/* I2S interface */
>  	i2s_alt0: i2s_alt0 {
>  		brcm,pins = <18 19 20 21>;
> -		brcm,function = <4>; /* alt0 */
> +		brcm,function = <BCM2835_FSEL_ALT0>;
>  	};
>  };
> diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
> index bafa46f..ee89b79 100644
> --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
> +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
> @@ -1,5 +1,5 @@
>  /dts-v1/;
> -/include/ "bcm2835-rpi.dtsi"
> +#include "bcm2835-rpi.dtsi"
>  
>  / {
>  	compatible = "raspberrypi,model-b", "brcm,bcm2835";
> @@ -18,6 +18,6 @@
>  	/* I2S interface */
>  	i2s_alt2: i2s_alt2 {
>  		brcm,pins = <28 29 30 31>;
> -		brcm,function = <6>; /* alt2 */
> +		brcm,function = <BCM2835_FSEL_ALT2>;
>  	};
>  };
> diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
> index c706448..46780bb 100644
> --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
> +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
> @@ -1,4 +1,4 @@
> -/include/ "bcm2835.dtsi"
> +#include "bcm2835.dtsi"
>  
>  / {
>  	memory {
> @@ -21,17 +21,17 @@
>  
>  	gpioout: gpioout {
>  		brcm,pins = <6>;
> -		brcm,function = <1>; /* GPIO out */
> +		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 = <4>; /* alt0 */
> +		brcm,function = <BCM2835_FSEL_ALT0>;
>  	};
>  
>  	alt3: alt3 {
>  		brcm,pins = <48 49 50 51 52 53>;
> -		brcm,function = <7>; /* alt3 */
> +		brcm,function = <BCM2835_FSEL_ALT3>;
>  	};
>  };
>  
> diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
> index 3342cb1..be9c914 100644
> --- a/arch/arm/boot/dts/bcm2835.dtsi
> +++ b/arch/arm/boot/dts/bcm2835.dtsi
> @@ -1,4 +1,5 @@
> -/include/ "skeleton.dtsi"
> +#include <dt-bindings/pinctrl/bcm2835.h>
> +#include "skeleton.dtsi"
>  
>  / {
>  	compatible = "brcm,bcm2835";
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 RESEND 0/4] ARM: bcm2835: DT improvements

[Rob Herring]

On Wed, Feb 4, 2015 at 10:51 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 02/03/2015 07:47 PM, Rob Herring wrote:
>>
>> On Thu, Jan 29, 2015 at 12:10 PM, Stefan Wahren <stefan.wahren@i2se.com>
>> wrote:
>>>
>>> This patch series contains DT improvements for the Raspberry Pi.
>>>
>>> Patch 1,2: Add missing vendor prefix and root compatible properties
>>> Patch 3,4: Use constants for pin function instead of error-prone numbers
>>>
>>> Changes in V2:
>>> - add all currently known Raspberry Pi boards to binding documentation
>>>    as suggested by Stephen Warren
>>>
>>> Stefan Wahren (4):
>>>    dt-bindings: Add vendor prefix for Raspberry Pi
>>>    dt-bindings: Add root properties for Raspberry Pi
>>>    ARM: bcm2835: Add header file for pinctrl constants
>>>    ARM: bcm2835: Use pinctrl header
>>>
>>>   Documentation/devicetree/bindings/arm/bcm2835.txt  |   31
>>> ++++++++++++++++++--
>>>   .../devicetree/bindings/vendor-prefixes.txt        |    1 +
>>>   arch/arm/boot/dts/bcm2835-rpi-b-plus.dts           |    4 +--
>>>   arch/arm/boot/dts/bcm2835-rpi-b.dts                |    4 +--
>>>   arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    8 ++---
>>>   arch/arm/boot/dts/bcm2835.dtsi                     |    3 +-
>>>   include/dt-bindings/pinctrl/bcm2835.h              |   27
>>> +++++++++++++++++
>>>   7 files changed, 67 insertions(+), 11 deletions(-)
>>>   create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
>>
>>
>> Who do you intend to apply this? For the DT binding parts:
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
>
> I assume Lee Jones will take this through the Tegra tree, to avoid any
> potential conflicts with other changes to these files in that tree.
>
> I do still want to double-check with the Pi Foundation's downstream tree
> what compatible values they use. If they already have board-specific values,
> and they're sane, it'd be nice to align with those. Unfortunately, I haven't
> got around to that yet:-(