diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-06-01 11:10:14 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-06-01 11:13:22 +0200 |
commit | 860c186c7d5998d54ef02ff273804b1eb31a9ba1 (patch) | |
tree | b8e79326067b0dc3860db77d7cc732a207d6c610 | |
parent | 6d6693c8a7ca305e531aa3bf6a03e8545e294719 (diff) |
ARM: dts: sunxi: Revert SRAM controller drivers patches
This patch reverts commit ccb4ada2f193 ("ARM: dts: sun7i: Add A20 SRAM and
SRAM controller"), commit e6f51e4bd2a5 ("ARM: dts: sun5i: Add A13 and A10s
SRAM and SRAM controller") and commit 6d92b80f356f ("ARM: dts: sun4i: Add
A10 SRAM and SRAM controller").
The bindings have been changed in the SRAM driver, and we need to
change the DT accordingly.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 34 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun5i.dtsi | 34 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 34 |
3 files changed, 0 insertions, 102 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 73b6143e3e91..d7f43e5caf49 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -448,46 +448,12 @@ }; }; - /* - * Note we use the address where the mmio registers start, not where - * the SRAM blocks start, this cannot be changed because that would be - * a devicetree ABI change. - */ soc@01c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram@00000000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00000000 0x4000>; - allwinner,sram-name = "A1"; - }; - - sram@00004000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00004000 0x4000>; - allwinner,sram-name = "A2"; - }; - - sram@00008000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00008000 0x4000>; - allwinner,sram-name = "A3-A4"; - }; - - sram@00010000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00010000 0x1000>; - allwinner,sram-name = "D"; - }; - - sram-controller@01c00000 { - compatible = "allwinner,sun4i-a10-sram-controller"; - reg = <0x01c00000 0x30>; - }; - dma: dma-controller@01c02000 { compatible = "allwinner,sun4i-a10-dma"; reg = <0x01c02000 0x1000>; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 5f662435a935..26095aa97ada 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -293,46 +293,12 @@ }; }; - /* - * Note we use the address where the mmio registers start, not where - * the SRAM blocks start, this cannot be changed because that would be - * a devicetree ABI change. - */ soc@01c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram@00000000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00000000 0x4000>; - allwinner,sram-name = "A1"; - }; - - sram@00004000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00004000 0x4000>; - allwinner,sram-name = "A2"; - }; - - sram@00008000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00008000 0x4000>; - allwinner,sram-name = "A3-A4"; - }; - - sram@00010000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00010000 0x1000>; - allwinner,sram-name = "D"; - }; - - sram-controller@01c00000 { - compatible = "allwinner,sun4i-a10-sram-controller"; - reg = <0x01c00000 0x30>; - }; - dma: dma-controller@01c02000 { compatible = "allwinner,sun4i-a10-dma"; reg = <0x01c02000 0x1000>; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 99d48b4da01b..25bd4f1d393c 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -528,46 +528,12 @@ }; }; - /* - * Note we use the address where the mmio registers start, not where - * the SRAM blocks start, this cannot be changed because that would be - * a devicetree ABI change. - */ soc@01c00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sram@00000000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00000000 0x4000>; - allwinner,sram-name = "A1"; - }; - - sram@00004000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00004000 0x4000>; - allwinner,sram-name = "A2"; - }; - - sram@00008000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00008000 0x4000>; - allwinner,sram-name = "A3-A4"; - }; - - sram@00010000 { - compatible = "allwinner,sun4i-a10-sram"; - reg = <0x00010000 0x1000>; - allwinner,sram-name = "D"; - }; - - sram-controller@01c00000 { - compatible = "allwinner,sun4i-a10-sram-controller"; - reg = <0x01c00000 0x30>; - }; - nmi_intc: interrupt-controller@01c00030 { compatible = "allwinner,sun7i-a20-sc-nmi"; interrupt-controller; |