Skip to contentSkip to conversation

ARM: bcm2835: Add header file for pinctrl constants

PATCH In review Charles Keepax 3 participants 5 messages Feb 22, 2015 – Feb 23, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: bcm2835: Add header file for pinctrl constants

This patch adds a header file for the constants used in pincontrol configuration for the bcm2835.

---
 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                |    4 ++-
 include/dt-bindings/pinctrl/pinctrl-bcm2835.h |   39 +++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 include/dt-bindings/pinctrl/pinctrl-bcm2835.h
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +2 -2
index e479515..e3418c2 100644
@@ -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_PIN_FUNC_ALT0>;
 	};
 };
arch/arm/boot/dts/bcm2835-rpi-b.dts +2 -2
index bafa46f..541788a 100644
@@ -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_PIN_FUNC_ALT2>;
 	};
 };
arch/arm/boot/dts/bcm2835-rpi.dtsi +4 -4
index c706448..76b0a40 100644
@@ -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_PIN_FUNC_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_PIN_FUNC_ALT0>;
 	};
 
 	alt3: alt3 {
 		brcm,pins = <48 49 50 51 52 53>;
-		brcm,function = <7>; /* alt3 */
+		brcm,function = <BCM2835_PIN_FUNC_ALT3>;
 	};
 };
 
arch/arm/boot/dts/bcm2835.dtsi +3 -1
index 3342cb1..31f6586 100644
@@ -1,4 +1,6 @@
-/include/ "skeleton.dtsi"
+#include <dt-bindings/pinctrl/pinctrl-bcm2835.h>
+
+#include "skeleton.dtsi"
 
 / {
 	compatible = "brcm,bcm2835";
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +39 -0
new file mode 100644
index 0000000..c74532e
@@ -0,0 +1,39 @@
+/*
+ * This header provides constants for BCM2835 pinctrl bindings.
+ *
+ * Copyright 2015, Cirrus Logic Inc.
+ *
+ * Author: Charles Keepax <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _DT_BINDINGS_PINCTRL_BCM2835_H
+#define _DT_BINDINGS_PINCTRL_BCM2835_H
+
+/* IRQ Flags */
+#define BCM2835_PIN_IRQ_RISING				1
+#define BCM2835_PIN_IRQ_FALLING				2
+#define BCM2835_PIN_IRQ_EDGE	(BCM2835_PIN_IRQ_RISING | \
+				 BCM2835_PIN_IRQ_FALLING)
+#define BCM2835_PIN_IRQ_LOW				4
+#define BCM2835_PIN_IRQ_HIGH				8
+
+/* Pin Function Settings */
+#define BCM2835_PIN_FUNC_GPIO_IN			0
+#define BCM2835_PIN_FUNC_GPIO_OUT			1
+#define BCM2835_PIN_FUNC_ALT5				2
+#define BCM2835_PIN_FUNC_ALT4				3
+#define BCM2835_PIN_FUNC_ALT0				4
+#define BCM2835_PIN_FUNC_ALT1				5
+#define BCM2835_PIN_FUNC_ALT2				6
+#define BCM2835_PIN_FUNC_ALT3				7
+
+/* Pin Pull Settings */
+#define BCM2835_PIN_PULL_NONE				0
+#define BCM2835_PIN_PULL_DOWN				1
+#define BCM2835_PIN_PULL_UP				2
+
+#endif
Signature · 1 line
1.7.2.5
#1 lore raw

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 22

Quoted 8 lines · On Sunday 22 February 2015 16:59:56 Charles Keepax wrote:
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +8 -0
+
+/* IRQ Flags */
+#define BCM2835_PIN_IRQ_RISING                         1
+#define BCM2835_PIN_IRQ_FALLING                                2
+#define BCM2835_PIN_IRQ_EDGE   (BCM2835_PIN_IRQ_RISING | \
+                                BCM2835_PIN_IRQ_FALLING)
+#define BCM2835_PIN_IRQ_LOW                            4
+#define BCM2835_PIN_IRQ_HIGH                           8

Are these different from the standard definitions?

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 32

Quoted 9 lines
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +9 -0
+/* Pin Function Settings */
+#define BCM2835_PIN_FUNC_GPIO_IN                       0
+#define BCM2835_PIN_FUNC_GPIO_OUT                      1
+#define BCM2835_PIN_FUNC_ALT5                          2
+#define BCM2835_PIN_FUNC_ALT4                          3
+#define BCM2835_PIN_FUNC_ALT0                          4
+#define BCM2835_PIN_FUNC_ALT1                          5
+#define BCM2835_PIN_FUNC_ALT2                          6
+#define BCM2835_PIN_FUNC_ALT3                          7

