ARM: dts: Move all Cygnus peripherals into axi bus

Move all Cygnus peripherals to be under the "axi" bus node of type
"simple-bus"

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Ray Jui 2015-09-21 15:12:45 -07:00 committed by Florian Fainelli
parent ef5b812a4e
commit 0f0b21a83a
1 changed files with 165 additions and 164 deletions

View File

@ -88,6 +88,12 @@ L2: l2-cache {
}; };
}; };
axi {
compatible = "simple-bus";
ranges;
#address-cells = <1>;
#size-cells = <1>;
pinctrl: pinctrl@0x0301d0c8 { pinctrl: pinctrl@0x0301d0c8 {
compatible = "brcm,cygnus-pinmux"; compatible = "brcm,cygnus-pinmux";
reg = <0x0301d0c8 0x30>, reg = <0x0301d0c8 0x30>,
@ -124,21 +130,13 @@ gpio_asiu: gpio@180a5000 {
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
}; };
amba { wdt0: wdt@18009000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus", "simple-bus";
interrupt-parent = <&gic>;
ranges;
wdt@18009000 {
compatible = "arm,sp805" , "arm,primecell"; compatible = "arm,sp805" , "arm,primecell";
reg = <0x18009000 0x1000>; reg = <0x18009000 0x1000>;
interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&axi81_clk>; clocks = <&axi81_clk>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
};
i2c0: i2c@18008000 { i2c0: i2c@18008000 {
compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
@ -247,8 +245,10 @@ uart3: serial@18023000 {
}; };
nand: nand@18046000 { nand: nand@18046000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; "brcm,brcmnand";
reg = <0x18046000 0x600>, <0xf8105408 0x600>,
<0x18046f00 0x20>;
reg-names = "nand", "iproc-idm", "iproc-ext"; reg-names = "nand", "iproc-idm", "iproc-ext";
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@ -257,4 +257,5 @@ nand: nand@18046000 {
brcm,nand-has-wp; brcm,nand-has-wp;
}; };
};
}; };