Commit 32ed5880 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.9/ti-sysc-drop-pdata-take2-signed' of... 

Merge tag 'omap-for-v5.9/ti-sysc-drop-pdata-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Drop more legacy platform data for omaps for v5.9

A series of changes to drop remaining USB platform data for omap4/5,
and am4, and dra7.

And a patch to drop AES platform data for omap3.

* tag 'omap-for-v5.9/ti-sysc-drop-pdata-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Drop legacy platform data for omap5 usb host
  ARM: OMAP2+: Drop legacy platform data for omap4 usb
  ARM: OMAP2+: Drop legacy platform data for dra7 dwc3
  ARM: OMAP2+: Drop legacy platform data for omap5 dwc3
  ARM: OMAP2+: Drop legacy platform data for am4 dwc3
  bus: ti-sysc: Add missing quirk flags for usb_host_hs
  ARM: dts: omap3: Migrate AES from hwmods to sysc-omap2

Link: https://lore.kernel.org/r/pull-1594838111-649880@atomide.com-2


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42027dfe cca3f3e6

arch/arm/boot/dts/am3517.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 


#include "omap3.dtsi"



/* AM3517 doesn't appear to have the crypto engines defined in omap3.dtsi */

/delete-node/ &aes1_target;

/delete-node/ &aes2_target;



/ {

	aliases {

		serial3 = &uart4;

arch/arm/boot/dts/am437x-l4.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -2352,7 +2352,6 @@ target-module@4c000 { /* 0x4834c000, ap 114 72.0 */ 


		target-module@80000 {			/* 0x48380000, ap 123 42.0 */

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

			ti,hwmods = "usb_otg_ss0";

			reg = <0x80000 0x4>,

			      <0x80010 0x4>;

			reg-names = "rev", "sysc";
@@ -2433,7 +2432,6 @@ usb2_phy1: phy@8000 { 


		target-module@c0000 {			/* 0x483c0000, ap 127 7a.0 */

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

			ti,hwmods = "usb_otg_ss1";

			reg = <0xc0000 0x4>,

			      <0xc0010 0x4>;

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

arch/arm/boot/dts/dra7-l4.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -4007,7 +4007,6 @@ mailbox12: mailbox@0 { 


		target-module@80000 {			/* 0x48880000, ap 83 0e.1 */

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

			ti,hwmods = "usb_otg_ss1";

			reg = <0x80000 0x4>,

			      <0x80010 0x4>;

			reg-names = "rev", "sysc";
@@ -4057,7 +4056,6 @@ usb1: usb@10000 { 


		target-module@c0000 {			/* 0x488c0000, ap 79 06.0 */

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

			ti,hwmods = "usb_otg_ss2";

			reg = <0xc0000 0x4>,

			      <0xc0010 0x4>;

			reg-names = "rev", "sysc";
@@ -4108,7 +4106,6 @@ usb2: usb@10000 { 


		usb3_tm: target-module@100000 {		/* 0x48900000, ap 85 04.0 */

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

			ti,hwmods = "usb_otg_ss3";

			reg = <0x100000 0x4>,

			      <0x100010 0x4>;

			reg-names = "rev", "sysc";
@@ -4157,7 +4154,6 @@ usb3: usb@10000 { 


		usb4_tm: target-module@140000 {		/* 0x48940000, ap 75 3c.0 */

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

			ti,hwmods = "usb_otg_ss4";

			reg = <0x140000 0x4>,

			      <0x140010 0x4>;

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

arch/arm/boot/dts/dra74x.dtsi

+39 −19
Original line number Diff line number Diff line
@@ -49,19 +49,38 @@ dsp2_system: dsp_system@41500000 { 
			reg = <0x41500000 0x100>;

		};



		omap_dwc3_4: omap_dwc3_4@48940000 {

		target-module@48940000 {

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

			reg = <0x48940000 0x4>,

			      <0x48940010 0x4>;

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

			ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;

			ti,sysc-midle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x48940000 0x20000>;



			omap_dwc3_4: omap_dwc3_4@0 {

				compatible = "ti,dwc3";

			ti,hwmods = "usb_otg_ss4";

			reg = <0x48940000 0x10000>;

				reg = <0 0x10000>;

				interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;

				#address-cells = <1>;

				#size-cells = <1>;

				utmi-mode = <2>;

				ranges;

				status = "disabled";

			usb4: usb@48950000 {

				usb4: usb@10000 {

					compatible = "snps,dwc3";

				reg = <0x48950000 0x17000>;

					reg = <0x10000 0x17000>;

					interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,

						     <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,

						     <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
@@ -72,6 +91,7 @@ usb4: usb@48950000 { 
					dr_mode = "otg";

				};

			};

		};



		target-module@41501000 {

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

arch/arm/boot/dts/omap3-n900.dts

+5 −1
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ 
 * but it is not widely used and to prevent kernel crash rather AES is disabled.

 * There is also no runtime detection code if AES is disabled in L3 firewall...

 */

&aes {

&aes1_target {

	status = "disabled";

};



&aes2_target {

	status = "disabled";

};