target/linux/bcm27xx/patches-5.4/950-0423-ARM-dts-Remove-bcm2838-rpi-4-b.dts.patch

   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
   5
   6 Upstream are not going to use the bcm2838 identifier, so begin the
   7 cleanup by removing the suggested upstream Pi 4 .dts file.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  10 ---
  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
  15
  16 --- a/arch/arm/boot/dts/Makefile
  17 +++ b/arch/arm/boot/dts/Makefile
  18 @@ -97,7 +97,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
  19         bcm2837-rpi-3-b.dtb \
  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
  27 +++ /dev/null
  28 @@ -1,134 +0,0 @@
  29 -// SPDX-License-Identifier: GPL-2.0
  30 -/dts-v1/;
  31 -#include "bcm2838.dtsi"
  32 -#include "bcm2835-rpi.dtsi"
  33 -#include "bcm2838-rpi.dtsi"
  34 -
  35 -/ {
  36 -       compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
  37 -       model = "Raspberry Pi 4 Model B";
  38 -
  39 -       chosen {
  40 -               /* 8250 auxiliary UART instead of pl011 */
  41 -               stdout-path = "serial1:115200n8";
  42 -       };
  43 -
  44 -       memory@0 {
  45 -               device_type = "memory";
  46 -               reg = <0x0 0x0 0x0>;
  47 -       };
  48 -
  49 -       leds {
  50 -               act {
  51 -                       gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
  52 -               };
  53 -
  54 -               pwr {
  55 -                       label = "PWR";
  56 -                       gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
  57 -               };
  58 -       };
  59 -
  60 -       wifi_pwrseq: wifi-pwrseq {
  61 -               compatible = "mmc-pwrseq-simple";
  62 -               reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
  63 -       };
  64 -
  65 -       sd_io_1v8_reg: sd_io_1v8_reg {
  66 -               status = "okay";
  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>;
  72 -               regulator-boot-on;
  73 -               regulator-always-on;
  74 -               regulator-settling-time-us = <5000>;
  75 -
  76 -               gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
  77 -               states = <1800000 0x1
  78 -                         3300000 0x0>;
  79 -       };
  80 -};
  81 -
  82 -&firmware {
  83 -       expgpio: gpio {
  84 -               compatible = "raspberrypi,firmware-gpio";
  85 -               gpio-controller;
  86 -               #gpio-cells = <2>;
  87 -               gpio-line-names = "BT_ON",
  88 -                                 "WL_ON",
  89 -                                 "PWR_LED_OFF",
  90 -                                 "GLOBAL_RESET",
  91 -                                 "VDD_SD_IO_SEL",
  92 -                                 "CAM_GPIO",
  93 -                                 "",
  94 -                                 "";
  95 -               status = "okay";
  96 -       };
  97 -};
  98 -
  99 -&pwm1 {
 100 -       pinctrl-names = "default";
 101 -       pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
 102 -       status = "okay";
 103 -};
 104 -
 105 -/* SDHCI is used to control the SDIO for wireless */
 106 -&sdhci {
 107 -       #address-cells = <1>;
 108 -       #size-cells = <0>;
 109 -       pinctrl-names = "default";
 110 -       pinctrl-0 = <&emmc_gpio34>;
 111 -       status = "okay";
 112 -       bus-width = <4>;
 113 -       non-removable;
 114 -       mmc-pwrseq = <&wifi_pwrseq>;
 115 -
 116 -       brcmf: wifi@1 {
 117 -               reg = <1>;
 118 -               compatible = "brcm,bcm4329-fmac";
 119 -       };
 120 -};
 121 -
 122 -/* EMMC2 is used to drive the SD card */
 123 -&emmc2 {
 124 -       status = "okay";
 125 -       broken-cd;
 126 -       vqmmc-supply = <&sd_io_1v8_reg>;
 127 -};
 128 -
 129 -&genet {
 130 -       phy-handle = <&phy1>;
 131 -       phy-mode = "rgmii-rxid";
 132 -       status = "okay";
 133 -};
 134 -
 135 -&genet_mdio {
 136 -       phy1: ethernet-phy@1 {
 137 -               /* No PHY interrupt */
 138 -               reg = <0x1>;
 139 -               led-modes = <0x00 0x08>; /* link/activity link */
 140 -       };
 141 -};
 142 -
 143 -/* uart0 communicates with the BT module */
 144 -&uart0 {
 145 -       pinctrl-names = "default";
 146 -       pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32>;
 147 -       uart-has-rtscts;
 148 -       status = "okay";
 149 -
 150 -       bluetooth {
 151 -               compatible = "brcm,bcm43438-bt";
 152 -               max-speed = <2000000>;
 153 -               shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
 154 -       };
 155 -};
 156 -
 157 -/* uart1 is mapped to the pin header */
 158 -&uart1 {
 159 -       pinctrl-names = "default";
 160 -       pinctrl-0 = <&uart1_gpio14>;
 161 -       status = "okay";
 162 -};