Skip to contentSkip to conversation

ARM: dts: Move interconnect target module for omap3 sgx to separate dtsi files

PATCH In review André Hentschel 2 participants 5 messages Dec 30, 2019 – Jan 2, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 ARM: dts: Move interconnect target module for omap3 sgx to separate dtsi files

Only dm3730 and am3715 come with SGX support

---

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
arch/arm/boot/dts/am3715.dtsi new file +38 -0
new file mode 100644
index 000000000000..f53d1f24dc53
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2019 André Hentschel <[email protected]>
+ */
+
+#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
+			 */
+		};
+	};
+};
arch/arm/boot/dts/dm3730.dtsi new file +6 -0
new file mode 100644
index 000000000000..8d278499965b
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2019 André Hentschel <[email protected]>
+ */
+
+#include "am3715.dtsi"
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
index b6ef1a7ac8a4..564bce9164f9 100644
@@ -6,7 +6,7 @@
  */
 /dts-v1/;
 
-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"
 #include <dt-bindings/input/input.h>
 
 / {
arch/arm/boot/dts/omap3-lilly-a83x.dtsi +1 -1
index c22833d4e568..1086cde24ba5 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Christoph Fritz <[email protected]>
  */
 
-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"
 
 / {
 	model = "INCOstartec LILLY-A83X module (DM3730)";
arch/arm/boot/dts/omap3-pandora-1ghz.dts +1 -1
index 81b957f33c9f..da71dd68a84a 100644
@@ -10,7 +10,7 @@
 
 /dts-v1/;
 
-#include "omap36xx.dtsi"
+#include "dm3730.dtsi"
 #include "omap3-pandora-common.dtsi"
 
 / {
arch/arm/boot/dts/omap36xx.dtsi +0 -28
index 1e552f08f120..6fb23ada1f64 100644
@@ -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 {
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH v2 2/2 ARM: dts: Add omap3-echo

This is the first generation Amazon Echo from 2016. Audio support is not yet implemented.

---

v2: Don't disable sgx, as the previous patch changes dtsi files accordingly

I have local patches for the microphone array, but cleaning that up will take some time. Audio output seems to be even harder work...
You can find a tutorial on how to boot the Echo here:
https://labs.f-secure.com/archive/alexa-are-you-listening/

 arch/arm/boot/dts/Makefile       |   1 +
 arch/arm/boot/dts/omap3-echo.dts | 462 +++++++++++++++++++++++++++++++
 2 files changed, 463 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap3-echo.dts
arch/arm/boot/dts/Makefile +1 -0
index b21b3a64641a..923dabc09203 100644
@@ -685,6 +685,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
 	omap3-devkit8000.dtb \
 	omap3-devkit8000-lcd43.dtb \
 	omap3-devkit8000-lcd70.dtb \
+	omap3-echo.dtb \
 	omap3-evm.dtb \
 	omap3-evm-37xx.dtb \
 	omap3-gta04a3.dtb \
arch/arm/boot/dts/omap3-echo.dts new file +462 -0

462 lines not on this page · raw message

Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw
In reply to André Hentschel
Quoted 1 line · André Hentschel

Only dm3730 and am3715 come with SGX support

AFAIK dm3730 is just a marketing name for a catalog version of omap3630. So using omap36xx.dtsi is correct and we should not change that.

Can you please just add a minimal dm3725.dtsi that your board dts can include and avoid disabling sgx in the board specific file? That is assuming you have dm3725 with dsp and isp but no sgx.

You can read the detected SoC with:

# cat /sys/bus/soc/devices/soc0/machine

This avoids somebody (probably me again) patching all over the board specific files trying to guess which SoC the device might have.

Regards,

Tony

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

Am 02.01.20 um 20:33 schrieb Tony Lindgren:

Quoted 10 lines · André Hentschel
Quoted 1 line

Only dm3730 and am3715 come with SGX support

AFAIK dm3730 is just a marketing name for a catalog version of omap3630. So using omap36xx.dtsi is correct and we should not change that.

Can you please just add a minimal dm3725.dtsi that your board dts can include and avoid disabling sgx in the board specific file? That is assuming you have dm3725 with dsp and isp but no sgx.

I removed the sgx disable part already in 2/2.
Consulting my table:

     DM3730 | DM3725 | AM3715 | AM3703
DSP    X    |   X    |        |    
SGX    X    |        |   X    |    

Where X is "supported"

So including omap63xx.dtsi seems right after this patch moves the sgx part to separate dtsi. Or do you want to have the sxg disabling in the dm3725.dtsi?

Quoted 3 lines

You can read the detected SoC with:

# cat /sys/bus/soc/devices/soc0/machine
# cat /sys/bus/soc/devices/soc0/machine
DM3725
# cat /sys/bus/soc/devices/soc0/revision 
ES1.2
#4 lore raw
Quoted 14 lines · André Hentschel

Am 02.01.20 um 20:33 schrieb Tony Lindgren:

Quoted 10 lines · André Hentschel
Quoted 1 line

Only dm3730 and am3715 come with SGX support

AFAIK dm3730 is just a marketing name for a catalog version of omap3630. So using omap36xx.dtsi is correct and we should not change that.

Can you please just add a minimal dm3725.dtsi that your board dts can include and avoid disabling sgx in the board specific file? That is assuming you have dm3725 with dsp and isp but no sgx.

I removed the sgx disable part already in 2/2.
Consulting my table:

Quoted 8 lines
     DM3730 | DM3725 | AM3715 | AM3703
DSP    X    |   X    |        |    
SGX    X    |        |   X    |    

Where X is "supported"

So including omap63xx.dtsi seems right after this patch moves the sgx part to separate dtsi. Or do you want to have the sxg disabling in the dm3725.dtsi?

Yes please just add a minimal dm3725.dtsi including omap36xx.dtsi and setting sgx to status = "disabled". And then you can include dm3725.dtsi from your board specific dts file.

Quoted 8 lines
Quoted 3 lines

You can read the detected SoC with:

# cat /sys/bus/soc/devices/soc0/machine
# cat /sys/bus/soc/devices/soc0/machine
DM3725
# cat /sys/bus/soc/devices/soc0/revision 
ES1.2

OK yeah makes sense for that product as potentially only the dsp is used for audio.

Regards,

Tony