[linux-yocto] [PATCH 04/10] axxia: Update the Axxia Device Trees
Daniel Dragomir
daniel.dragomir at windriver.com
Tue May 17 15:50:40 PDT 2016
From: John Jacques <john.jacques at intel.com>
Increase 'size-cells' to 2 to allow using more than 4 GB
of memory.
Signed-off-by: John Jacques <john.jacques at intel.com>
---
arch/arm64/boot/dts/intel/axc6704-emu.dts | 2 +-
arch/arm64/boot/dts/intel/axc6704-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axc6712-emu.dts | 2 +-
arch/arm64/boot/dts/intel/axc6716-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axc6732-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axc67xx.dtsi | 104 +++++++++++++++---------------
arch/arm64/boot/dts/intel/axm5604-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axm5606-emu.dts | 2 +-
arch/arm64/boot/dts/intel/axm5608-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axm5616-sim.dts | 8 +--
arch/arm64/boot/dts/intel/axm56xx.dtsi | 81 ++++++++++++-----------
11 files changed, 119 insertions(+), 120 deletions(-)
diff --git a/arch/arm64/boot/dts/intel/axc6704-emu.dts b/arch/arm64/boot/dts/intel/axc6704-emu.dts
index e544f99..756337d 100644
--- a/arch/arm64/boot/dts/intel/axc6704-emu.dts
+++ b/arch/arm64/boot/dts/intel/axc6704-emu.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
soc {
diff --git a/arch/arm64/boot/dts/intel/axc6704-sim.dts b/arch/arm64/boot/dts/intel/axc6704-sim.dts
index 7f6f482..6273840 100644
--- a/arch/arm64/boot/dts/intel/axc6704-sim.dts
+++ b/arch/arm64/boot/dts/intel/axc6704-sim.dts
@@ -20,25 +20,25 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x34000000 0x1000>;
+ reg = <0x80 0x34000000 0 0x1000>;
interrupts = <GIC_SPI 639 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8034010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x34010000 0x1000>;
+ reg = <0x80 0x34010000 0 0x1000>;
interrupts = <GIC_SPI 638 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x33000000 0x1000000>;
+ reg = <0x80 0x33000000 0 0x1000000>;
interrupts = <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axc6712-emu.dts b/arch/arm64/boot/dts/intel/axc6712-emu.dts
index f69d6f2..b1a4866 100644
--- a/arch/arm64/boot/dts/intel/axc6712-emu.dts
+++ b/arch/arm64/boot/dts/intel/axc6712-emu.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
soc {
diff --git a/arch/arm64/boot/dts/intel/axc6716-sim.dts b/arch/arm64/boot/dts/intel/axc6716-sim.dts
index a4718c55..01e7200 100644
--- a/arch/arm64/boot/dts/intel/axc6716-sim.dts
+++ b/arch/arm64/boot/dts/intel/axc6716-sim.dts
@@ -20,25 +20,25 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x34000000 0x1000>;
+ reg = <0x80 0x34000000 0 0x1000>;
interrupts = <GIC_SPI 639 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8034010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x34010000 0x1000>;
+ reg = <0x80 0x34010000 0 0x1000>;
interrupts = <GIC_SPI 638 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x33000000 0x1000000>;
+ reg = <0x80 0x33000000 0 0x1000000>;
interrupts = <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axc6732-sim.dts b/arch/arm64/boot/dts/intel/axc6732-sim.dts
index 8846890..9b0d2f2 100644
--- a/arch/arm64/boot/dts/intel/axc6732-sim.dts
+++ b/arch/arm64/boot/dts/intel/axc6732-sim.dts
@@ -20,25 +20,25 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x34000000 0x1000>;
+ reg = <0x80 0x34000000 0 0x1000>;
interrupts = <GIC_SPI 639 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8034010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x34010000 0x1000>;
+ reg = <0x80 0x34010000 0 0x1000>;
interrupts = <GIC_SPI 638 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x33000000 0x1000000>;
+ reg = <0x80 0x33000000 0 0x1000000>;
interrupts = <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axc67xx.dtsi b/arch/arm64/boot/dts/intel/axc67xx.dtsi
index d3d1115..43592de 100644
--- a/arch/arm64/boot/dts/intel/axc67xx.dtsi
+++ b/arch/arm64/boot/dts/intel/axc67xx.dtsi
@@ -14,7 +14,7 @@
/ {
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
interrupt-parent = <&gic>;
@@ -23,7 +23,7 @@
memory {
device_type = "memory";
- reg = <0 0 0>;
+ reg = <0 0 0 0>;
};
aliases {
@@ -55,7 +55,7 @@
clocks {
compatible = "simple-bus";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
ranges;
clk_ref {
@@ -76,8 +76,8 @@
#interrupt-cells = <3>;
#address-cells = <0>;
interrupt-controller;
- reg = <0x80 0x10000000 0x10000>,
- <0x80 0x10400000 0x400000>;
+ reg = <0x80 0x10000000 0 0x10000>,
+ <0x80 0x10400000 0 0x400000>;
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
@@ -98,18 +98,18 @@
compatible = "simple-bus";
device_type = "soc";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
interrupt-parent = <&gic>;
ranges;
syscon: syscon at 8002000000 {
compatible = "lsi,axxia-syscon", "syscon";
- reg = <0x80 0x02c00000 0x40000>;
+ reg = <0x80 0x02c00000 0 0x40000>;
};
nemac: ethernet at 8080240000 {
compatible = "intel,nemac";
- reg = <0x80 0x80240000 0x10000>;
+ reg = <0x80 0x80240000 0 0x10000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
dma-coherent;
@@ -120,7 +120,7 @@
compatible = "lsi,axm-mdio";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80260000 0x1000>;
+ reg = <0x80 0x80260000 0 0x1000>;
status = "disabled";
};
@@ -128,13 +128,13 @@
compatible = "lsi,axm-mdio";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80270000 0x1000>;
+ reg = <0x80 0x80270000 0 0x1000>;
status = "disabled";
};
usb0: usb at 9000000000 {
compatible = "snps,dwc3";
- reg = <0x90 0x00000000 0x10000>;
+ reg = <0x90 0x00000000 0 0x10000>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
dma-coherent;
status = "disabled";
@@ -142,7 +142,7 @@
usb1: usb at 9800000000 {
compatible = "snps,dwc3";
- reg = <0x98 0x00000000 0x10000>;
+ reg = <0x98 0x00000000 0 0x10000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
dma-coherent;
status = "disabled";
@@ -150,7 +150,7 @@
gpdma0: gpdma at 8005020000 {
compatible = "lsi,dma32";
- reg = <0x80 0x05020000 0x10000>;
+ reg = <0x80 0x05020000 0 0x10000>;
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
channel0 {
@@ -164,7 +164,7 @@
gpdma1: gpdma at 8005030000 {
compatible = "lsi,dma32";
- reg = <0x80 0x05030000 0x10000>;
+ reg = <0x80 0x05030000 0 0x10000>;
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
@@ -181,7 +181,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80600000 0x1000>;
+ reg = <0x80 0x80600000 0 0x1000>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -192,7 +192,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80610000 0x1000>;
+ reg = <0x80 0x80610000 0 0x1000>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -203,7 +203,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80620000 0x1000>;
+ reg = <0x80 0x80620000 0 0x1000>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -214,7 +214,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80630000 0x1000>;
+ reg = <0x80 0x80630000 0 0x1000>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -225,7 +225,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80640000 0x1000>;
+ reg = <0x80 0x80640000 0 0x1000>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -236,7 +236,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80650000 0x1000>;
+ reg = <0x80 0x80650000 0 0x1000>;
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -247,7 +247,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80660000 0x1000>;
+ reg = <0x80 0x80660000 0 0x1000>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -258,7 +258,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80670000 0x1000>;
+ reg = <0x80 0x80670000 0 0x1000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -269,7 +269,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80680000 0x1000>;
+ reg = <0x80 0x80680000 0 0x1000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -280,7 +280,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80690000 0x1000>;
+ reg = <0x80 0x80690000 0 0x1000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -291,7 +291,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x806a0000 0x1000>;
+ reg = <0x80 0x806a0000 0 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -302,7 +302,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x806b0000 0x1000>;
+ reg = <0x80 0x806b0000 0 0x1000>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -313,7 +313,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x806c0000 0x1000>;
+ reg = <0x80 0x806c0000 0 0x1000>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -322,14 +322,14 @@
mtc: mtc at 8080210000 {
compatible = "lsi,mtc";
- reg = <0x80 0x80210000 0x10000>;
+ reg = <0x80 0x80210000 0 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
trng: trng at 8031060000 {
compatible = "lsi,trng";
- reg = <0x80 0x31060000 0x20000>;
+ reg = <0x80 0x31060000 0 0x20000>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
@@ -337,9 +337,9 @@
pci0: pcie at c000000000 {
compatible = "intel,axxia-pcie";
device_type = "pci";
- reg = <0xa0 0x02000000 0x00100000 /* dbi */
- 0xa0 0x03000000 0x00008000 /* AXI gpreg */
- 0xa0 0x03008000 0x00008000>; /* CC gpreg */
+ reg = <0xa0 0x02000000 0 0x00100000 /* dbi */
+ 0xa0 0x03000000 0 0x00008000 /* AXI gpreg */
+ 0xa0 0x03008000 0 0x00008000>; /* CC gpreg */
reg-names = "dbi", "axi_gpreg", "cc_gpreg";
#interrupt-cells = <1>;
#address-cells = <3>;
@@ -391,12 +391,12 @@
amba {
compatible = "arm,amba-bus";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
ranges;
serial0: uart at 8080000000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80000000 0x10000>;
+ reg = <0x80 0x80000000 0 0x10000>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -405,7 +405,7 @@
serial1: uart at 8080010000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80010000 0x10000>;
+ reg = <0x80 0x80010000 0 0x10000>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -414,7 +414,7 @@
serial2: uart at 8080020000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80020000 0x10000>;
+ reg = <0x80 0x80020000 0 0x10000>;
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -423,7 +423,7 @@
timer0: timer at 8080220000 {
compatible = "arm,sp804", "arm,primecell";
- reg = <0x80 0x80220000 0x10000>;
+ reg = <0x80 0x80220000 0 0x10000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
@@ -440,7 +440,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80700000 0x10000>;
+ reg = <0x80 0x80700000 0 0x10000>;
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -451,7 +451,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80710000 0x10000>;
+ reg = <0x80 0x80710000 0 0x10000>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -462,7 +462,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80720000 0x10000>;
+ reg = <0x80 0x80720000 0 0x10000>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -473,7 +473,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80730000 0x10000>;
+ reg = <0x80 0x80730000 0 0x10000>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -484,7 +484,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80740000 0x10000>;
+ reg = <0x80 0x80740000 0 0x10000>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -495,7 +495,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80750000 0x10000>;
+ reg = <0x80 0x80750000 0 0x10000>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -506,7 +506,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80760000 0x10000>;
+ reg = <0x80 0x80760000 0 0x10000>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -517,7 +517,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80770000 0x10000>;
+ reg = <0x80 0x80770000 0 0x10000>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -528,7 +528,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80780000 0x10000>;
+ reg = <0x80 0x80780000 0 0x10000>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
status = "disabled";
@@ -538,7 +538,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80790000 0x10000>;
+ reg = <0x80 0x80790000 0 0x10000>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
status = "disabled";
@@ -548,7 +548,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x807a0000 0x10000>;
+ reg = <0x80 0x807a0000 0 0x10000>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
status = "disabled";
@@ -558,7 +558,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x807b0000 0x10000>;
+ reg = <0x80 0x807b0000 0 0x10000>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
status = "disabled";
@@ -569,7 +569,7 @@
arm,primecell-periphid = <0x000b6022>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80100000 0x1000>;
+ reg = <0x80 0x80100000 0 0x1000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
num-cs = <5>;
clocks = <&clks AXXIA_CLK_PER>, <&clks AXXIA_CLK_PER>;
@@ -582,7 +582,7 @@
arm,primecell-periphid = <0x000b6022>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80110000 0x1000>;
+ reg = <0x80 0x80110000 0 0x1000>;
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
num-cs = <5>;
clocks = <&clks AXXIA_CLK_PER>, <&clks AXXIA_CLK_PER>;
@@ -595,7 +595,7 @@
arm,primecell-periphid = <0x000b6022>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80120000 0x1000>;
+ reg = <0x80 0x80120000 0 0x1000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
num-cs = <5>;
clocks = <&clks AXXIA_CLK_PER>, <&clks AXXIA_CLK_PER>;
diff --git a/arch/arm64/boot/dts/intel/axm5604-sim.dts b/arch/arm64/boot/dts/intel/axm5604-sim.dts
index 7757a80..9f68e39 100644
--- a/arch/arm64/boot/dts/intel/axm5604-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5604-sim.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
mmc_3v3: fixedregulator at 0 {
@@ -34,19 +34,19 @@
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x21000000 0x10000>;
+ reg = <0x80 0x21000000 0 0x10000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8021010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x21010000 0x1000>;
+ reg = <0x80 0x21010000 0 0x1000>;
interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x20000000 0x1000000>;
+ reg = <0x80 0x20000000 0 0x1000000>;
interrupts = <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axm5606-emu.dts b/arch/arm64/boot/dts/intel/axm5606-emu.dts
index 6888ce6..0440366 100644
--- a/arch/arm64/boot/dts/intel/axm5606-emu.dts
+++ b/arch/arm64/boot/dts/intel/axm5606-emu.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
mmc_3v3: fixedregulator at 0 {
diff --git a/arch/arm64/boot/dts/intel/axm5608-sim.dts b/arch/arm64/boot/dts/intel/axm5608-sim.dts
index a81a47d..b9418f4 100644
--- a/arch/arm64/boot/dts/intel/axm5608-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5608-sim.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
mmc_3v3: fixedregulator at 0 {
@@ -34,19 +34,19 @@
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x21000000 0x10000>;
+ reg = <0x80 0x21000000 0 0x10000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8021010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x21010000 0x1000>;
+ reg = <0x80 0x21010000 0 0x1000>;
interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x20000000 0x1000000>;
+ reg = <0x80 0x20000000 0 0x1000000>;
interrupts = <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axm5616-sim.dts b/arch/arm64/boot/dts/intel/axm5616-sim.dts
index 554b08a..fbd1344 100644
--- a/arch/arm64/boot/dts/intel/axm5616-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5616-sim.dts
@@ -20,7 +20,7 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
+ reg = <0 0x00000000 0 0x40000000>;
};
mmc_3v3: fixedregulator at 0 {
@@ -34,19 +34,19 @@
soc {
virtio_block at 8021000000 {
compatible = "virtio,mmio";
- reg = <0x80 0x21000000 0x10000>;
+ reg = <0x80 0x21000000 0 0x10000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;
};
vmfs at 8021010000 {
compatible = "arm,messagebox";
- reg = <0x80 0x21010000 0x1000>;
+ reg = <0x80 0x21010000 0 0x1000>;
interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
};
ethernet at 8020000000 {
compatible = "smsc,lan91c111";
- reg = <0x80 0x20000000 0x1000000>;
+ reg = <0x80 0x20000000 0 0x1000000>;
interrupts = <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>;
phy-mode = "mii";
reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/intel/axm56xx.dtsi b/arch/arm64/boot/dts/intel/axm56xx.dtsi
index de96ecb..f387404 100644
--- a/arch/arm64/boot/dts/intel/axm56xx.dtsi
+++ b/arch/arm64/boot/dts/intel/axm56xx.dtsi
@@ -14,7 +14,7 @@
/ {
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
interrupt-parent = <&gic>;
@@ -22,8 +22,6 @@
};
memory {
- #address-cells = <2>;
- #size-cells = <2>;
device_type = "memory";
reg = <0 0 0 0>;
};
@@ -46,7 +44,7 @@
clocks {
compatible = "simple-bus";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
ranges;
clk_ref {
@@ -67,8 +65,8 @@
#interrupt-cells = <3>;
#address-cells = <0>;
interrupt-controller;
- reg = <0x80 0x10000000 0x10000>,
- <0x80 0x10200000 0x200000>;
+ reg = <0x80 0x10000000 0 0x10000>,
+ <0x80 0x10200000 0 0x200000>;
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
@@ -89,13 +87,13 @@
compatible = "simple-bus";
device_type = "soc";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
interrupt-parent = <&gic>;
ranges;
syscon: syscon at 8002000000 {
compatible = "intel,axxia-syscon", "syscon";
- reg = <0x80 0x02c00000 0x40000>;
+ reg = <0x80 0x02c00000 0 0x40000>;
};
reset: reset at 2010031000 {
@@ -106,7 +104,7 @@
nemac: ethernet at 8080240000 {
compatible = "intel,nemac";
- reg = <0x80 0x80240000 0x10000>;
+ reg = <0x80 0x80240000 0 0x10000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
dma-coherent;
@@ -117,7 +115,7 @@
compatible = "lsi,axm-mdio";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80200000 0x1000>;
+ reg = <0x80 0x80200000 0 0x1000>;
status = "disabled";
};
@@ -126,32 +124,32 @@
dma-coherent;
status = "disabled";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
ranges;
dwc3 {
compatible = "snps,dwc3";
- reg = <0x90 0x00000000 0x10000>;
+ reg = <0x90 0x00000000 0 0x10000>;
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
};
};
sata0: sata at a000000000 {
compatible = "snps,dwc-ahci";
- reg = <0xa0 0x00000000 0x10000>;
+ reg = <0xa0 0x00000000 0 0x10000>;
dma-coherent;
status = "disabled";
};
sata1: sata at a000010000 {
compatible = "snps,dwc-ahci";
- reg = <0xa0 0x00010000 0x10000>;
+ reg = <0xa0 0x00010000 0 0x10000>;
dma-coherent;
status = "disabled";
};
gpdma0: gpdma at 8004120000 {
compatible = "lsi,dma32";
- reg = <0x80 0x04120000 0x10000>;
+ reg = <0x80 0x04120000 0 0x10000>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
channel0 {
@@ -165,7 +163,7 @@
gpdma1: gpdma at 8004130000 {
compatible = "lsi,dma32";
- reg = <0x80 0x04130000 0x10000>;
+ reg = <0x80 0x04130000 0 0x10000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
@@ -182,7 +180,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80080000 0x1000>;
+ reg = <0x80 0x80080000 0 0x1000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -193,7 +191,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80090000 0x1000>;
+ reg = <0x80 0x80090000 0 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -204,7 +202,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x800a0000 0x1000>;
+ reg = <0x80 0x800a0000 0 0x1000>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -215,7 +213,7 @@
compatible = "lsi,api2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x800b0000 0x1000>;
+ reg = <0x80 0x800b0000 0 0x1000>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "i2c";
@@ -224,22 +222,22 @@
mtc: mtc at 8080210000 {
compatible = "lsi,mtc";
- reg = <0x80 0x80210000 0x10000>;
+ reg = <0x80 0x80210000 0 0x10000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
trng: trng at 8031060000 {
compatible = "lsi,trng";
- reg = <0x80 0x31060000 0x20000>;
+ reg = <0x80 0x31060000 0 0x20000>;
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
pci0: pcie at c000000000 {
compatible = "intel,axxia-pcie";
device_type = "pci";
- reg = <0xa0 0x02000000 0x00100000 /* dbi */
- 0xa0 0x03000000 0x00008000 /* AXI gpreg */
- 0xa0 0x03008000 0x00008000>; /* CC gpreg */
+ reg = <0xa0 0x02000000 0 0x00100000 /* dbi */
+ 0xa0 0x03000000 0 0x00008000 /* AXI gpreg */
+ 0xa0 0x03008000 0 0x00008000>; /* CC gpreg */
reg-names = "dbi", "axi_gpreg", "cc_gpreg";
#interrupt-cells = <1>;
#address-cells = <3>;
@@ -290,9 +288,9 @@
pci1: pcie at c800000000 {
compatible = "intel,axxia-pcie";
device_type = "pci";
- reg = <0xa0 0x04000000 0x00100000 /* dbi */
- 0xa0 0x05000000 0x00008000 /* AXI gpreg */
- 0xa0 0x05008000 0x00008000>; /* CC gpreg */
+ reg = <0xa0 0x04000000 0 0x00100000 /* dbi */
+ 0xa0 0x05000000 0 0x00008000 /* AXI gpreg */
+ 0xa0 0x05008000 0 0x00008000>; /* CC gpreg */
reg-names = "dbi", "axi_gpreg", "cc_gpreg";
#interrupt-cells = <1>;
#address-cells = <3>;
@@ -311,9 +309,9 @@
pci2: pcie at d000000000 {
compatible = "intel,axxia-pcie";
device_type = "pci";
- reg = <0xa0 0x06000000 0x00100000 /* dbi */
- 0xa0 0x07000000 0x00008000 /* AXI gpreg */
- 0xa0 0x07008000 0x00008000>; /* CC gpreg */
+ reg = <0xa0 0x06000000 0 0x00100000 /* dbi */
+ 0xa0 0x07000000 0 0x00008000 /* AXI gpreg */
+ 0xa0 0x07008000 0 0x00008000>; /* CC gpreg */
reg-names = "dbi", "axi_gpreg", "cc_gpreg";
#interrupt-cells = <1>;
#address-cells = <3>;
@@ -332,12 +330,12 @@
amba {
compatible = "arm,amba-bus";
#address-cells = <2>;
- #size-cells = <1>;
+ #size-cells = <2>;
ranges;
serial0: uart at 8080000000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80000000 0x10000>;
+ reg = <0x80 0x80000000 0 0x10000>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -346,7 +344,7 @@
serial1: uart at 8080010000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80010000 0x10000>;
+ reg = <0x80 0x80010000 0 0x10000>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -355,7 +353,7 @@
serial2: uart at 8080020000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80020000 0x10000>;
+ reg = <0x80 0x80020000 0 0x10000>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -364,7 +362,7 @@
serial3: uart at 8080030000 {
compatible = "arm,pl011", "arm,primecell";
- reg = <0x80 0x80030000 0x10000>;
+ reg = <0x80 0x80030000 0 0x10000>;
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -373,7 +371,7 @@
timer0: timer at 8080220000 {
compatible = "arm,sp804", "arm,primecell";
- reg = <0x80 0x80220000 0x10000>;
+ reg = <0x80 0x80220000 0 0x10000>;
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
@@ -390,7 +388,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80180000 0x10000>;
+ reg = <0x80 0x80180000 0 0x10000>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
@@ -408,7 +406,7 @@
#gpio-cells = <2>;
compatible = "arm,pl061", "arm,primecell";
gpio-controller;
- reg = <0x80 0x80190000 0x10000>;
+ reg = <0x80 0x80190000 0 0x10000>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks AXXIA_CLK_PER>;
clock-names = "apb_pclk";
@@ -420,10 +418,11 @@
arm,primecell-periphid = <0x000b6022>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x80 0x80100000 0x1000>;
+ reg = <0x80 0x80100000 0 0x1000>;
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
num-cs = <5>;
- clocks = <&clks AXXIA_CLK_PER>, <&clks AXXIA_CLK_PER>;
+ clocks = <&clks AXXIA_CLK_PER>,
+ <&clks AXXIA_CLK_PER>;
clock-names = "spi", "apb_pclk";
status = "disabled";
};
--
1.9.1
More information about the linux-yocto
mailing list