Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e14d7e53 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: dts: Update ti-sysc data for existing users 



Let's update the existing users with features and clock data as
specified in the binding. This is currently the smartreflex for most
part, and also few omap4 modules with no child device driver like
mcasp, abe iss and gfx.

Note that we had few mistakes that did not get noticed as we're still
probing the SmartReflex driver with legacy platform data and using
"ti,hwmods" legacy property for ti-sysc driver.

So let's fix the omap4 and dra7 smartreflex registers as there is no
no revision register.

And on omap4, the mcasp module has a revision register according to
the TRM.

And for omap34xx we need a different configuration compared to 36xx.
And the smartreflex on 3517 we've always kept disabled so let's
remove any references to it.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7d9bfdac

arch/arm/boot/dts/am3517.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -99,9 +99,5 @@ 
	status = "disabled";

};



&smartreflex_mpu_iva {

	status = "disabled";

};



/include/ "am35xx-clocks.dtsi"

/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

arch/arm/boot/dts/dra7.dtsi

+20 −6
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Based on "omap4.dtsi"

 */



#include <dt-bindings/bus/ti-sysc.h>

#include <dt-bindings/clock/dra7.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/dra.h>

#include <dt-bindings/clock/dra7.h>
@@ -1514,9 +1516,15 @@ 
		target-module@4a0dd000 {

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

			ti,hwmods = "smartreflex_core";

			reg = <0x4a0dd000 0x4>,

			      <0x4a0dd008 0x4>;

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

			reg = <0x4a0dd038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_CORE_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x4a0dd000 0x001000>;
@@ -1527,9 +1535,15 @@ 
		target-module@4a0d9000 {

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

			ti,hwmods = "smartreflex_mpu";

			reg = <0x4a0d9000 0x4>,

			      <0x4a0d9008 0x4>;

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

			reg = <0x4a0d9038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_MPU_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x4a0d9000 0x001000>;

arch/arm/boot/dts/omap3.dtsi

+0 −14
Original line number Diff line number Diff line
@@ -587,20 +587,6 @@ 
			dma-names = "rx";

		};



		smartreflex_core: smartreflex@480cb000 {

			compatible = "ti,omap3-smartreflex-core";

			ti,hwmods = "smartreflex_core";

			reg = <0x480cb000 0x400>;

			interrupts = <19>;

		};



		smartreflex_mpu_iva: smartreflex@480c9000 {

			compatible = "ti,omap3-smartreflex-mpu-iva";

			ti,hwmods = "smartreflex_mpu_iva";

			reg = <0x480c9000 0x400>;

			interrupts = <18>;

		};



		timer1: timer@48318000 {

			compatible = "ti,omap3430-timer";

			reg = <0x48318000 0x400>;

arch/arm/boot/dts/omap34xx.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * kind, whether express or implied.

 */



#include <dt-bindings/bus/ti-sysc.h>

#include <dt-bindings/media/omap3-isp.h>



#include "omap3.dtsi"
@@ -61,6 +62,44 @@ 
			compatible = "ti,omap34xx-bandgap";

			#thermal-sensor-cells = <0>;

		};



		target-module@480cb000 {

			compatible = "ti,sysc-omap3430-sr", "ti,sysc";

			ti,hwmods = "smartreflex_core";

			reg = <0x480cb024 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP2_CLOCKACTIVITY>;

			clocks = <&sr2_fck>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x480cb000 0x001000>;



			smartreflex_core: smartreflex@0 {

				compatible = "ti,omap3-smartreflex-core";

				reg = <0 0x400>;

				interrupts = <19>;

			};

		};



		target-module@480c9000 {

			compatible = "ti,sysc-omap3430-sr", "ti,sysc";

			ti,hwmods = "smartreflex_mpu_iva";

			reg = <0x480c9024 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP2_CLOCKACTIVITY>;

			clocks = <&sr1_fck>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x480c9000 0x001000>;



			smartreflex_mpu_iva: smartreflex@480c9000 {

				compatible = "ti,omap3-smartreflex-mpu-iva";

				reg = <0 0x400>;

				interrupts = <18>;

			};

		};

	};



	thermal_zones: thermal-zones {

arch/arm/boot/dts/omap36xx.dtsi

+46 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * kind, whether express or implied.

 */



#include <dt-bindings/bus/ti-sysc.h>

#include <dt-bindings/media/omap3-isp.h>



#include "omap3.dtsi"
@@ -93,6 +94,51 @@ 
			compatible = "ti,omap36xx-bandgap";

			#thermal-sensor-cells = <0>;

		};



		target-module@480cb000 {

			compatible = "ti,sysc-omap3630-sr", "ti,sysc";

			ti,hwmods = "smartreflex_core";

			reg = <0x480cb038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			clocks = <&sr2_fck>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x480cb000 0x001000>;



			smartreflex_core: smartreflex@0 {

				compatible = "ti,omap3-smartreflex-core";

				reg = <0 0x400>;

				interrupts = <19>;

			};

		};



		target-module@480c9000 {

			compatible = "ti,sysc-omap3630-sr", "ti,sysc";

			ti,hwmods = "smartreflex_mpu_iva";

			reg = <0x480c9038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			clocks = <&sr1_fck>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x480c9000 0x001000>;





			smartreflex_mpu_iva: smartreflex@480c9000 {

				compatible = "ti,omap3-smartreflex-mpu-iva";

				reg = <0 0x400>;

				interrupts = <18>;

			};

		};

	};



	thermal_zones: thermal-zones {