Commit 1fb2e59c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.4/ti-sysc-sgx-signed' of... 

Merge tag 'omap-for-v5.4/ti-sysc-sgx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late

SoC glue layer changes for SGX on omap variants for v5.4

For a while we've had omap4 sgx glue layer defined in dts and probed
with ti-sysc driver. This allows idling the sgx module for PM, and
removes the need for custom platform glue layer code for any further
driver changes.

We first drop the unused legacy platform data for omap4 sgx. Then for
omap5, we need add the missing clkctrl clock data so we can configure
sgx. And we configure sgx for omap34xx, omap36xx and am3517.

For am335x, we still have a dependency for rstctrl reset driver changes,
so that will be added later on.

Note that this branch is based on earlier ti-sysc branch for omap36xx
glue layer quirk handling.

* tag 'omap-for-v5.4/ti-sysc-sgx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: ARM: dts: Configure interconnect target module for am3517sgx
  ARM: dts: Configure interconnect target module for omap3 sgx
  ARM: dts: Configure sgx for omap5
  clk: ti: add clkctrl data omap5 sgx
  ARM: OMAP2+: Drop legacy platform data for omap4 gpu

Link: https://lore.kernel.org/r/pull-1567016893-318461@atomide.com-4


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents feeb04ce 6cb0ac0f

arch/arm/boot/dts/am3517.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -88,6 +88,30 @@ 
			interrupts = <24>;

			clocks = <&hecc_ck>;

		};



		/*

		 * On am3517 the OCP registers do not seem to be accessible

		 * similar to the omap34xx. Maybe SGX is permanently set to

		 * "OCP bypass mode", or maybe there is OCP_SYSCONFIG that is

		 * write-only at 0x50000e10. We detect SGX based on the SGX

		 * revision register instead of the unreadable OCP revision

		 * register.

		 */

		sgx_module: target-module@50000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			reg = <0x50000014 0x4>;

			reg-names = "rev";

			clocks = <&sgx_fck>, <&sgx_ick>;

			clock-names = "fck", "ick";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x50000000 0x4000>;



			/*

			 * Closed source PowerVR driver, no child device

			 * binding or driver in mainline

			 */

		};

	};

};

arch/arm/boot/dts/omap34xx.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -100,6 +100,32 @@ 
				interrupts = <18>;

			};

		};



		/*

		 * On omap34xx the OCP registers do not seem to be accessible

		 * at all unlike on 36xx. Maybe SGX is permanently set to

		 * "OCP bypass mode", or maybe there is OCP_SYSCONFIG that is

		 * write-only at 0x50000e10. We detect SGX based on the SGX

		 * revision register instead of the unreadable OCP revision

		 * register. Also note that on early 34xx es1 revision there

		 * are also different clocks, but we do not have any dts users

		 * for it.

		 */

		sgx_module: target-module@50000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			reg = <0x50000014 0x4>;

			reg-names = "rev";

			clocks = <&sgx_fck>, <&sgx_ick>;

			clock-names = "fck", "ick";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x50000000 0x4000>;



			/*

			 * Closed source PowerVR driver, no child device

			 * binding or driver in mainline

			 */

		};

	};



	thermal_zones: thermal-zones {

arch/arm/boot/dts/omap36xx.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -139,6 +139,34 @@ 
				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 {

arch/arm/boot/dts/omap4.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ 


		target-module@56000000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "gpu";

			reg = <0x5601fc00 0x4>,

			      <0x5601fc10 0x4>;

			reg-names = "rev", "sysc";

arch/arm/boot/dts/omap5.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -257,6 +257,29 @@ 
			ports-implemented = <0x1>;

		};



		target-module@56000000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0x5600fe00 0x4>,

			      <0x5600fe10 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 = <&gpu_clkctrl OMAP5_GPU_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x56000000 0x2000000>;



			/*

			 * Closed source PowerVR driver, no child device

			 * binding or driver in mainline

			 */

		};



		dss: dss@58000000 {

			compatible = "ti,omap5-dss";

			reg = <0x58000000 0x80>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE