Unverified Commit 3c50ffba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.6/fixes-signed' of... 

Merge tag 'omap-for-v6.6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Fixes for omaps and ti-sysc

Fixes for several ti-sysc interconnect target module driver issues for
external abort on non-linefetch, am35x soc match, and uart module quirks
handling needed for devices to work and to allow device wake-up to work.

Fixes for droid4 boot time errors and warnings as noticed after boot doing
dmesg -lerr,warn. Let's also cut down the debug uart noise by using
overrun-throttle-ms, and downgrade the u-boot version warnings to
debug statements to further reduce the boot time noise with warnings.

* tag 'omap-for-v6.6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
  ARM: omap2+: Downgrade u-boot version warnings to debug statements
  ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone
  ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
  ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
  bus: ti-sysc: Fix missing AM35xx SoC matching
  bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()

Link: https://lore.kernel.org/r/pull-1695715881-95183@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 59a98f4f 06f114cf

arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -614,12 +614,12 @@ &rng_target { 
/* Configure pwm clock source for timers 8 & 9 */

&timer8 {

	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;

	assigned-clock-parents = <&sys_clkin_ck>;

	assigned-clock-parents = <&sys_32k_ck>;

};



&timer9 {

	assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;

	assigned-clock-parents = <&sys_clkin_ck>;

	assigned-clock-parents = <&sys_32k_ck>;

};



/*
@@ -640,6 +640,7 @@ &uart1 { 
&uart3 {

	interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core 0x17c>;

	overrun-throttle-ms = <500>;

};



&uart4 {

arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal { 
	polling-delay = <1000>; /* milliseconds */

	coefficients = <0 20000>;



			/* sensor       ID */

	thermal-sensors = <&bandgap     0>;

	thermal-sensors = <&bandgap>;



	cpu_trips: trips {

		cpu_alert0: cpu_alert {

arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal { 
	polling-delay-passive = <250>; /* milliseconds */

	polling-delay = <1000>; /* milliseconds */



			/* sensor       ID */

	/*

	 * See 44xx files for single sensor addressing, omap5 and dra7 need

	 * also sensor ID for addressing.

	 */

	thermal-sensors = <&bandgap     0>;



	cpu_trips: trips {

arch/arm/boot/dts/ti/omap/omap443x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ abb_iva: regulator-abb-iva { 
};



&cpu_thermal {

	thermal-sensors = <&bandgap>;

	coefficients = <0 20000>;

};

arch/arm/boot/dts/ti/omap/omap4460.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ abb_iva: regulator-abb-iva { 
};



&cpu_thermal {

	thermal-sensors = <&bandgap>;

	coefficients = <348 (-9301)>;

};