1 From 3c099a50b3d609206a86896405cfdc8a94cd7aa4 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Wed, 29 Jan 2020 11:29:06 +0000
4 Subject: [PATCH] ARM: dts: Remove bcm2838-rpi-4-b.dts
6 Upstream are not going to use the bcm2838 identifier, so begin the
7 cleanup by removing the suggested upstream Pi 4 .dts file.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
11 arch/arm/boot/dts/Makefile | 1 -
12 arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 134 --------------------------
13 2 files changed, 135 deletions(-)
14 delete mode 100644 arch/arm/boot/dts/bcm2838-rpi-4-b.dts
16 --- a/arch/arm/boot/dts/Makefile
17 +++ b/arch/arm/boot/dts/Makefile
18 @@ -97,7 +97,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
20 bcm2837-rpi-3-b-plus.dtb \
21 bcm2837-rpi-cm3-io3.dtb \
22 - bcm2838-rpi-4-b.dtb \
23 bcm2835-rpi-zero.dtb \
24 bcm2835-rpi-zero-w.dtb
25 dtb-$(CONFIG_ARCH_BCM_5301X) += \
26 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
29 -// SPDX-License-Identifier: GPL-2.0
31 -#include "bcm2838.dtsi"
32 -#include "bcm2835-rpi.dtsi"
33 -#include "bcm2838-rpi.dtsi"
36 - compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
37 - model = "Raspberry Pi 4 Model B";
40 - /* 8250 auxiliary UART instead of pl011 */
41 - stdout-path = "serial1:115200n8";
45 - device_type = "memory";
46 - reg = <0x0 0x0 0x0>;
51 - gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
56 - gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
60 - wifi_pwrseq: wifi-pwrseq {
61 - compatible = "mmc-pwrseq-simple";
62 - reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
65 - sd_io_1v8_reg: sd_io_1v8_reg {
67 - compatible = "regulator-gpio";
68 - vin-supply = <&vdd_5v0_reg>;
69 - regulator-name = "vdd-sd-io";
70 - regulator-min-microvolt = <1800000>;
71 - regulator-max-microvolt = <3300000>;
73 - regulator-always-on;
74 - regulator-settling-time-us = <5000>;
76 - gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
77 - states = <1800000 0x1
84 - compatible = "raspberrypi,firmware-gpio";
87 - gpio-line-names = "BT_ON",
100 - pinctrl-names = "default";
101 - pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
105 -/* SDHCI is used to control the SDIO for wireless */
107 - #address-cells = <1>;
109 - pinctrl-names = "default";
110 - pinctrl-0 = <&emmc_gpio34>;
114 - mmc-pwrseq = <&wifi_pwrseq>;
118 - compatible = "brcm,bcm4329-fmac";
122 -/* EMMC2 is used to drive the SD card */
126 - vqmmc-supply = <&sd_io_1v8_reg>;
130 - phy-handle = <&phy1>;
131 - phy-mode = "rgmii-rxid";
136 - phy1: ethernet-phy@1 {
137 - /* No PHY interrupt */
139 - led-modes = <0x00 0x08>; /* link/activity link */
143 -/* uart0 communicates with the BT module */
145 - pinctrl-names = "default";
146 - pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32>;
151 - compatible = "brcm,bcm43438-bt";
152 - max-speed = <2000000>;
153 - shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
157 -/* uart1 is mapped to the pin header */
159 - pinctrl-names = "default";
160 - pinctrl-0 = <&uart1_gpio14>;