From 1733007c133ddd2bf73124363a1a1210c7114c92 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 7 Jul 2022 12:46:31 +0200 Subject: [PATCH] ARM: zynq: Fix OCM mmio-sram node First of all addresses where addresses for OCM controller not for OCM memory itself. Also move OCM node from zc702 to generic dtsi to be avalable for everybody. Also remove ocm-sram node which can't be used with zynq pm.c which expects only flat structure. Right now OCM is used for saving suspend code. Signed-off-by: Michal Simek Tested-by: Appana Durga Kedareswara rao --- arch/arm/boot/dts/zynq-7000.dtsi | 6 ++---- arch/arm/boot/dts/zynq-zc702.dts | 13 ------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index ca1583ec36c6d6..aa19b1643fa056 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -192,11 +192,9 @@ reg = <0xf8006000 0x1000>; }; - ocmc: ocmc@f800c000 { + ocm: sram@fffc0000 { compatible = "mmio-sram"; - interrupt-parent = <&intc>; - interrupts = <0 3 4>; - reg = <0xf800c000 0x1000>; + reg = <0xfffc0000 0x10000>; }; uart0: serial@e0000000 { diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index fb918a14fdc953..292458916632f5 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -67,19 +67,6 @@ }; }; -&amba { - ocm: sram@fffc0000 { - compatible = "mmio-sram"; - reg = <0xfffc0000 0x10000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0xfffc0000 0x10000>; - ocm-sram@0 { - reg = <0x0 0x10000>; - }; - }; -}; - &can0 { status = "okay"; pinctrl-names = "default";