Why are these required? They don't seem to be used by any driver, which leads me to suspect that they are just the hardware numbers.

In that case, don't add any syntactical sugar like that and just use the hardware numbers directly.

What's with the strange mapping of numbers anyway?

Arnd

#2 lore raw
Quoted 25 lines · Arnd Bergmann

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 22

Quoted 8 lines · On Sunday 22 February 2015 16:59:56 Charles Keepax wrote:
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +8 -0
+
+/* IRQ Flags */
+#define BCM2835_PIN_IRQ_RISING                         1
+#define BCM2835_PIN_IRQ_FALLING                                2
+#define BCM2835_PIN_IRQ_EDGE   (BCM2835_PIN_IRQ_RISING | \
+                                BCM2835_PIN_IRQ_FALLING)
+#define BCM2835_PIN_IRQ_LOW                            4
+#define BCM2835_PIN_IRQ_HIGH                           8

Are these different from the standard definitions?

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 32

Quoted 9 lines
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +9 -0
+/* Pin Function Settings */
+#define BCM2835_PIN_FUNC_GPIO_IN                       0
+#define BCM2835_PIN_FUNC_GPIO_OUT                      1
+#define BCM2835_PIN_FUNC_ALT5                          2
+#define BCM2835_PIN_FUNC_ALT4                          3
+#define BCM2835_PIN_FUNC_ALT0                          4
+#define BCM2835_PIN_FUNC_ALT1                          5
+#define BCM2835_PIN_FUNC_ALT2                          6
+#define BCM2835_PIN_FUNC_ALT3                          7

Why are these required? They don't seem to be used by any driver, which leads me to suspect that they are just the hardware numbers.

Quoted 2 lines

In that case, don't add any syntactical sugar like that and just use the hardware numbers directly.

Yeah they are just hardware numbers, I wasn't aware there was a preference to use the numbers directly in which case just ignore this patch.

Quoted 2 lines

What's with the strange mapping of numbers anyway?

You would need to ask Broadcom that :-)

Thanks,
Charles

#3 lore raw
In reply to Arnd Bergmann
Quoted 25 lines · Arnd Bergmann

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 22

Quoted 8 lines · On Sunday 22 February 2015 16:59:56 Charles Keepax wrote:
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +8 -0
+
+/* IRQ Flags */
+#define BCM2835_PIN_IRQ_RISING                         1
+#define BCM2835_PIN_IRQ_FALLING                                2
+#define BCM2835_PIN_IRQ_EDGE   (BCM2835_PIN_IRQ_RISING | \
+                                BCM2835_PIN_IRQ_FALLING)
+#define BCM2835_PIN_IRQ_LOW                            4
+#define BCM2835_PIN_IRQ_HIGH                           8

Are these different from the standard definitions?

include/dt-bindings/pinctrl/pinctrl-bcm2835.h line 32

Quoted 9 lines
include/dt-bindings/pinctrl/pinctrl-bcm2835.h new file +9 -0
+/* Pin Function Settings */
+#define BCM2835_PIN_FUNC_GPIO_IN                       0
+#define BCM2835_PIN_FUNC_GPIO_OUT                      1
+#define BCM2835_PIN_FUNC_ALT5                          2
+#define BCM2835_PIN_FUNC_ALT4                          3
+#define BCM2835_PIN_FUNC_ALT0                          4
+#define BCM2835_PIN_FUNC_ALT1                          5
+#define BCM2835_PIN_FUNC_ALT2                          6
+#define BCM2835_PIN_FUNC_ALT3                          7

Why are these required? They don't seem to be used by any driver, which leads me to suspect that they are just the hardware numbers.

Quoted 4 lines

In that case, don't add any syntactical sugar like that and just use the hardware numbers directly.

What's with the strange mapping of numbers anyway?

Especially given that the number->semantics meaning is a little non-linear it seems like using #defines/... to document what the numbers mean seems reasonable. It allows easily validating the DT files without having to go look up the meaning of the numbers in the documentation.

#4 lore raw
In reply to Charles Keepax
Quoted 2 lines · Charles Keepax

This patch adds a header file for the constants used in pincontrol configuration for the bcm2835.

This seems like a duplicate of the following series:

https://lkml.org/lkml/2015/1/16/402
[PATCH 0/4] ARM: bcm2835: DT improvements
[PATCH 1/4] dt-bindings: Add vendor prefix for Raspberry Pi [PATCH 2/4] dt-bindings: Add root properties for Raspberry Pi B and B+ [PATCH 3/4] ARM: bcm2835: Add header file for pinctrl constants

https://lkml.org/lkml/2015/1/16/405
[PATCH 4/4] ARM: bcm2835: Use pinctrl header

Lee, are you planning on applying one/both/some of these?