Skip to content

Commit

Permalink
ARM: dts: Rebuild downstream DTS files
Browse files Browse the repository at this point in the history
Refactor the tree of downstream DTS files to achieve approximately the
same end result but wihout modifying upstream files (except for
bcm2711-rpi-4-b.dts).

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  • Loading branch information
pelwell committed Jan 31, 2020
1 parent c892332 commit 0a6e31a
Show file tree
Hide file tree
Showing 11 changed files with 758 additions and 928 deletions.
131 changes: 6 additions & 125 deletions arch/arm/boot/dts/bcm2708-rpi.dtsi
@@ -1,6 +1,7 @@
/* Downstream modifications to bcm2835-rpi.dtsi */
/* Downstream modifications common to bcm2835, bcm2836, bcm2837 */

#include "bcm2835-rpi.dtsi"
#include "bcm270x-rpi.dtsi"

/ {
memory@0 {
Expand All @@ -9,146 +10,26 @@
};

aliases {
audio = &audio;
aux = &aux;
sound = &sound;
soc = &soc;
dma = &dma;
intc = &intc;
watchdog = &watchdog;
random = &random;
mailbox = &mailbox;
gpio = &gpio;
uart0 = &uart0;
sdhost = &sdhost;
mmc0 = &sdhost;
i2s = &i2s;
spi0 = &spi0;
i2c0 = &i2c0;
uart1 = &uart1;
spi1 = &spi1;
spi2 = &spi2;
mmc = &mmc;
mmc1 = &mmc;
i2c1 = &i2c1;
i2c2 = &i2c2;
usb = &usb;
leds = &leds;
fb = &fb;
thermal = &thermal;
axiperf = &axiperf;
};

leds: leds {
compatible = "gpio-leds";
};

soc {
gpiomem {
compatible = "brcm,bcm2835-gpiomem";
reg = <0x7e200000 0x1000>;
};

fb: fb {
compatible = "brcm,bcm2708-fb";
firmware = <&firmware>;
status = "okay";
};

vcsm: vcsm {
compatible = "raspberrypi,bcm2835-vcsm";
firmware = <&firmware>;
status = "okay";
};

/* Onboard audio */
audio: audio {
compatible = "brcm,bcm2835-audio";
brcm,pwm-channels = <8>;
status = "disabled";
};

/* External sound card */
sound: sound {
status = "disabled";
};
};

__overrides__ {
cache_line_size;

uart0 = <&uart0>,"status";
uart1 = <&uart1>,"status";
i2s = <&i2s>,"status";
spi = <&spi0>,"status";
i2c0 = <&i2c0>,"status";
i2c1 = <&i2c1>,"status";
i2c2_iknowwhatimdoing = <&i2c2>,"status";
i2c0_baudrate = <&i2c0>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";
i2c2_baudrate = <&i2c2>,"clock-frequency:0";

audio = <&audio>,"status";
watchdog = <&watchdog>,"status";
random = <&random>,"status";
sd_overclock = <&sdhost>,"brcm,overclock-50:0";
sd_force_pio = <&sdhost>,"brcm,force-pio?";
sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
sd_debug = <&sdhost>,"brcm,debug";
sdio_overclock = <&mmc>,"brcm,overclock-50:0",
<&mmcnr>,"brcm,overclock-50:0";
axiperf = <&axiperf>,"status";
};
};

&hdmi {
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "disabled";
};

&txp {
status = "disabled";
};

&i2c0 {
status = "disabled";
};

&i2c1 {
status = "disabled";
};

&i2c2 {
status = "disabled";
};

&clocks {
firmware = <&firmware>;
};

&sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio48>;
bus-width = <4>;
};

sdhost_pins: &sdhost_gpio48 {
/* Add alias */
};

&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
brcm,overclock-50 = <0>;
brcm,pio-limit = <1>;
status = "okay";
};

&cpu_thermal {
/delete-node/ trips;
&hdmi {
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "disabled";
};

&vec {
&i2c2 {
status = "disabled";
};
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/bcm2708.dtsi
Expand Up @@ -8,3 +8,7 @@
arm_freq;
};
};

&vc4 {
status = "disabled";
};
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/bcm2709.dtsi
Expand Up @@ -16,3 +16,7 @@
<&v7_cpu3>, "clock-frequency:0";
};
};

&vc4 {
status = "disabled";
};
139 changes: 139 additions & 0 deletions arch/arm/boot/dts/bcm270x-rpi.dtsi
@@ -0,0 +1,139 @@
/* Downstream modifications to bcm2835-rpi.dtsi */

/ {
aliases {
audio = &audio;
aux = &aux;
sound = &sound;
soc = &soc;
dma = &dma;
intc = &intc;
watchdog = &watchdog;
random = &random;
mailbox = &mailbox;
gpio = &gpio;
uart0 = &uart0;
uart1 = &uart1;
sdhost = &sdhost;
mmc = &mmc;
mmc1 = &mmc;
mmc0 = &sdhost;
i2s = &i2s;
i2c0 = &i2c0;
i2c1 = &i2c1;
spi0 = &spi0;
spi1 = &spi1;
spi2 = &spi2;
usb = &usb;
leds = &leds;
fb = &fb;
thermal = &thermal;
axiperf = &axiperf;
};

/* Define these notional regulators for use by overlays */
vdd_3v3_reg: fixedregulator_3v3 {
compatible = "regulator-fixed";
regulator-always-on;
regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>;
regulator-name = "3v3";
};

vdd_5v0_reg: fixedregulator_5v0 {
compatible = "regulator-fixed";
regulator-always-on;
regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>;
regulator-name = "5v0";
};

leds: leds {
compatible = "gpio-leds";
};

soc {
gpiomem {
compatible = "brcm,bcm2835-gpiomem";
reg = <0x7e200000 0x1000>;
};

fb: fb {
compatible = "brcm,bcm2708-fb";
firmware = <&firmware>;
status = "okay";
};

vcsm: vcsm {
compatible = "raspberrypi,bcm2835-vcsm";
firmware = <&firmware>;
status = "okay";
};

/* Onboard audio */
audio: audio {
compatible = "brcm,bcm2835-audio";
brcm,pwm-channels = <8>;
status = "disabled";
};

/* External sound card */
sound: sound {
status = "disabled";
};
};

__overrides__ {
cache_line_size;

uart0 = <&uart0>,"status";
uart1 = <&uart1>,"status";
i2s = <&i2s>,"status";
spi = <&spi0>,"status";
i2c0 = <&i2c0>,"status";
i2c1 = <&i2c1>,"status";
i2c0_baudrate = <&i2c0>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";

audio = <&audio>,"status";
watchdog = <&watchdog>,"status";
random = <&random>,"status";
sd_overclock = <&sdhost>,"brcm,overclock-50:0";
sd_force_pio = <&sdhost>,"brcm,force-pio?";
sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
sd_debug = <&sdhost>,"brcm,debug";
sdio_overclock = <&mmc>,"brcm,overclock-50:0",
<&mmcnr>,"brcm,overclock-50:0";
axiperf = <&axiperf>,"status";
};
};

&txp {
status = "disabled";
};

&i2c0 {
status = "disabled";
};

&i2c1 {
status = "disabled";
};

&clocks {
firmware = <&firmware>;
};

&sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio48>;
bus-width = <4>;
};

&cpu_thermal {
/delete-node/ trips;
};

&vec {
status = "disabled";
};

0 comments on commit 0a6e31a

Please sign in to comment.