Skip to content

BCM270X_DT: Use bcm283x.dtsi, bcm2835.dtsi and bcm2836.dtsi #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,10 @@
};

&i2s {
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>;
};

&random {
status = "okay";
};

&leds {
act_led: act {
label = "led0";
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/boot/dts/bcm2708-rpi-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,10 @@
};

&i2s {
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>;
};

&random {
status = "okay";
};

&leds {
act_led: act {
label = "led0";
Expand Down
5 changes: 2 additions & 3 deletions arch/arm/boot/dts/bcm2708-rpi-cm.dts
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,12 @@
};

&i2s {
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>;
};

&random {
status = "okay";
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};

/ {
Expand Down
105 changes: 105 additions & 0 deletions arch/arm/boot/dts/bcm2708-rpi.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/* Downstream version of bcm2835-rpi.dtsi */

#include <dt-bindings/power/raspberrypi-power.h>

/ {
memory {
device_type = "memory";
reg = <0x0 0x0>;
};

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;
i2s = &i2s;
spi0 = &spi0;
i2c0 = &i2c0;
uart1 = &uart1;
spi1 = &spi1;
spi2 = &spi2;
mmc = &mmc;
i2c1 = &i2c1;
i2c2 = &i2c2;
usb = &usb;
leds = &leds;
fb = &fb;
vchiq = &vchiq;
thermal = &thermal;
};

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

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

firmware: firmware {
compatible = "raspberrypi,bcm2835-firmware";
mboxes = <&mailbox>;
};

power: power {
compatible = "raspberrypi,bcm2835-power";
firmware = <&firmware>;
#power-domain-cells = <1>;
};

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

vchiq: vchiq {
compatible = "brcm,bcm2835-vchiq";
reg = <0x7e00b840 0xf>;
interrupts = <0 2>;
cache-line-size = <32>;
firmware = <&firmware>;
};

thermal: thermal {
compatible = "brcm,bcm2835-thermal";
firmware = <&firmware>;
};

/* 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 = <&vchiq>, "cache-line-size:0";
};
};

&dma {
brcm,dma-channel-mask = <0x7f34>;
};

&hdmi {
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
};
28 changes: 5 additions & 23 deletions arch/arm/boot/dts/bcm2708.dtsi
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
#include "bcm2708_common.dtsi"
#include "bcm2835.dtsi"
#include "bcm270x.dtsi"
#include "bcm2708-rpi.dtsi"

/ {
compatible = "brcm,bcm2708";
model = "BCM2708";

chosen {
/* No padding required - the boot loader can do that. */
bootargs = "";
};

soc {
ranges = <0x7e000000 0x20000000 0x01000000>;
/delete-property/ dma-ranges;

timer@7e003000 {
compatible = "brcm,bcm2835-system-timer";
reg = <0x7e003000 0x1000>;
interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
clock-frequency = <1000000>;
};

arm-pmu {
compatible = "arm,arm1176-pmu";
};

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

&intc {
compatible = "brcm,bcm2835-armctrl-ic";
};

&watchdog {
status = "okay";
/delete-node/ cpus;
};
Loading