mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
388 lines
7.5 KiB
Diff
388 lines
7.5 KiB
Diff
From d29fb06a96cac4111d23e8f1cfc4d191d2fd5419 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Mon, 1 Nov 2021 15:44:31 +0000
|
|
Subject: [PATCH] ARM: dts: Rename Zero 2 W DT files
|
|
|
|
Retain the old names for backwards compatibility for a while, while the
|
|
necessary firmware change rolls out.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
arch/arm/boot/dts/Makefile | 1 +
|
|
arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 177 ++++++++++++++++++++
|
|
arch/arm/boot/dts/bcm2710-rpi-zero-2.dts | 178 +--------------------
|
|
3 files changed, 179 insertions(+), 177 deletions(-)
|
|
create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
|
|
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
+++ b/arch/arm/boot/dts/Makefile
|
|
@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
|
|
bcm2708-rpi-zero.dtb \
|
|
bcm2708-rpi-zero-w.dtb \
|
|
bcm2710-rpi-zero-2.dtb \
|
|
+ bcm2710-rpi-zero-2-w.dtb \
|
|
bcm2709-rpi-2-b.dtb \
|
|
bcm2710-rpi-2-b.dtb \
|
|
bcm2710-rpi-3-b.dtb \
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
|
|
@@ -0,0 +1,177 @@
|
|
+/dts-v1/;
|
|
+
|
|
+#include "bcm2710.dtsi"
|
|
+#include "bcm2709-rpi.dtsi"
|
|
+#include "bcm283x-rpi-csi1-2lane.dtsi"
|
|
+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
|
|
+#include "bcm2708-rpi-bt.dtsi"
|
|
+#include "bcm283x-rpi-cam1-regulator.dtsi"
|
|
+
|
|
+/ {
|
|
+ compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
|
|
+ model = "Raspberry Pi Zero 2 W";
|
|
+
|
|
+ chosen {
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
+ };
|
|
+
|
|
+ aliases {
|
|
+ serial0 = &uart1;
|
|
+ serial1 = &uart0;
|
|
+ mmc1 = &mmcnr;
|
|
+ };
|
|
+};
|
|
+
|
|
+&gpio {
|
|
+ spi0_pins: spi0_pins {
|
|
+ brcm,pins = <9 10 11>;
|
|
+ brcm,function = <4>; /* alt0 */
|
|
+ };
|
|
+
|
|
+ spi0_cs_pins: spi0_cs_pins {
|
|
+ brcm,pins = <8 7>;
|
|
+ brcm,function = <1>; /* output */
|
|
+ };
|
|
+
|
|
+ i2c0_pins: i2c0 {
|
|
+ brcm,pins = <0 1>;
|
|
+ brcm,function = <4>;
|
|
+ };
|
|
+
|
|
+ i2c1_pins: i2c1 {
|
|
+ brcm,pins = <2 3>;
|
|
+ brcm,function = <4>;
|
|
+ };
|
|
+
|
|
+ i2s_pins: i2s {
|
|
+ brcm,pins = <18 19 20 21>;
|
|
+ brcm,function = <4>; /* alt0 */
|
|
+ };
|
|
+
|
|
+ sdio_pins: sdio_pins {
|
|
+ brcm,pins = <34 35 36 37 38 39>;
|
|
+ brcm,function = <7>; // alt3 = SD1
|
|
+ brcm,pull = <0 2 2 2 2 2>;
|
|
+ };
|
|
+
|
|
+ bt_pins: bt_pins {
|
|
+ brcm,pins = <43>;
|
|
+ brcm,function = <4>; /* alt0:GPCLK2 */
|
|
+ brcm,pull = <0>;
|
|
+ };
|
|
+
|
|
+ uart0_pins: uart0_pins {
|
|
+ brcm,pins = <30 31 32 33>;
|
|
+ brcm,function = <7>; /* alt3=UART0 */
|
|
+ brcm,pull = <2 0 0 2>; /* up none none up */
|
|
+ };
|
|
+
|
|
+ uart1_pins: uart1_pins {
|
|
+ brcm,pins;
|
|
+ brcm,function;
|
|
+ brcm,pull;
|
|
+ };
|
|
+
|
|
+ audio_pins: audio_pins {
|
|
+ brcm,pins = <>;
|
|
+ brcm,function = <>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&mmcnr {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdio_pins>;
|
|
+ bus-width = <4>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&uart0 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart0_pins &bt_pins>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&uart1 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart1_pins>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&spi0 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
|
|
+ cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
|
|
+
|
|
+ spidev0: spidev@0{
|
|
+ compatible = "spidev";
|
|
+ reg = <0>; /* CE0 */
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ spi-max-frequency = <125000000>;
|
|
+ };
|
|
+
|
|
+ spidev1: spidev@1{
|
|
+ compatible = "spidev";
|
|
+ reg = <1>; /* CE1 */
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ spi-max-frequency = <125000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&i2c0if {
|
|
+ clock-frequency = <100000>;
|
|
+};
|
|
+
|
|
+&i2c1 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&i2c1_pins>;
|
|
+ clock-frequency = <100000>;
|
|
+};
|
|
+
|
|
+&i2c2 {
|
|
+ clock-frequency = <100000>;
|
|
+};
|
|
+
|
|
+&i2s {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&i2s_pins>;
|
|
+};
|
|
+
|
|
+&leds {
|
|
+ act_led: led-act {
|
|
+ label = "led0";
|
|
+ linux,default-trigger = "actpwr";
|
|
+ gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&hdmi {
|
|
+ hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
|
|
+};
|
|
+
|
|
+&audio {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&audio_pins>;
|
|
+ brcm,disable-headphones = <1>;
|
|
+};
|
|
+
|
|
+&bt {
|
|
+ shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
|
|
+};
|
|
+
|
|
+&minibt {
|
|
+ shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
|
|
+};
|
|
+
|
|
+&cam1_reg {
|
|
+ gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
|
|
+};
|
|
+
|
|
+/ {
|
|
+ __overrides__ {
|
|
+ act_led_gpio = <&act_led>,"gpios:4";
|
|
+ act_led_activelow = <&act_led>,"gpios:8";
|
|
+ act_led_trigger = <&act_led>,"linux,default-trigger";
|
|
+ };
|
|
+};
|
|
--- a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
|
|
+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
|
|
@@ -1,177 +1 @@
|
|
-/dts-v1/;
|
|
-
|
|
-#include "bcm2710.dtsi"
|
|
-#include "bcm2709-rpi.dtsi"
|
|
-#include "bcm283x-rpi-csi1-2lane.dtsi"
|
|
-#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
|
|
-#include "bcm2708-rpi-bt.dtsi"
|
|
-#include "bcm283x-rpi-cam1-regulator.dtsi"
|
|
-
|
|
-/ {
|
|
- compatible = "raspberrypi,model-zero-2", "brcm,bcm2837";
|
|
- model = "Raspberry Pi Zero 2";
|
|
-
|
|
- chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
- };
|
|
-
|
|
- aliases {
|
|
- serial0 = &uart1;
|
|
- serial1 = &uart0;
|
|
- mmc1 = &mmcnr;
|
|
- };
|
|
-};
|
|
-
|
|
-&gpio {
|
|
- spi0_pins: spi0_pins {
|
|
- brcm,pins = <9 10 11>;
|
|
- brcm,function = <4>; /* alt0 */
|
|
- };
|
|
-
|
|
- spi0_cs_pins: spi0_cs_pins {
|
|
- brcm,pins = <8 7>;
|
|
- brcm,function = <1>; /* output */
|
|
- };
|
|
-
|
|
- i2c0_pins: i2c0 {
|
|
- brcm,pins = <0 1>;
|
|
- brcm,function = <4>;
|
|
- };
|
|
-
|
|
- i2c1_pins: i2c1 {
|
|
- brcm,pins = <2 3>;
|
|
- brcm,function = <4>;
|
|
- };
|
|
-
|
|
- i2s_pins: i2s {
|
|
- brcm,pins = <18 19 20 21>;
|
|
- brcm,function = <4>; /* alt0 */
|
|
- };
|
|
-
|
|
- sdio_pins: sdio_pins {
|
|
- brcm,pins = <34 35 36 37 38 39>;
|
|
- brcm,function = <7>; // alt3 = SD1
|
|
- brcm,pull = <0 2 2 2 2 2>;
|
|
- };
|
|
-
|
|
- bt_pins: bt_pins {
|
|
- brcm,pins = <43>;
|
|
- brcm,function = <4>; /* alt0:GPCLK2 */
|
|
- brcm,pull = <0>;
|
|
- };
|
|
-
|
|
- uart0_pins: uart0_pins {
|
|
- brcm,pins = <30 31 32 33>;
|
|
- brcm,function = <7>; /* alt3=UART0 */
|
|
- brcm,pull = <2 0 0 2>; /* up none none up */
|
|
- };
|
|
-
|
|
- uart1_pins: uart1_pins {
|
|
- brcm,pins;
|
|
- brcm,function;
|
|
- brcm,pull;
|
|
- };
|
|
-
|
|
- audio_pins: audio_pins {
|
|
- brcm,pins = <>;
|
|
- brcm,function = <>;
|
|
- };
|
|
-};
|
|
-
|
|
-&mmcnr {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&sdio_pins>;
|
|
- bus-width = <4>;
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&uart0 {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&uart0_pins &bt_pins>;
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&uart1 {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&uart1_pins>;
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&spi0 {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
|
|
- cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
|
|
-
|
|
- spidev0: spidev@0{
|
|
- compatible = "spidev";
|
|
- reg = <0>; /* CE0 */
|
|
- #address-cells = <1>;
|
|
- #size-cells = <0>;
|
|
- spi-max-frequency = <125000000>;
|
|
- };
|
|
-
|
|
- spidev1: spidev@1{
|
|
- compatible = "spidev";
|
|
- reg = <1>; /* CE1 */
|
|
- #address-cells = <1>;
|
|
- #size-cells = <0>;
|
|
- spi-max-frequency = <125000000>;
|
|
- };
|
|
-};
|
|
-
|
|
-&i2c0if {
|
|
- clock-frequency = <100000>;
|
|
-};
|
|
-
|
|
-&i2c1 {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&i2c1_pins>;
|
|
- clock-frequency = <100000>;
|
|
-};
|
|
-
|
|
-&i2c2 {
|
|
- clock-frequency = <100000>;
|
|
-};
|
|
-
|
|
-&i2s {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&i2s_pins>;
|
|
-};
|
|
-
|
|
-&leds {
|
|
- act_led: led-act {
|
|
- label = "led0";
|
|
- linux,default-trigger = "actpwr";
|
|
- gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
|
|
- };
|
|
-};
|
|
-
|
|
-&hdmi {
|
|
- hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
|
|
-};
|
|
-
|
|
-&audio {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&audio_pins>;
|
|
- brcm,disable-headphones = <1>;
|
|
-};
|
|
-
|
|
-&bt {
|
|
- shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
|
|
-};
|
|
-
|
|
-&minibt {
|
|
- shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
|
|
-};
|
|
-
|
|
-&cam1_reg {
|
|
- gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
|
|
-};
|
|
-
|
|
-/ {
|
|
- __overrides__ {
|
|
- act_led_gpio = <&act_led>,"gpios:4";
|
|
- act_led_activelow = <&act_led>,"gpios:8";
|
|
- act_led_trigger = <&act_led>,"linux,default-trigger";
|
|
- };
|
|
-};
|
|
+#include "bcm2710-rpi-zero-2-w.dts"
|