Commit 4188ea2a authored by Stefan Wahren's avatar Stefan Wahren Committed by Eric Anholt

ARM: bcm283x: Define UART pinmuxing on board level

Until RPI 3 and Zero W the pl011 (uart0) was always on pin 14/15. So in
order to take care of them and other boards in the future,
we need to define UART pinmuxing on board level.

This work based on Eric Anholt's patch "ARM: bcm2385: Don't force pl011
onto pins 14/15." and Fabian Vogt's patch "ARM64: dts: bcm2837: assign
uart0 to BT and uart1 to pin headers".
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 3bfe25fa
...@@ -99,3 +99,9 @@ i2s_alt0: i2s_alt0 { ...@@ -99,3 +99,9 @@ i2s_alt0: i2s_alt0 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { ...@@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -101,3 +101,9 @@ i2s_alt0: i2s_alt0 { ...@@ -101,3 +101,9 @@ i2s_alt0: i2s_alt0 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { ...@@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -89,3 +89,9 @@ &gpio { ...@@ -89,3 +89,9 @@ &gpio {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -103,3 +103,9 @@ i2s_alt0: i2s_alt0 { ...@@ -103,3 +103,9 @@ i2s_alt0: i2s_alt0 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -39,7 +39,7 @@ gpioout: gpioout { ...@@ -39,7 +39,7 @@ gpioout: gpioout {
}; };
alt0: alt0 { alt0: alt0 {
brcm,pins = <4 5 7 8 9 10 11 14 15>; brcm,pins = <4 5 7 8 9 10 11>;
brcm,function = <BCM2835_FSEL_ALT0>; brcm,function = <BCM2835_FSEL_ALT0>;
}; };
}; };
......
...@@ -39,3 +39,9 @@ i2s_alt0: i2s_alt0 { ...@@ -39,3 +39,9 @@ i2s_alt0: i2s_alt0 {
&hdmi { &hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
}; };
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
...@@ -19,7 +19,17 @@ act { ...@@ -19,7 +19,17 @@ act {
}; };
}; };
/* uart0 communicates with the BT module */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
status = "okay";
};
/* uart1 is mapped to the pin header */
&uart1 { &uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_gpio14>;
status = "okay"; status = "okay";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment