|
 |
49af9ed |
From 3bfe25fa9f8a56c5c877c7fd854d89238787c6d8 Mon Sep 17 00:00:00 2001
|
|
|
49af9ed |
From: Eric Anholt <eric@anholt.net>
|
|
|
49af9ed |
Date: Wed, 26 Jul 2017 13:01:56 -0700
|
|
|
49af9ed |
Subject: ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm.
|
|
|
49af9ed |
|
|
|
49af9ed |
BCM2837 is somewhat unusual in that we build its DT on both arm32 and
|
|
|
49af9ed |
arm64. Most devices are being run in arm32 mode.
|
|
|
49af9ed |
|
|
|
49af9ed |
Having the body of the DT for 2837 separate from 2835/6 has been a
|
|
|
49af9ed |
source of pain, as we often need to make changes that span both
|
|
|
49af9ed |
directories simultaneously (for example, the thermal changes for 4.13,
|
|
|
49af9ed |
or anything that changes the name of a node referenced by '&' from
|
|
|
49af9ed |
board files). Other changes are made more complicated than they need
|
|
|
49af9ed |
to be, such as the SDHOST enabling, because we have to split a single
|
|
|
49af9ed |
logical change into a 283[56] half and a 2837 half.
|
|
|
49af9ed |
|
|
|
49af9ed |
To fix this, make the stub board include file live in arm64 instead of
|
|
|
49af9ed |
arm32, and keep all of BCM283x's contents in arm32. From here on, our
|
|
|
49af9ed |
changes to DT contents can be submitted through a single tree.
|
|
|
49af9ed |
|
|
|
49af9ed |
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
49af9ed |
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
|
49af9ed |
---
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 42 ++++++++++-
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2837.dtsi | 86 ++++++++++++++++++++++
|
|
|
49af9ed |
arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 -
|
|
|
49af9ed |
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 42 +----------
|
|
|
49af9ed |
arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 86 ----------------------
|
|
|
49af9ed |
.../boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 -
|
|
|
49af9ed |
.../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 -
|
|
|
49af9ed |
arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 -
|
|
|
49af9ed |
8 files changed, 128 insertions(+), 132 deletions(-)
|
|
|
49af9ed |
create mode 100644 arch/arm/boot/dts/bcm2837.dtsi
|
|
|
49af9ed |
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
|
|
|
49af9ed |
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm2837.dtsi
|
|
|
49af9ed |
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
|
|
|
49af9ed |
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
|
|
|
49af9ed |
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi
|
|
|
49af9ed |
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
index c72a27d..972f14d 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
@@ -1 +1,41 @@
|
|
|
49af9ed |
-#include "arm64/broadcom/bcm2837-rpi-3-b.dts"
|
|
|
49af9ed |
+/dts-v1/;
|
|
|
49af9ed |
+#include "bcm2837.dtsi"
|
|
|
49af9ed |
+#include "bcm2835-rpi.dtsi"
|
|
|
49af9ed |
+#include "bcm283x-rpi-smsc9514.dtsi"
|
|
|
49af9ed |
+#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/ {
|
|
|
49af9ed |
+ compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
|
|
|
49af9ed |
+ model = "Raspberry Pi 3 Model B";
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ memory {
|
|
|
49af9ed |
+ reg = <0 0x40000000>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ leds {
|
|
|
49af9ed |
+ act {
|
|
|
49af9ed |
+ gpios = <&gpio 47 0>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart1 {
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/* SDHCI is used to control the SDIO for wireless */
|
|
|
49af9ed |
+&sdhci {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&emmc_gpio34>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+ bus-width = <4>;
|
|
|
49af9ed |
+ non-removable;
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/* SDHOST is used to drive the SD card */
|
|
|
49af9ed |
+&sdhost {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&sdhost_gpio48>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+ bus-width = <4>;
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
|
|
|
49af9ed |
new file mode 100644
|
|
|
49af9ed |
index 0000000..2d5de6f0
|
|
|
49af9ed |
--- /dev/null
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2837.dtsi
|
|
|
49af9ed |
@@ -0,0 +1,86 @@
|
|
|
49af9ed |
+#include "bcm283x.dtsi"
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/ {
|
|
|
49af9ed |
+ compatible = "brcm,bcm2837";
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ soc {
|
|
|
49af9ed |
+ ranges = <0x7e000000 0x3f000000 0x1000000>,
|
|
|
49af9ed |
+ <0x40000000 0x40000000 0x00001000>;
|
|
|
49af9ed |
+ dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ local_intc: local_intc {
|
|
|
49af9ed |
+ compatible = "brcm,bcm2836-l1-intc";
|
|
|
49af9ed |
+ reg = <0x40000000 0x100>;
|
|
|
49af9ed |
+ interrupt-controller;
|
|
|
49af9ed |
+ #interrupt-cells = <1>;
|
|
|
49af9ed |
+ interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ timer {
|
|
|
49af9ed |
+ compatible = "arm,armv7-timer";
|
|
|
49af9ed |
+ interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
+ interrupts = <0>, // PHYS_SECURE_PPI
|
|
|
49af9ed |
+ <1>, // PHYS_NONSECURE_PPI
|
|
|
49af9ed |
+ <3>, // VIRT_PPI
|
|
|
49af9ed |
+ <2>; // HYP_PPI
|
|
|
49af9ed |
+ always-on;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ cpus: cpus {
|
|
|
49af9ed |
+ #address-cells = <1>;
|
|
|
49af9ed |
+ #size-cells = <0>;
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ cpu0: cpu@0 {
|
|
|
49af9ed |
+ device_type = "cpu";
|
|
|
49af9ed |
+ compatible = "arm,cortex-a53";
|
|
|
49af9ed |
+ reg = <0>;
|
|
|
49af9ed |
+ enable-method = "spin-table";
|
|
|
49af9ed |
+ cpu-release-addr = <0x0 0x000000d8>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ cpu1: cpu@1 {
|
|
|
49af9ed |
+ device_type = "cpu";
|
|
|
49af9ed |
+ compatible = "arm,cortex-a53";
|
|
|
49af9ed |
+ reg = <1>;
|
|
|
49af9ed |
+ enable-method = "spin-table";
|
|
|
49af9ed |
+ cpu-release-addr = <0x0 0x000000e0>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ cpu2: cpu@2 {
|
|
|
49af9ed |
+ device_type = "cpu";
|
|
|
49af9ed |
+ compatible = "arm,cortex-a53";
|
|
|
49af9ed |
+ reg = <2>;
|
|
|
49af9ed |
+ enable-method = "spin-table";
|
|
|
49af9ed |
+ cpu-release-addr = <0x0 0x000000e8>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+ cpu3: cpu@3 {
|
|
|
49af9ed |
+ device_type = "cpu";
|
|
|
49af9ed |
+ compatible = "arm,cortex-a53";
|
|
|
49af9ed |
+ reg = <3>;
|
|
|
49af9ed |
+ enable-method = "spin-table";
|
|
|
49af9ed |
+ cpu-release-addr = <0x0 0x000000f0>;
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+ };
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/* Make the BCM2835-style global interrupt controller be a child of the
|
|
|
49af9ed |
+ * CPU-local interrupt controller.
|
|
|
49af9ed |
+ */
|
|
|
49af9ed |
+&intc {
|
|
|
49af9ed |
+ compatible = "brcm,bcm2836-armctrl-ic";
|
|
|
49af9ed |
+ reg = <0x7e00b200 0x200>;
|
|
|
49af9ed |
+ interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
+ interrupts = <8>;
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&cpu_thermal {
|
|
|
49af9ed |
+ coefficients = <(-538) 412000>;
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/* enable thermal sensor with the correct compatible property set */
|
|
|
49af9ed |
+&thermal {
|
|
|
49af9ed |
+ compatible = "brcm,bcm2837-thermal";
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
|
|
|
49af9ed |
deleted file mode 120000
|
|
|
49af9ed |
index 3937b77..0000000
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
|
|
|
49af9ed |
+++ /dev/null
|
|
|
49af9ed |
@@ -1 +0,0 @@
|
|
|
49af9ed |
-../../../../arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
49af9ed |
\ No newline at end of file
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
index 972f14d..699d340 100644
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
@@ -1,41 +1 @@
|
|
|
49af9ed |
-/dts-v1/;
|
|
|
49af9ed |
-#include "bcm2837.dtsi"
|
|
|
49af9ed |
-#include "bcm2835-rpi.dtsi"
|
|
|
49af9ed |
-#include "bcm283x-rpi-smsc9514.dtsi"
|
|
|
49af9ed |
-#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/ {
|
|
|
49af9ed |
- compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
|
|
|
49af9ed |
- model = "Raspberry Pi 3 Model B";
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- memory {
|
|
|
49af9ed |
- reg = <0 0x40000000>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- leds {
|
|
|
49af9ed |
- act {
|
|
|
49af9ed |
- gpios = <&gpio 47 0>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-&uart1 {
|
|
|
49af9ed |
- status = "okay";
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/* SDHCI is used to control the SDIO for wireless */
|
|
|
49af9ed |
-&sdhci {
|
|
|
49af9ed |
- pinctrl-names = "default";
|
|
|
49af9ed |
- pinctrl-0 = <&emmc_gpio34>;
|
|
|
49af9ed |
- status = "okay";
|
|
|
49af9ed |
- bus-width = <4>;
|
|
|
49af9ed |
- non-removable;
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/* SDHOST is used to drive the SD card */
|
|
|
49af9ed |
-&sdhost {
|
|
|
49af9ed |
- pinctrl-names = "default";
|
|
|
49af9ed |
- pinctrl-0 = <&sdhost_gpio48>;
|
|
|
49af9ed |
- status = "okay";
|
|
|
49af9ed |
- bus-width = <4>;
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
+#include "arm/bcm2837-rpi-3-b.dts"
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi
|
|
|
49af9ed |
deleted file mode 100644
|
|
|
49af9ed |
index 2d5de6f0..0000000
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi
|
|
|
49af9ed |
+++ /dev/null
|
|
|
49af9ed |
@@ -1,86 +0,0 @@
|
|
|
49af9ed |
-#include "bcm283x.dtsi"
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/ {
|
|
|
49af9ed |
- compatible = "brcm,bcm2837";
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- soc {
|
|
|
49af9ed |
- ranges = <0x7e000000 0x3f000000 0x1000000>,
|
|
|
49af9ed |
- <0x40000000 0x40000000 0x00001000>;
|
|
|
49af9ed |
- dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- local_intc: local_intc {
|
|
|
49af9ed |
- compatible = "brcm,bcm2836-l1-intc";
|
|
|
49af9ed |
- reg = <0x40000000 0x100>;
|
|
|
49af9ed |
- interrupt-controller;
|
|
|
49af9ed |
- #interrupt-cells = <1>;
|
|
|
49af9ed |
- interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- timer {
|
|
|
49af9ed |
- compatible = "arm,armv7-timer";
|
|
|
49af9ed |
- interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
- interrupts = <0>, // PHYS_SECURE_PPI
|
|
|
49af9ed |
- <1>, // PHYS_NONSECURE_PPI
|
|
|
49af9ed |
- <3>, // VIRT_PPI
|
|
|
49af9ed |
- <2>; // HYP_PPI
|
|
|
49af9ed |
- always-on;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- cpus: cpus {
|
|
|
49af9ed |
- #address-cells = <1>;
|
|
|
49af9ed |
- #size-cells = <0>;
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- cpu0: cpu@0 {
|
|
|
49af9ed |
- device_type = "cpu";
|
|
|
49af9ed |
- compatible = "arm,cortex-a53";
|
|
|
49af9ed |
- reg = <0>;
|
|
|
49af9ed |
- enable-method = "spin-table";
|
|
|
49af9ed |
- cpu-release-addr = <0x0 0x000000d8>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- cpu1: cpu@1 {
|
|
|
49af9ed |
- device_type = "cpu";
|
|
|
49af9ed |
- compatible = "arm,cortex-a53";
|
|
|
49af9ed |
- reg = <1>;
|
|
|
49af9ed |
- enable-method = "spin-table";
|
|
|
49af9ed |
- cpu-release-addr = <0x0 0x000000e0>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- cpu2: cpu@2 {
|
|
|
49af9ed |
- device_type = "cpu";
|
|
|
49af9ed |
- compatible = "arm,cortex-a53";
|
|
|
49af9ed |
- reg = <2>;
|
|
|
49af9ed |
- enable-method = "spin-table";
|
|
|
49af9ed |
- cpu-release-addr = <0x0 0x000000e8>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-
|
|
|
49af9ed |
- cpu3: cpu@3 {
|
|
|
49af9ed |
- device_type = "cpu";
|
|
|
49af9ed |
- compatible = "arm,cortex-a53";
|
|
|
49af9ed |
- reg = <3>;
|
|
|
49af9ed |
- enable-method = "spin-table";
|
|
|
49af9ed |
- cpu-release-addr = <0x0 0x000000f0>;
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
- };
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/* Make the BCM2835-style global interrupt controller be a child of the
|
|
|
49af9ed |
- * CPU-local interrupt controller.
|
|
|
49af9ed |
- */
|
|
|
49af9ed |
-&intc {
|
|
|
49af9ed |
- compatible = "brcm,bcm2836-armctrl-ic";
|
|
|
49af9ed |
- reg = <0x7e00b200 0x200>;
|
|
|
49af9ed |
- interrupt-parent = <&local_intc>;
|
|
|
49af9ed |
- interrupts = <8>;
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-&cpu_thermal {
|
|
|
49af9ed |
- coefficients = <(-538) 412000>;
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
-
|
|
|
49af9ed |
-/* enable thermal sensor with the correct compatible property set */
|
|
|
49af9ed |
-&thermal {
|
|
|
49af9ed |
- compatible = "brcm,bcm2837-thermal";
|
|
|
49af9ed |
- status = "okay";
|
|
|
49af9ed |
-};
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
|
|
|
49af9ed |
deleted file mode 120000
|
|
|
49af9ed |
index dca7c05..0000000
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
|
|
|
49af9ed |
+++ /dev/null
|
|
|
49af9ed |
@@ -1 +0,0 @@
|
|
|
49af9ed |
-../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
|
|
|
49af9ed |
\ No newline at end of file
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
|
|
|
49af9ed |
deleted file mode 120000
|
|
|
49af9ed |
index cbeebe3..0000000
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
|
|
|
49af9ed |
+++ /dev/null
|
|
|
49af9ed |
@@ -1 +0,0 @@
|
|
|
49af9ed |
-../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi
|
|
|
49af9ed |
\ No newline at end of file
|
|
|
49af9ed |
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
|
|
|
49af9ed |
deleted file mode 120000
|
|
|
49af9ed |
index 5f54e4c..0000000
|
|
|
49af9ed |
--- a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
|
|
|
49af9ed |
+++ /dev/null
|
|
|
49af9ed |
@@ -1 +0,0 @@
|
|
|
49af9ed |
-../../../../arm/boot/dts/bcm283x.dtsi
|
|
|
49af9ed |
\ No newline at end of file
|
|
|
49af9ed |
--
|
|
|
49af9ed |
cgit v1.1
|
|
|
49af9ed |
|
|
|
49af9ed |
From 4188ea2aeb6dd8f99ab77662f463e41bc464a704 Mon Sep 17 00:00:00 2001
|
|
|
49af9ed |
From: Stefan Wahren <stefan.wahren@i2se.com>
|
|
|
49af9ed |
Date: Sun, 30 Jul 2017 19:10:32 +0200
|
|
|
49af9ed |
Subject: ARM: bcm283x: Define UART pinmuxing on board level
|
|
|
49af9ed |
|
|
|
49af9ed |
Until RPI 3 and Zero W the pl011 (uart0) was always on pin 14/15. So in
|
|
|
49af9ed |
order to take care of them and other boards in the future,
|
|
|
49af9ed |
we need to define UART pinmuxing on board level.
|
|
|
49af9ed |
|
|
|
49af9ed |
This work based on Eric Anholt's patch "ARM: bcm2385: Don't force pl011
|
|
|
49af9ed |
onto pins 14/15." and Fabian Vogt's patch "ARM64: dts: bcm2837: assign
|
|
|
49af9ed |
uart0 to BT and uart1 to pin headers".
|
|
|
49af9ed |
|
|
|
49af9ed |
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
|
49af9ed |
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
|
49af9ed |
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
49af9ed |
---
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 ++++++
|
|
|
49af9ed |
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 10 ++++++++++
|
|
|
49af9ed |
9 files changed, 53 insertions(+), 1 deletion(-)
|
|
|
49af9ed |
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
|
49af9ed |
index d070454..9f86649 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
|
49af9ed |
@@ -99,3 +99,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
|
49af9ed |
index 46d078e..4b1af06 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
|
49af9ed |
@@ -94,3 +94,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
|
49af9ed |
index 432088e..a846f1e 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
|
49af9ed |
@@ -101,3 +101,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
|
49af9ed |
index 4133bc2..e860964 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
|
49af9ed |
@@ -94,3 +94,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
|
49af9ed |
index 4d56fe3..5d77f3f 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
|
49af9ed |
@@ -89,3 +89,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
|
49af9ed |
index 79a20d5..7036240 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
|
49af9ed |
@@ -103,3 +103,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
49af9ed |
index e55b362..e36c392 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
49af9ed |
@@ -39,7 +39,7 @@
|
|
|
49af9ed |
};
|
|
|
49af9ed |
|
|
|
49af9ed |
alt0: alt0 {
|
|
|
49af9ed |
- brcm,pins = <4 5 7 8 9 10 11 14 15>;
|
|
|
49af9ed |
+ brcm,pins = <4 5 7 8 9 10 11>;
|
|
|
49af9ed |
brcm,function = <BCM2835_FSEL_ALT0>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
|
49af9ed |
index bf19e8c..e8de414 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
|
49af9ed |
@@ -39,3 +39,9 @@
|
|
|
49af9ed |
&hdmi {
|
|
|
49af9ed |
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
|
49af9ed |
};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio14>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
index 972f14d..20725ca 100644
|
|
|
49af9ed |
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
49af9ed |
@@ -19,7 +19,17 @@
|
|
|
49af9ed |
};
|
|
|
49af9ed |
};
|
|
|
49af9ed |
|
|
|
49af9ed |
+/* uart0 communicates with the BT module */
|
|
|
49af9ed |
+&uart0 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
|
|
|
49af9ed |
+ status = "okay";
|
|
|
49af9ed |
+};
|
|
|
49af9ed |
+
|
|
|
49af9ed |
+/* uart1 is mapped to the pin header */
|
|
|
49af9ed |
&uart1 {
|
|
|
49af9ed |
+ pinctrl-names = "default";
|
|
|
49af9ed |
+ pinctrl-0 = <&uart1_gpio14>;
|
|
|
49af9ed |
status = "okay";
|
|
|
49af9ed |
};
|
|
|
49af9ed |
|
|
|
49af9ed |
--
|
|
|
49af9ed |
cgit v1.1
|
|
|
49af9ed |
|