[PATCH 1/4] ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4

[PATCH 1/4] ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4

[Tony Lindgren]

Fix "thermal_sys: cpu_thermal: Failed to read thermal-sensors cells: -2"
error on boot for omap3/4. This is caused by wrong addressing in the dts
for bandgap sensor for single sensor instances.

Note that omap4-cpu-thermal.dtsi is shared across omap4/5 and dra7, so
we can't just change the addressing in omap4-cpu-thermal.dtsi.

Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Fixes: a761d517bbb1 ("ARM: dts: omap3: Add cpu_thermal zone")
Fixes: 0bbf6c54d100 ("arm: dts: add omap4 CPU thermal data")
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi | 3 +--
 arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi | 5 ++++-
 arch/arm/boot/dts/ti/omap/omap443x.dtsi          | 1 +
 arch/arm/boot/dts/ti/omap/omap4460.dtsi          | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
--- a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
--- a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/ti/omap/omap443x.dtsi b/arch/arm/boot/dts/ti/omap/omap443x.dtsi
--- a/arch/arm/boot/dts/ti/omap/omap443x.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap443x.dtsi
@@ -69,6 +69,7 @@ abb_iva: regulator-abb-iva {
 };
 
 &cpu_thermal {
+	thermal-sensors = <&bandgap>;
 	coefficients = <0 20000>;
 };
 
diff --git a/arch/arm/boot/dts/ti/omap/omap4460.dtsi b/arch/arm/boot/dts/ti/omap/omap4460.dtsi
--- a/arch/arm/boot/dts/ti/omap/omap4460.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap4460.dtsi
@@ -79,6 +79,7 @@ abb_iva: regulator-abb-iva {
 };
 
 &cpu_thermal {
+	thermal-sensors = <&bandgap>;
 	coefficients = <348 (-9301)>;
 };
 
-- 
2.42.0

[PATCH 2/4] ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot

[Tony Lindgren]

Commit 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra")
attempted to fix the PWM settings but ended up causin an additional clock
reparenting error:

clk: failed to reparent abe-clkctrl:0060:24 to sys_clkin_ck: -22

Only timer9 is in the PER domain and can use the sys_clkin_ck clock source.
For timer8, the there is no sys_clkin_ck available as it's in the ABE
domain, instead it should use syc_clk_div_ck. However, for power
management, we want to use the always on sys_32k_ck instead.

Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Fixes: 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra")
Depends-on: 61978617e905 ("ARM: dts: Add minimal support for Droid Bionic xt875")
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
--- a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
@@ -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>;
 };
 
 /*
-- 
2.42.0

[PATCH 3/4] ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone

[Tony Lindgren]

On mapphone devices we may get lots of noise on the micro-USB port in debug
uart mode until the phy-cpcap-usb driver probes. Let's limit the noise by
using overrun-throttle-ms.

Note that there is also a related separate issue where the charger cable
connected may cause random sysrq requests until phy-cpcap-usb probes that
still remains.

Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
--- a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
@@ -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 {
-- 
2.42.0

[PATCH 4/4] ARM: omap2+: Downgrade u-boot version warnings to debug statements

[Tony Lindgren]

We should be able to see real issues with dmesg -l err,warn. The u-boot
revision warning should be a debug statement rather than a warning.

Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/pm44xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -99,7 +99,7 @@ static int omap4_pm_suspend(void)
 		 * possible causes.
 		 * http://www.spinics.net/lists/arm-kernel/msg218641.html
 		 */
