1 From 8aa8fd89094952e3201b927fb846ba61b30cab6b 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 | 118 --------------------------
13 2 files changed, 119 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 @@ -95,7 +95,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
21 bcm2837-rpi-3-b-plus.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 - reg = <0 0 0x40000000>;
50 - gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
55 - gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
59 - wifi_pwrseq: wifi-pwrseq {
60 - compatible = "mmc-pwrseq-simple";
61 - reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
64 - sd_io_1v8_reg: sd_io_1v8_reg {
66 - compatible = "regulator-gpio";
67 - vin-supply = <&vdd_5v0_reg>;
68 - regulator-name = "vdd-sd-io";
69 - regulator-min-microvolt = <1800000>;
70 - regulator-max-microvolt = <3300000>;
72 - regulator-always-on;
73 - regulator-settling-time-us = <5000>;
75 - gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
76 - states = <1800000 0x1
83 - compatible = "raspberrypi,firmware-gpio";
86 - gpio-line-names = "BT_ON",
99 - pinctrl-names = "default";
100 - pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
104 -/* SDHCI is used to control the SDIO for wireless */
106 - #address-cells = <1>;
108 - pinctrl-names = "default";
109 - pinctrl-0 = <&emmc_gpio34>;
113 - mmc-pwrseq = <&wifi_pwrseq>;
117 - compatible = "brcm,bcm4329-fmac";
121 -/* EMMC2 is used to drive the SD card */
125 - vqmmc-supply = <&sd_io_1v8_reg>;
128 -/* uart0 communicates with the BT module */
130 - pinctrl-names = "default";
131 - pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>;
135 - compatible = "brcm,bcm43438-bt";
136 - max-speed = <2000000>;
137 - shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
141 -/* uart1 is mapped to the pin header */
143 - pinctrl-names = "default";
144 - pinctrl-0 = <&uart1_gpio14>;