lkml.org 
[lkml]   [2019]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/2] ARM: dts: Move interconnect target module for omap3 sgx to separate dtsi files
Date
Only dm3730 and am3715 come with SGX support

Signed-off-by: André Hentschel <nerv@dawncrow.de>
---

I changed some dtsi files where I could be sure it's dm3730

arch/arm/boot/dts/am3715.dtsi | 38 ++++++++++++++++++++++++
arch/arm/boot/dts/dm3730.dtsi | 6 ++++
arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +-
arch/arm/boot/dts/omap36xx.dtsi | 28 -----------------
6 files changed, 47 insertions(+), 31 deletions(-)
create mode 100644 arch/arm/boot/dts/am3715.dtsi
create mode 100644 arch/arm/boot/dts/dm3730.dtsi

diff --git a/arch/arm/boot/dts/am3715.dtsi b/arch/arm/boot/dts/am3715.dtsi
new file mode 100644
index 000000000000..f53d1f24dc53
--- /dev/null
+++ b/arch/arm/boot/dts/am3715.dtsi
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2019 André Hentschel <nerv@dawncrow.de>
+ */
+
+#include "omap36xx.dtsi"
+
+/ {
+ ocp@68000000 {
+ /*
+ * Note that the sysconfig register layout is a subset of the
+ * "ti,sysc-omap4" type register with just sidle and midle bits
+ * available while omap34xx has "ti,sysc-omap2" type sysconfig.
+ */
+ sgx_module: target-module@50000000 {
+ compatible = "ti,sysc-omap4", "ti,sysc";
+ reg = <0x5000fe00 0x4>,
+ <0x5000fe10 0x4>;
+ reg-names = "rev", "sysc";
+ ti,sysc-midle = <SYSC_IDLE_FORCE>,
+ <SYSC_IDLE_NO>,
+ <SYSC_IDLE_SMART>;
+ ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+ <SYSC_IDLE_NO>,
+ <SYSC_IDLE_SMART>;
+ clocks = <&sgx_fck>, <&sgx_ick>;
+ clock-names = "fck", "ick";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x50000000 0x2000000>;
+
+ /*
+ * Closed source PowerVR driver, no child device
+ * binding or driver in mainline
+ */
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/dm3730.dtsi b/arch/arm/boot/dts/dm3730.dtsi
new file mode 100644
index 000000000000..8d278499965b
--- /dev/null
+++ b/arch/arm/boot/dts/dm3730.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2019 André Hentschel <nerv@dawncrow.de>
+ */
+
+#include "am3715.dtsi"
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index b6ef1a7ac8a4..564bce9164f9 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -6,7 +6,7 @@
*/
/dts-v1/;

-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"
#include <dt-bindings/input/input.h>

/ {
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index c22833d4e568..1086cde24ba5 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -3,7 +3,7 @@
* Copyright (C) 2014 Christoph Fritz <chf.fritzc@googlemail.com>
*/

-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"

/ {
model = "INCOstartec LILLY-A83X module (DM3730)";
diff --git a/arch/arm/boot/dts/omap3-pandora-1ghz.dts b/arch/arm/boot/dts/omap3-pandora-1ghz.dts
index 81b957f33c9f..da71dd68a84a 100644
--- a/arch/arm/boot/dts/omap3-pandora-1ghz.dts
+++ b/arch/arm/boot/dts/omap3-pandora-1ghz.dts
@@ -10,7 +10,7 @@

/dts-v1/;

-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"
#include "omap3-pandora-common.dtsi"

/ {
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 1e552f08f120..6fb23ada1f64 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -139,34 +139,6 @@
interrupts = <18>;
};
};
-
- /*
- * Note that the sysconfig register layout is a subset of the
- * "ti,sysc-omap4" type register with just sidle and midle bits
- * available while omap34xx has "ti,sysc-omap2" type sysconfig.
- */
- sgx_module: target-module@50000000 {
- compatible = "ti,sysc-omap4", "ti,sysc";
- reg = <0x5000fe00 0x4>,
- <0x5000fe10 0x4>;
- reg-names = "rev", "sysc";
- ti,sysc-midle = <SYSC_IDLE_FORCE>,
- <SYSC_IDLE_NO>,
- <SYSC_IDLE_SMART>;
- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
- <SYSC_IDLE_NO>,
- <SYSC_IDLE_SMART>;
- clocks = <&sgx_fck>, <&sgx_ick>;
- clock-names = "fck", "ick";
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x50000000 0x2000000>;
-
- /*
- * Closed source PowerVR driver, no child device
- * binding or driver in mainline
- */
- };
};

thermal_zones: thermal-zones {
--
2.17.1
\
 
 \ /
  Last update: 2019-12-30 21:22    [W:0.039 / U:7.348 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site