-		pr_warn("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
+		pr_debug("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
 	} else {
 		pr_info("Successfully put all powerdomains to target state\n");
 	}
@@ -257,7 +257,7 @@ int __init omap4_pm_init(void)
 	 * http://www.spinics.net/lists/arm-kernel/msg218641.html
 	 */
 	if (cpu_is_omap44xx())
-		pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
+		pr_debug("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
 
 	ret = pwrdm_for_each(pwrdms_setup, NULL);
 	if (ret) {
-- 
2.42.0

Re: [PATCH 1/4] ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 3087 bytes --]

Hi,

On Mon, Sep 11, 2023 at 07:08:24AM +0300, Tony Lindgren wrote:
> Fix "thermal_sys: cpu_thermal: Failed to read thermal-sensors cells: -2"
> error on boot for omap3/4. This is caused by wrong addressing in the dts
> for bandgap sensor for single sensor instances.
> 
> Note that omap4-cpu-thermal.dtsi is shared across omap4/5 and dra7, so
> we can't just change the addressing in omap4-cpu-thermal.dtsi.
> 
> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> Cc: Merlijn Wajer <merlijn@wizzup.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Sebastian Reichel <sre@kernel.org>
> Fixes: a761d517bbb1 ("ARM: dts: omap3: Add cpu_thermal zone")
> Fixes: 0bbf6c54d100 ("arm: dts: add omap4 CPU thermal data")
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi | 3 +--
>  arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi | 5 ++++-
>  arch/arm/boot/dts/ti/omap/omap443x.dtsi          | 1 +
>  arch/arm/boot/dts/ti/omap/omap4460.dtsi          | 1 +
>  4 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
> --- a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
> @@ -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 {
> diff --git a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
> --- a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
> @@ -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 {
> diff --git a/arch/arm/boot/dts/ti/omap/omap443x.dtsi b/arch/arm/boot/dts/ti/omap/omap443x.dtsi
> --- a/arch/arm/boot/dts/ti/omap/omap443x.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/omap443x.dtsi
> @@ -69,6 +69,7 @@ abb_iva: regulator-abb-iva {
>  };
>  
>  &cpu_thermal {
> +	thermal-sensors = <&bandgap>;
>  	coefficients = <0 20000>;
>  };
>  
> diff --git a/arch/arm/boot/dts/ti/omap/omap4460.dtsi b/arch/arm/boot/dts/ti/omap/omap4460.dtsi
> --- a/arch/arm/boot/dts/ti/omap/omap4460.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/omap4460.dtsi
> @@ -79,6 +79,7 @@ abb_iva: regulator-abb-iva {
>  };
>  
>  &cpu_thermal {
> +	thermal-sensors = <&bandgap>;
>  	coefficients = <348 (-9301)>;
>  };
>  
> -- 
> 2.42.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 4/4] ARM: omap2+: Downgrade u-boot version warnings to debug statements

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]

Hi,

On Mon, Sep 11, 2023 at 07:08:27AM +0300, Tony Lindgren wrote:
> We should be able to see real issues with dmesg -l err,warn. The u-boot
> revision warning should be a debug statement rather than a warning.
> 
> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> Cc: Merlijn Wajer <merlijn@wizzup.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  arch/arm/mach-omap2/pm44xx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
> --- a/arch/arm/mach-omap2/pm44xx.c
> +++ b/arch/arm/mach-omap2/pm44xx.c
> @@ -99,7 +99,7 @@ static int omap4_pm_suspend(void)
>  		 * possible causes.
>  		 * http://www.spinics.net/lists/arm-kernel/msg218641.html
>  		 */
> -		pr_warn("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
> +		pr_debug("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
>  	} else {
>  		pr_info("Successfully put all powerdomains to target state\n");
>  	}
> @@ -257,7 +257,7 @@ int __init omap4_pm_init(void)
>  	 * http://www.spinics.net/lists/arm-kernel/msg218641.html
>  	 */
>  	if (cpu_is_omap44xx())
> -		pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
> +		pr_debug("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
>  
>  	ret = pwrdm_for_each(pwrdms_setup, NULL);
>  	if (ret) {
> -- 
> 2.42.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/4] ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1995 bytes --]

Hi,

On Mon, Sep 11, 2023 at 07:08:25AM +0300, Tony Lindgren wrote:
> Commit 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra")
> attempted to fix the PWM settings but ended up causin an additional clock
> reparenting error:
> 
> clk: failed to reparent abe-clkctrl:0060:24 to sys_clkin_ck: -22
> 
> Only timer9 is in the PER domain and can use the sys_clkin_ck clock source.
> For timer8, the there is no sys_clkin_ck available as it's in the ABE
> domain, instead it should use syc_clk_div_ck. However, for power
> management, we want to use the always on sys_32k_ck instead.
> 
> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> Cc: Merlijn Wajer <merlijn@wizzup.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Sebastian Reichel <sre@kernel.org>
> Fixes: 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra")
> Depends-on: 61978617e905 ("ARM: dts: Add minimal support for Droid Bionic xt875")
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> --- a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> @@ -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>;
>  };
>  
>  /*
> -- 
> 2.42.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 3/4] ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

Hi,

On Mon, Sep 11, 2023 at 07:08:26AM +0300, Tony Lindgren wrote:
> On mapphone devices we may get lots of noise on the micro-USB port in debug
> uart mode until the phy-cpcap-usb driver probes. Let's limit the noise by
> using overrun-throttle-ms.
> 
> Note that there is also a related separate issue where the charger cable
> connected may cause random sysrq requests until phy-cpcap-usb probes that
> still remains.
> 
> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> Cc: Merlijn Wajer <merlijn@wizzup.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---

A bit of a hack, but I guess it improves the status quo, so:

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> --- a/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
> @@ -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 {
> -- 
> 2.42.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]