Unverified Commit 6b4670af authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of... 

Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Non-urgent fixes for omaps for v5.14 merge window

Warn and block suspend for am335x unless the PM related modules and
firmware are loaded and warn otherwise. Otherwise we easily end up
with a suspended system with nothing capable of waking it up.

We also drop a duplicated prototype for am33xx_init_early().

* tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured
  ARM: OMAP2+: remove duplicated prototype
  ARM: dts: dra7: Fix duplicate USB4 target module node
  ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power
  bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act
  bus: ti-sysc: Fix am335x resume hang for usb otg module
  ARM: OMAP2+: Fix build warning when mmc_omap is not built
  ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function
  ARM: OMAP1: Fix use of possibly uninitialized irq variable
  bus: ti-sysc: Fix missing quirk flags for sata

Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 777cf27f 093a474c

arch/arm/boot/dts/am5718.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -17,17 +17,13 @@ / { 
 * VCP1, VCP2

 * MLB

 * ISS

 * USB3, USB4

 * USB3

 */



&usb3_tm {

	status = "disabled";

};



&usb4_tm {

	status = "disabled";

};



&atl_tm {

	status = "disabled";

};

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

+0 −22
Original line number Diff line number Diff line
@@ -4129,28 +4129,6 @@ usb3: usb@10000 { 
			};

		};



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

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

			reg = <0x140000 0x4>,

			      <0x140010 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>;

			/* Domains (P, C): l3init_pwrdm, l3init_clkdm */

			clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x140000 0x20000>;

		};



		target-module@170000 {			/* 0x48970000, ap 21 0a.0 */

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

			reg = <0x170010 0x4>;

arch/arm/boot/dts/dra71x.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -11,7 +11,3 @@ 
&rtctarget {

	status = "disabled";

};
 


&usb4_tm {

	status = "disabled";

};

arch/arm/boot/dts/dra72x.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -108,7 +108,3 @@ &pcie1_ep { 
&pcie2_rc {

	compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";

};
 


&usb4_tm {

	status = "disabled";

};

arch/arm/boot/dts/dra74x.dtsi

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

		};



		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";

				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@10000 {

					compatible = "snps,dwc3";

					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>;

					interrupt-names = "peripheral",

							  "host",

							  "otg";

					maximum-speed = "high-speed";

					dr_mode = "otg";

				};

			};

		};



		target-module@41501000 {

			compatible = "ti,sysc-omap2", "ti,sysc";
@@ -224,3 +181,52 @@ &pcie1_ep { 
&pcie2_rc {

	compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";

};



&l4_per3 {

	segment@0 {

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

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

			reg = <0x140000 0x4>,

			      <0x140010 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>;

			/* Domains (P, C): l3init_pwrdm, l3init_clkdm */

			clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x140000 0x20000>;



			omap_dwc3_4: omap_dwc3_4@0 {

				compatible = "ti,dwc3";

				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@10000 {

					compatible = "snps,dwc3";

					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>;

					interrupt-names = "peripheral",

							  "host",

							  "otg";

					maximum-speed = "high-speed";

					dr_mode = "otg";

				};

			};

		};

	};

};