Commit 98d70a5c authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux into arm/dt

This pull request contain Broadcom ARM-based SoCs Device Tree changes
for 5.3 please pull the following:

- Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
  controller

- Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
  and provides a fix for devices failing to boot after the removal of
  skelton.dtsi (that commit has been submitted as a separate fix)

* tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Fix most DTC W=1 warnings
  ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
  ARM: dts: BCM63xx: Fix DTC W=1 warnings
  ARM: dts: BCM53573: Fix DTC W=1 warnings
  ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
  ARM: dts: Cygnus: Fix most DTC W=1 warnings
  ARM: dts: Fix BCM7445 DTC warnings
  ARM: bcm283x: Enable DMA support for SPI controller
  ARM: dts: bcm: Add missing device_type = "memory" property
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4ed7e4e5 dfa84bb9
......@@ -42,7 +42,7 @@ osc: oscillator {
};
/* Cygnus ARM PLL */
armpll: armpll {
armpll: armpll@19000000 {
#clock-cells = <0>;
compatible = "brcm,cygnus-armpll";
clocks = <&osc>;
......@@ -67,7 +67,7 @@ apb_clk: apb_clk {
clock-mult = <1>;
};
genpll: genpll {
genpll: genpll@301d000 {
#clock-cells = <1>;
compatible = "brcm,cygnus-genpll";
reg = <0x0301d000 0x2c>, <0x0301c020 0x4>;
......@@ -94,7 +94,7 @@ axi81_clk: axi81_clk {
clock-mult = <1>;
};
lcpll0: lcpll0 {
lcpll0: lcpll0@301d02c {
#clock-cells = <1>;
compatible = "brcm,cygnus-lcpll0";
reg = <0x0301d02c 0x1c>, <0x0301c020 0x4>;
......@@ -103,7 +103,7 @@ lcpll0: lcpll0 {
"usb_phy", "smart_card", "ch5";
};
mipipll: mipipll {
mipipll: mipipll@180a9800 {
#clock-cells = <1>;
compatible = "brcm,cygnus-mipipll";
reg = <0x180a9800 0x2c>, <0x0301c020 0x4>, <0x180aa024 0x4>;
......@@ -113,7 +113,7 @@ mipipll: mipipll {
"ch5_unused";
};
asiu_clks: asiu_clks {
asiu_clks: asiu_clks@301d048 {
#clock-cells = <1>;
compatible = "brcm,cygnus-asiu-clk";
reg = <0x0301d048 0xc>, <0x180aa024 0x4>;
......@@ -122,7 +122,7 @@ asiu_clks: asiu_clks {
clock-output-names = "keypad", "adc/touch", "pwm";
};
audiopll: audiopll {
audiopll: audiopll@180aeb00 {
#clock-cells = <1>;
compatible = "brcm,cygnus-audiopll";
reg = <0x180aeb00 0x68>;
......
......@@ -45,7 +45,7 @@ aliases {
ethernet0 = &eth0;
};
memory {
memory@0 {
device_type = "memory";
reg = <0 0>;
};
......@@ -69,7 +69,7 @@ pmu {
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
};
core {
core@19000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x19000000 0x1000000>;
#address-cells = <1>;
......@@ -91,7 +91,7 @@ gic: interrupt-controller@21000 {
<0x20100 0x100>;
};
L2: l2-cache {
L2: l2-cache@22000 {
compatible = "arm,pl310-cache";
reg = <0x22000 0x1000>;
cache-unified;
......
......@@ -77,7 +77,7 @@ pmu {
interrupt-affinity = <&cpu0>, <&cpu1>;
};
mpcore {
mpcore@19000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x19000000 0x00023000>;
#address-cells = <1>;
......@@ -122,7 +122,7 @@ gic: interrupt-controller@21000 {
<0x20100 0x100>;
};
L2: l2-cache {
L2: l2-cache@22000 {
compatible = "arm,pl310-cache";
reg = <0x22000 0x1000>;
cache-unified;
......@@ -166,7 +166,7 @@ periph_clk: periph_clk {
};
};
axi {
axi@18000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x18000000 0x0011c40c>;
#address-cells = <1>;
......@@ -415,9 +415,6 @@ srab: srab@36000 {
"imp_sleep_timer_p5",
"imp_sleep_timer_p7",
"imp_sleep_timer_p8";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
/* ports are defined in board DTS */
......
......@@ -100,7 +100,7 @@ uart@3e003000 {
reg-io-width = <4>;
};
L2: l2-cache {
L2: l2-cache@3ff20000 {
compatible = "brcm,bcm11351-a2-pl310-cache";
reg = <0x3ff20000 0x1000>;
cache-unified;
......@@ -225,21 +225,21 @@ clocks {
#size-cells = <1>;
ranges;
root_ccu: root_ccu {
root_ccu: root_ccu@35001000 {
compatible = "brcm,bcm11351-root-ccu";
reg = <0x35001000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "frac_1m";
};
hub_ccu: hub_ccu {
hub_ccu: hub_ccu@34000000 {
compatible = "brcm,bcm11351-hub-ccu";
reg = <0x34000000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "tmon_1m";
};
aon_ccu: aon_ccu {
aon_ccu: aon_ccu@35002000 {
compatible = "brcm,bcm11351-aon-ccu";
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
......@@ -248,7 +248,7 @@ aon_ccu: aon_ccu {
"pmu_bsc_var";
};
master_ccu: master_ccu {
master_ccu: master_ccu@3f001000 {
compatible = "brcm,bcm11351-master-ccu";
reg = <0x3f001000 0x0f00>;
#clock-cells = <1>;
......@@ -261,7 +261,7 @@ master_ccu: master_ccu {
"hsic2_12m";
};
slave_ccu: slave_ccu {
slave_ccu: slave_ccu@3e011000 {
compatible = "brcm,bcm11351-slave-ccu";
reg = <0x3e011000 0x0f00>;
#clock-cells = <1>;
......
......@@ -21,7 +21,7 @@ / {
model = "BCM21664 Garnet board";
compatible = "brcm,bcm21664-garnet", "brcm,bcm21664";
memory {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
......
......@@ -90,7 +90,7 @@ uart@3e002000 {
reg-io-width = <4>;
};
L2: l2-cache {
L2: l2-cache@3ff20000 {
compatible = "arm,pl310-cache";
reg = <0x3ff20000 0x1000>;
cache-unified;
......@@ -295,21 +295,21 @@ var_156m_clk: var_156m {
clock-frequency = <156000000>;
};
root_ccu: root_ccu {
root_ccu: root_ccu@35001000 {
compatible = BCM21664_DT_ROOT_CCU_COMPAT;
reg = <0x35001000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "frac_1m";
};
aon_ccu: aon_ccu {
aon_ccu: aon_ccu@35002000 {
compatible = BCM21664_DT_AON_CCU_COMPAT;
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "hub_timer";
};
master_ccu: master_ccu {
master_ccu: master_ccu@3f001000 {
compatible = BCM21664_DT_MASTER_CCU_COMPAT;
reg = <0x3f001000 0x0f00>;
#clock-cells = <1>;
......@@ -323,7 +323,7 @@ master_ccu: master_ccu {
"sdio4_sleep";
};
slave_ccu: slave_ccu {
slave_ccu: slave_ccu@3e011000 {
compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
reg = <0x3e011000 0x0f00>;
#clock-cells = <1>;
......
......@@ -45,7 +45,7 @@ chosen {
bootargs = "console=ttyS0,115200n8";
};
memory {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};
......
......@@ -371,21 +371,21 @@ var_156m_clk: var_156m {
clock-frequency = <156000000>;
};
root_ccu: root_ccu {
root_ccu: root_ccu@35001000 {
compatible = BCM21664_DT_ROOT_CCU_COMPAT;
reg = <0x35001000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "frac_1m";
};
aon_ccu: aon_ccu {
aon_ccu: aon_ccu@35002000 {
compatible = BCM21664_DT_AON_CCU_COMPAT;
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "hub_timer";
};
slave_ccu: slave_ccu {
slave_ccu: slave_ccu@3e011000 {
compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
reg = <0x3e011000 0x0f00>;
#clock-cells = <1>;
......@@ -398,7 +398,7 @@ slave_ccu: slave_ccu {
"bsc4";
};
master_ccu: master_ccu {
master_ccu: master_ccu@3f001000 {
compatible = BCM21664_DT_MASTER_CCU_COMPAT;
reg = <0x3f001000 0x0f00>;
#clock-cells = <1>;
......
......@@ -21,7 +21,7 @@ / {
model = "BCM28155 AP board";
compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
memory {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
......
......@@ -431,6 +431,8 @@ spi: spi@7e204000 {
reg = <0x7e204000 0x1000>;
interrupts = <2 22>;
clocks = <&clocks BCM2835_CLOCK_VPU>;
dmas = <&dma 6>, <&dma 7>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......@@ -68,8 +69,6 @@ usb2 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
rfkill {
label = "WiFi";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......@@ -52,8 +53,6 @@ usb3 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
brightness {
label = "Backlight";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
};
......@@ -98,8 +99,6 @@ wireless1 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,14 +16,13 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -17,14 +17,13 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -15,7 +15,8 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -43,8 +44,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -50,8 +51,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -21,6 +21,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......@@ -61,8 +62,6 @@ wireless {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......@@ -57,8 +58,6 @@ wireless {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -19,7 +19,8 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......@@ -92,8 +93,6 @@ wan-red {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
rfkill {
label = "WiFi";
......
......@@ -19,7 +19,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -59,8 +59,6 @@ usb3 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -19,7 +19,7 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -90,8 +90,6 @@ wireless1 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
aoss {
label = "AOSS";
......
......@@ -19,7 +19,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -95,8 +95,6 @@ wireless1 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -44,8 +44,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -88,8 +88,6 @@ lan1 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -76,8 +76,6 @@ usb2-port2 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
rfkill {
label = "WiFi";
......
......@@ -20,6 +20,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......
......@@ -20,6 +20,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
};
......
......@@ -17,6 +17,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......
......@@ -20,6 +20,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......
......@@ -31,6 +31,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
......
......@@ -16,6 +16,7 @@ chosen {
};
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......
......@@ -19,7 +19,7 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -85,8 +85,6 @@ usb3-white {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -24,8 +24,6 @@ memory {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
......@@ -43,8 +43,6 @@ usb3 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -42,8 +42,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
......@@ -43,8 +43,6 @@ usb3 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
......@@ -83,8 +83,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
......@@ -58,8 +58,6 @@ status {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -16,7 +16,7 @@ chosen {
bootargs = "console=ttyS0,115200";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
......@@ -64,8 +64,6 @@ usb3 {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
brightness {
label = "Backlight";
......
......@@ -13,15 +13,14 @@ / {
compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
model = "Phicomm K3";
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
};
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -38,8 +38,6 @@ system {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -48,8 +48,6 @@ pcie0_leds {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -15,7 +15,7 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -58,8 +58,6 @@ pcie0_leds {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
rfkill {
label = "WiFi";
......
......@@ -19,7 +19,7 @@ / {
#size-cells = <1>;
interrupt-parent = <&gic>;
chipcommonA {
chipcommonA@18000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x18000000 0x00001000>;
#address-cells = <1>;
......@@ -44,7 +44,7 @@ uart1: serial@400 {
};
};
mpcore {
mpcore@19000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x19000000 0x00023000>;
#address-cells = <1>;
......@@ -148,7 +148,7 @@ periph_clk: periph_clk {
};
};
usb2_phy: usb2-phy {
usb2_phy: usb2-phy@1800c000 {
compatible = "brcm,ns-usb2-phy";
reg = <0x1800c000 0x1000>;
reg-names = "dmu";
......@@ -357,7 +357,7 @@ mdio: mdio@18003000 {
#address-cells = <0>;
};
mdio-bus-mux {
mdio-bus-mux@18003000 {
compatible = "mdio-mux-mmioreg";
mdio-parent-bus = <&mdio>;
#address-cells = <1>;
......@@ -464,8 +464,6 @@ thermal: thermal@1800c2c0 {
srab: srab@18007000 {
compatible = "brcm,bcm5301x-srab";
reg = <0x18007000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
......
......@@ -32,7 +32,7 @@ cpu@0 {
};
};
mpcore {
mpcore@18310000 {
compatible = "simple-bus";
ranges = <0x00000000 0x18310000 0x00008000>;
#address-cells = <1>;
......
......@@ -41,9 +41,6 @@ cpu@1 {
};
clocks {
#address-cells = <1>;
#size-cells = <0>;
/* UBUS peripheral clock */
periph_clk: periph_clk {
#clock-cells = <0>;
......@@ -94,7 +91,7 @@ scu: scu@1e000 {
reg = <0x1e000 0x100>;
};
gic: interrupt-controller@1e100 {
gic: interrupt-controller@1f000 {
compatible = "arm,cortex-a9-gic";
reg = <0x1f000 0x1000
0x1e100 0x100>;
......@@ -125,7 +122,7 @@ twd_watchdog: watchdog@1e620 {
IRQ_TYPE_LEVEL_HIGH)>;
};
armpll: armpll {
armpll: armpll@20000 {
#clock-cells = <0>;
compatible = "brcm,bcm63138-armpll";
clocks = <&periph_clk>;
......@@ -144,7 +141,7 @@ pmb1: reset-controller@4800e0 {
#reset-cells = <2>;
};
ahci: sata@8000 {
ahci: sata@a000 {
compatible = "brcm,bcm63138-ahci", "brcm,sata3-ahci";
reg-names = "ahci", "top-ctrl";
reg = <0xa000 0x9ac>, <0x8040 0x24>;
......
......@@ -6,7 +6,7 @@ / {
model = "Broadcom STB (bcm7445), SVMB reference board";
compatible = "brcm,bcm7445", "brcm,brcmstb";
memory {
memory@0 {
device_type = "memory";
reg = <0x00 0x00000000 0x00 0x40000000>,
<0x00 0x40000000 0x00 0x40000000>,
......
......@@ -63,7 +63,7 @@ timer {
<GIC_PPI 10 (GIC_CPU_MASK_RAW(15) | IRQ_TYPE_LEVEL_LOW)>;
};
rdb {
rdb@f0000000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
......@@ -224,7 +224,7 @@ upg_gio_aon: gpio@4172c0 {
};
memory_controllers {
memory_controllers@f1100000 {
compatible = "simple-bus";
ranges = <0x0 0x0 0xf1100000 0x200000>;
#address-cells = <1>;
......@@ -252,7 +252,7 @@ shimphy@8000 {
};
};
memc@1 {
memc@80000 {
compatible = "brcm,brcmstb-memc", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
......@@ -274,7 +274,7 @@ shimphy@8000 {
};
};
memc@2 {
memc@100000 {
compatible = "brcm,brcmstb-memc", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
......
......@@ -49,8 +49,6 @@ chosen {
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
hook {
label = "HOOK";
......
......@@ -39,6 +39,7 @@ / {
compatible = "brcm,bcm94708", "brcm,bcm4708";
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
};
......
......@@ -39,6 +39,7 @@ / {
compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
memory {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
};
......
......@@ -17,7 +17,7 @@ chosen {
bootargs = "console=ttyS0,115200 earlycon";
};
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>;
};
......@@ -43,8 +43,6 @@ wps {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
restart {
label = "Reset";
......
......@@ -39,15 +39,13 @@ / {
model = "NorthStar Enterprise Router (BCM953012ER)";
compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
memory {
memory@0 {
device_type = "memory";
reg = <0x00000000 0x8000000>;
};
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
......
......@@ -43,7 +43,7 @@ aliases {
serial1 = &uart1;
};
memory {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x10000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x40000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x20000000>;
};
......
......@@ -42,7 +42,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
......@@ -16,7 +16,8 @@ chosen {
stdout-path = &serial0;
};
memory {
memory@0 {
device_type = "memory";
reg = <0x0 0x08000000>;
};
......
......@@ -43,7 +43,7 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x80000000>;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment