Skip to contentSkip to conversation

ti-sysc related warning fixes for v5.3-rc cycle

PATCH In review Tony Lindgren 5 participants 24 messages Jul 23, 2019 – Sep 18, 2019

Subsystems (5)
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

cover ti-sysc related warning fixes for v5.3-rc cycle

Hi all,

I noticed that with recent ti-sysc driver changes some new warnings have crept in. Mostly they are caused by having different configuration in the dts compared to the legacy platform data. Let's fix these first before we continue dropping the legacy platform data.

I also noticed we need two fixes for the ti-sysc driver while looking at the warnings.

Regards,

Tony

Tony Lindgren (8):
ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc
bus: ti-sysc: Fix handling of forced idle
bus: ti-sysc: Fix using configured sysc mask value
ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8
ARM: dts: Fix flags for gpio7
ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7
ARM: dts: Fix lcdc sysc flags for am3

 arch/arm/boot/dts/am33xx-l4.dtsi              |  6 +++-
 arch/arm/boot/dts/am437x-l4.dtsi              |  4 +++
 .../boot/dts/am57xx-beagle-x15-common.dtsi    |  2 +-
 arch/arm/boot/dts/dra7-evm.dts                |  2 +-
 arch/arm/boot/dts/dra7-l4.dtsi                | 31 ++++++++-----------
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c    |  2 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c     |  3 +-
 drivers/bus/ti-sysc.c                         | 10 +++---
 8 files changed, 31 insertions(+), 29 deletions(-)
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH 1/8 ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss

TRM says PWMSS_SYSCONFIG bit for SOFTRESET changes to zero when reset is completed. Let's configure it as otherwise we get warnings on boot when we check the data against dts provided data. Eventually the legacy platform data will be just dropped, but let's fix the warning first.

---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +2 -1
@@ -379,7 +379,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {
 static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x4,
-	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET,
+	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+			  SYSC_HAS_RESET_STATUS,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
Signature · 1 line
2.21.0
Reviewed-by on v1 1/8
#2 lore raw

Re: [PATCH 1/8] ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss

Quoted 7 lines · Tony Lindgren

TRM says PWMSS_SYSCONFIG bit for SOFTRESET changes to zero when reset is completed. Let's configure it as otherwise we get warnings on boot when we check the data against dts provided data. Eventually the legacy platform data will be just dropped, but let's fix the warning first.

regards
Suman

Quoted 18 lines
---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +2 -1
@@ -379,7 +379,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {
 static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x4,
-	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET,
+	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+			  SYSC_HAS_RESET_STATUS,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
author maintainer
#3 lore raw

PATCH 2/8 ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

In reply to Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
 static struct omap_hwmod_class_sysconfig lcdc_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
Signature · 1 line
2.21.0
#4 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Jyri,
Do you know the history?

regards
Suman

Quoted 25 lines

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
 static struct omap_hwmod_class_sysconfig lcdc_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
#5 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

Quoted 16 lines · Suman Anna

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Quoted 2 lines

Jyri,
Do you know the history?

Tony/Suman,

This patch breaks DS0 on am3.

- Keerthy

Quoted 30 lines

regards
Suman

Quoted 25 lines

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
  static struct omap_hwmod_class_sysconfig lcdc_sysc = {
  	.rev_offs	= 0x0,
  	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
  	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
  	.sysc_fields	= &omap_hwmod_sysc_type2,
  };
author maintainer
#6 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

Quoted 10 lines · Keerthy
Quoted 8 lines · Suman Anna

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Quoted 7 lines
Quoted 7 lines

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Yes the goal is to get rid of all errors and warnings in dmesg output so we can spot the real issues.

Quoted 6 lines
Quoted 2 lines

Jyri,
Do you know the history?

Tony/Suman,

This patch breaks DS0 on am3.

OK thanks for testing. Let's drop this for now, sounds like there is some midlemode configuration happening even with no flags set.

Probably the right fix is to configure the usable midlemodes instead both for platform data and dts data and then drop the platform data.

Regards,

Tony

Quoted 25 lines
Quoted 25 lines
Quoted 24 lines

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
  static struct omap_hwmod_class_sysconfig lcdc_sysc = {
  	.rev_offs	= 0x0,
  	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
  	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
  	.sysc_fields	= &omap_hwmod_sysc_type2,
  };
#7 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

Quoted 25 lines · Tony Lindgren
Quoted 10 lines · Keerthy
Quoted 8 lines · Suman Anna

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Quoted 7 lines
Quoted 7 lines

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Yes the goal is to get rid of all errors and warnings in dmesg output so we can spot the real issues.

Quoted 3 lines
Quoted 2 lines

Jyri,
Do you know the history?

Quoted 6 lines
Quoted 3 lines

Tony/Suman,

This patch breaks DS0 on am3.

OK thanks for testing. Let's drop this for now, sounds like there is some midlemode configuration happening even with no flags set.

You were dropping the ti,sysc-midle property in patch 8, is that still ok without this patch?

Quoted 3 lines

Probably the right fix is to configure the usable midlemodes instead both for platform data and dts data and then drop the platform data.

Yeah, that's probably better and more accurate unless we actually have some h/w issues that require them to be dropped.

regards
Suman

Quoted 32 lines

Regards,

Tony

Quoted 25 lines
Quoted 25 lines
Quoted 24 lines

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
  static struct omap_hwmod_class_sysconfig lcdc_sysc = {
  	.rev_offs	= 0x0,
  	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
  	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
  	.sysc_fields	= &omap_hwmod_sysc_type2,
  };
author maintainer
#8 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

Quoted 6 lines · Suman Anna
Quoted 2 lines · Tony Lindgren

OK thanks for testing. Let's drop this for now, sounds like there is some midlemode configuration happening even with no flags set.

You were dropping the ti,sysc-midle property in patch 8, is that still ok without this patch?

Yeah let's wait on that one too until we hear back from Jyri.

Regards,

Tony

#9 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

In reply to Suman Anna
Quoted 16 lines · Suman Anna

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Quoted 3 lines

Jyri,
Do you know the history?

Sorry. This all has happened before my time. This is all new to me.

BR,
Jyri

Quoted 29 lines

regards
Suman

Quoted 25 lines

Let's fix the warning by removing SYSC_HAS_MIDLEMODE. Note that the am335x TRM lists SYSC_HAS_MIDLEMODE, but it is unused.

---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -231,7 +231,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
 static struct omap_hwmod_class_sysconfig lcdc_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
author maintainer
#10 lore raw

Re: [PATCH 2/8] ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc

Quoted 17 lines · Jyri Sarha
Quoted 16 lines · Suman Anna

+ Jyri

Quoted 4 lines · Tony Lindgren

We currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes.

Hi Tony,
While I understand that you are trying to match the DT data with the existing legacy data, do you know if there was a reason why this was omitted in the first place? Should we be really adding the MSTANDBY_ flags and fix up the DTS node accordingly? I tried looking through the git log, and the initial commit itself didn't add the MSTANDBY_ flags but used the SYSC_HAS_MIDLEMODE.

Quoted 5 lines
Quoted 3 lines

Jyri,
Do you know the history?

Sorry. This all has happened before my time. This is all new to me.

Oh OK. Well if possible, could you please check if the following patch behaves with v5.2 for you for LCDC? I only have rack access to a beaglebone with hdmi right now.

TRM "Table 13-34. SYSCONFIG Register Field Descriptions" lists both standbymode and idlemode that should be just the sidle and midle registers where midle is currently unconfigured.

Regards,

Tony

8< ---------------------

arch/arm/mach-omap2/omap_hwmod_33xx_data.c +3 -2
@@ -255,8 +255,9 @@ static struct omap_hwmod am33xx_gpio0_hwmod = {
 static struct omap_hwmod_class_sysconfig lcdc_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
-	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE,
+	.idlemodes	= SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+			  MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART,
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };
 
author maintainer
#11 lore raw

PATCH 3/8 bus: ti-sysc: Fix handling of forced idle

In reply to Tony Lindgren

For some devices we can get the following warning on boot:

ti-sysc 48485200.target-module: sysc_disable_module: invalid midlemode

Fix this by treating SYSC_IDLE_FORCE like we do for the other bits for idlemodes mask.

Fixes d59b60564cbf ("bus: ti-sysc: Add generic enable/disable functions")
Cc Roger Quadros <[email protected]>
---
 drivers/bus/ti-sysc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/ti-sysc.c +1 -1
@@ -949,7 +949,7 @@ static int sysc_best_idle_mode(u32 idlemodes, u32 *best_mode)
 		*best_mode = SYSC_IDLE_SMART_WKUP;
 	else if (idlemodes & BIT(SYSC_IDLE_SMART))
 		*best_mode = SYSC_IDLE_SMART;
-	else if (idlemodes & SYSC_IDLE_FORCE)
+	else if (idlemodes & BIT(SYSC_IDLE_FORCE))
 		*best_mode = SYSC_IDLE_FORCE;
 	else
 		return -EINVAL;
Signature · 1 line
2.21.0
Reviewed-by on v1 3/8
#12 lore raw

Re: [PATCH 3/8] bus: ti-sysc: Fix handling of forced idle

Quoted 10 lines · Tony Lindgren

For some devices we can get the following warning on boot:

ti-sysc 48485200.target-module: sysc_disable_module: invalid midlemode

Fix this by treating SYSC_IDLE_FORCE like we do for the other bits for idlemodes mask.

Fixes d59b60564cbf ("bus: ti-sysc: Add generic enable/disable functions")
Cc Roger Quadros <[email protected]>

regards
Suman

Quoted 17 lines
---
 drivers/bus/ti-sysc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/ti-sysc.c +1 -1
@@ -949,7 +949,7 @@ static int sysc_best_idle_mode(u32 idlemodes, u32 *best_mode)
 		*best_mode = SYSC_IDLE_SMART_WKUP;
 	else if (idlemodes & BIT(SYSC_IDLE_SMART))
 		*best_mode = SYSC_IDLE_SMART;
-	else if (idlemodes & SYSC_IDLE_FORCE)
+	else if (idlemodes & BIT(SYSC_IDLE_FORCE))
 		*best_mode = SYSC_IDLE_FORCE;
 	else
 		return -EINVAL;
author maintainer
#13 lore raw

PATCH 4/8 bus: ti-sysc: Fix using configured sysc mask value

In reply to Tony Lindgren

We have cases where there are no softreset bits like with am335x lcdc. In that case ti,sysc-mask = <0> needs to be handled properly.

---
 drivers/bus/ti-sysc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/bus/ti-sysc.c +1 -4
@@ -1692,10 +1692,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata)
 	if (error)
 		return 0;
 
-	if (val)
-		ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
-	else
-		ddata->cfg.sysc_val = ddata->cap->sysc_mask;
+	ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
 
 	return 0;
 }
Signature · 1 line
2.21.0
author maintainer
#14 lore raw

PATCH 5/8 ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8

In reply to Tony Lindgren

The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7. Otherwise we get the following warning on beagle-x15:

ti-sysc 48468000.target-module: could not add child clock ahclkr: -19

Fixes 5241ccbf2819 ("ARM: dts: Add missing ranges for dra7 mcasp l3 ports")
---
 arch/arm/boot/dts/dra7-l4.dtsi | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +10 -15
@@ -2818,9 +2818,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x68000 0x2000>,
@@ -2854,9 +2853,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x6c000 0x2000>,
@@ -2890,9 +2888,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x70000 0x2000>,
@@ -2926,9 +2923,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x74000 0x2000>,
@@ -2962,9 +2958,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x78000 0x2000>,
Signature · 1 line
2.21.0
#15 lore raw

Re: [PATCH 5/8] ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8

Hi Tony,

Quoted 63 lines · Tony Lindgren

The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7. Otherwise we get the following warning on beagle-x15:

ti-sysc 48468000.target-module: could not add child clock ahclkr: -19

Fixes 5241ccbf2819 ("ARM: dts: Add missing ranges for dra7 mcasp l3 ports")
---
 arch/arm/boot/dts/dra7-l4.dtsi | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +8 -12
@@ -2818,9 +2818,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x68000 0x2000>,
@@ -2854,9 +2853,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x6c000 0x2000>,
@@ -2890,9 +2888,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x70000 0x2000>,
@@ -2926,9 +2923,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x74000 0x2000>,

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

Quoted 8 lines
arch/arm/boot/dts/dra7-l4.dtsi +2 -3
@@ -2962,9 +2958,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";

The equivalent change to MCASP8 is missing.

regards
Suman

Quoted 4 lines
arch/arm/boot/dts/dra7-l4.dtsi +0 -0
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x78000 0x2000>,
author maintainer
#16 lore raw

Re: [PATCH 5/8] ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8

Quoted 5 lines · Suman Anna

Hi Tony,

Quoted 2 lines · Tony Lindgren

The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7. Otherwise we get the following warning on beagle-x15:

...

Quoted 11 lines

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

Quoted 9 lines
arch/arm/boot/dts/dra7-l4.dtsi +2 -3
@@ -2962,9 +2958,8 @@
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";

The equivalent change to MCASP8 is missing.

Thanks for spotting it, probably should be set up the same way as MCASP4 too looking at the TRM.

Tero, care to check the dra7 mcasp clocks we have defined?

$ grep MCASP drivers/clk/ti/clk-7xx.c
        { DRA7_IPU_MCASP1_CLKCTRL, dra7_mcasp1_bit_data, CLKF_SW_SUP, "ipu-clkctrl:0000:22" },
        { DRA7_L4PER2_MCASP2_CLKCTRL, dra7_mcasp2_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0154:22" },
        { DRA7_L4PER2_MCASP3_CLKCTRL, dra7_mcasp3_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:015c:22" },
        { DRA7_L4PER2_MCASP5_CLKCTRL, dra7_mcasp5_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:016c:22" },
        { DRA7_L4PER2_MCASP8_CLKCTRL, dra7_mcasp8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0184:24" },
        { DRA7_L4PER2_MCASP4_CLKCTRL, dra7_mcasp4_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:018c:22" },
        { DRA7_L4PER2_MCASP6_CLKCTRL, dra7_mcasp6_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01f8:22" },
        { DRA7_L4PER2_MCASP7_CLKCTRL, dra7_mcasp7_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01fc:22" },

Is bit 24 above correct for MCASP8 or should it too be 22 like adjacent MCASP4 in the TRM?

Regards,

Tony

#17 lore raw

Re: [PATCH 5/8] ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8

Quoted 19 lines · Tony Lindgren
Quoted 5 lines · Suman Anna

Hi Tony,

Quoted 2 lines · Tony Lindgren

The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7. Otherwise we get the following warning on beagle-x15:

...

Quoted 11 lines

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

Quoted 9 lines
arch/arm/boot/dts/dra7-l4.dtsi +2 -3
@@ -2962,9 +2958,8 @@
  					<SYSC_IDLE_SMART>;
  			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
  			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";

The equivalent change to MCASP8 is missing.

Quoted 4 lines

Thanks for spotting it, probably should be set up the same way as MCASP4 too looking at the TRM.

Tero, care to check the dra7 mcasp clocks we have defined?

Sorry, missed this earlier.

Quoted 11 lines
$ grep MCASP drivers/clk/ti/clk-7xx.c
         { DRA7_IPU_MCASP1_CLKCTRL, dra7_mcasp1_bit_data, CLKF_SW_SUP, "ipu-clkctrl:0000:22" },
         { DRA7_L4PER2_MCASP2_CLKCTRL, dra7_mcasp2_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0154:22" },
         { DRA7_L4PER2_MCASP3_CLKCTRL, dra7_mcasp3_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:015c:22" },
         { DRA7_L4PER2_MCASP5_CLKCTRL, dra7_mcasp5_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:016c:22" },
         { DRA7_L4PER2_MCASP8_CLKCTRL, dra7_mcasp8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0184:24" },
         { DRA7_L4PER2_MCASP4_CLKCTRL, dra7_mcasp4_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:018c:22" },
         { DRA7_L4PER2_MCASP6_CLKCTRL, dra7_mcasp6_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01f8:22" },
         { DRA7_L4PER2_MCASP7_CLKCTRL, dra7_mcasp7_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01fc:22" },
Quoted 2 lines

Is bit 24 above correct for MCASP8 or should it too be 22 like adjacent MCASP4 in the TRM?

So yeah, mcasp8 is wrong here, should be 22 as rest of them. I did fix mcasp8 clocks partially when doing the conversion but missed the parenting here; it was completely broken before.

-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

author maintainer
#18 lore raw

Re: [PATCH 5/8] ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8

Quoted 38 lines · Tero Kristo
Quoted 19 lines · Tony Lindgren
Quoted 5 lines · Suman Anna

Hi Tony,

Quoted 2 lines · Tony Lindgren

The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7. Otherwise we get the following warning on beagle-x15:

...

Quoted 11 lines

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

Quoted 9 lines
arch/arm/boot/dts/dra7-l4.dtsi +2 -3
@@ -2962,9 +2958,8 @@
  					<SYSC_IDLE_SMART>;
  			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
  			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-			clock-names = "fck", "ahclkx", "ahclkr";
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+			clock-names = "fck", "ahclkx";

The equivalent change to MCASP8 is missing.

Quoted 4 lines

Thanks for spotting it, probably should be set up the same way as MCASP4 too looking at the TRM.

Tero, care to check the dra7 mcasp clocks we have defined?

Sorry, missed this earlier.

Quoted 11 lines
$ grep MCASP drivers/clk/ti/clk-7xx.c
         { DRA7_IPU_MCASP1_CLKCTRL, dra7_mcasp1_bit_data, CLKF_SW_SUP, "ipu-clkctrl:0000:22" },
         { DRA7_L4PER2_MCASP2_CLKCTRL, dra7_mcasp2_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0154:22" },
         { DRA7_L4PER2_MCASP3_CLKCTRL, dra7_mcasp3_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:015c:22" },
         { DRA7_L4PER2_MCASP5_CLKCTRL, dra7_mcasp5_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:016c:22" },
         { DRA7_L4PER2_MCASP8_CLKCTRL, dra7_mcasp8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0184:24" },
         { DRA7_L4PER2_MCASP4_CLKCTRL, dra7_mcasp4_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:018c:22" },
         { DRA7_L4PER2_MCASP6_CLKCTRL, dra7_mcasp6_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01f8:22" },
         { DRA7_L4PER2_MCASP7_CLKCTRL, dra7_mcasp7_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01fc:22" },
Quoted 6 lines
Quoted 2 lines

Is bit 24 above correct for MCASP8 or should it too be 22 like adjacent MCASP4 in the TRM?

So yeah, mcasp8 is wrong here, should be 22 as rest of them. I did fix mcasp8 clocks partially when doing the conversion but missed the parenting here; it was completely broken before.

OK thanks, I'll post a patch to fix that and an updated mcasp dts fix.

Regards,

Tony

author maintainer
#19 lore raw

PATCH 6/8 ARM: dts: Fix flags for gpio7

In reply to Tony Lindgren

The ti,no-idle-on-init and ti,no-reset-on-init flags need to be at the interconnect target module level for the modules that have it defined. Otherwise we get the following warnings:

dts flag should be at module level for ti,no-idle-on-init dts flag should be at module level for ti,no-reset-on-init

---
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +-
 arch/arm/boot/dts/dra7-evm.dts                  | 2 +-
 arch/arm/boot/dts/dra7-l4.dtsi                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +1 -1
@@ -379,7 +379,7 @@
 	};
 };
 
-&gpio7 {
+&gpio7_target {
 	ti,no-reset-on-init;
 	ti,no-idle-on-init;
 };
arch/arm/boot/dts/dra7-evm.dts +1 -1
@@ -498,7 +498,7 @@
 	phy-supply = <&ldousb_reg>;
 };
 
-&gpio7 {
+&gpio7_target {
 	ti,no-reset-on-init;
 	ti,no-idle-on-init;
 };
arch/arm/boot/dts/dra7-l4.dtsi +1 -1
@@ -1261,7 +1261,7 @@
 			};
 		};
 
-		target-module@51000 {			/* 0x48051000, ap 45 2e.0 */
+		gpio7_target: target-module@51000 {		/* 0x48051000, ap 45 2e.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			ti,hwmods = "gpio7";
 			reg = <0x51000 0x4>,
Signature · 1 line
2.21.0
Reviewed-by on v1 6/8
#20 lore raw

Re: [PATCH 6/8] ARM: dts: Fix flags for gpio7

Hi Tony,

Quoted 8 lines · Tony Lindgren

The ti,no-idle-on-init and ti,no-reset-on-init flags need to be at the interconnect target module level for the modules that have it defined. Otherwise we get the following warnings:

dts flag should be at module level for ti,no-idle-on-init dts flag should be at module level for ti,no-reset-on-init

There's a similar one within the am335x-icev2.dts file for gpio0 that can also use this fix.

regards
Suman

Quoted 43 lines
---
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +-
 arch/arm/boot/dts/dra7-evm.dts                  | 2 +-
 arch/arm/boot/dts/dra7-l4.dtsi                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +1 -1
@@ -379,7 +379,7 @@
 	};
 };
 
-&gpio7 {
+&gpio7_target {
 	ti,no-reset-on-init;
 	ti,no-idle-on-init;
 };
arch/arm/boot/dts/dra7-evm.dts +1 -1
@@ -498,7 +498,7 @@
 	phy-supply = <&ldousb_reg>;
 };
 
-&gpio7 {
+&gpio7_target {
 	ti,no-reset-on-init;
 	ti,no-idle-on-init;
 };
arch/arm/boot/dts/dra7-l4.dtsi +1 -1
@@ -1261,7 +1261,7 @@
 			};
 		};
 
-		target-module@51000 {			/* 0x48051000, ap 45 2e.0 */
+		gpio7_target: target-module@51000 {		/* 0x48051000, ap 45 2e.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			ti,hwmods = "gpio7";
 			reg = <0x51000 0x4>,
author maintainer
#21 lore raw

PATCH 7/8 ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7

In reply to Tony Lindgren

We are currently using a wrong register for dcan revision. Although this is currently only used for detecting the dcan module, let's fix it to avoid confusion.

---
 arch/arm/boot/dts/am33xx-l4.dtsi | 4 ++++
 arch/arm/boot/dts/am437x-l4.dtsi | 4 ++++
 arch/arm/boot/dts/dra7-l4.dtsi   | 4 ++--
 drivers/bus/ti-sysc.c            | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +4 -0
@@ -1758,6 +1758,8 @@
 
 		target-module@cc000 {			/* 0x481cc000, ap 60 46.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
+			reg = <0xcc020 0x4>;
+			reg-names = "rev";
 			ti,hwmods = "d_can0";
 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */
 			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
@@ -1780,6 +1782,8 @@
 
 		target-module@d0000 {			/* 0x481d0000, ap 62 42.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
+			reg = <0xd0020 0x4>;
+			reg-names = "rev";
 			ti,hwmods = "d_can1";
 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */
 			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,
arch/arm/boot/dts/am437x-l4.dtsi +4 -0
@@ -1574,6 +1574,8 @@
 
 		target-module@cc000 {			/* 0x481cc000, ap 50 46.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
+			reg = <0xcc020 0x4>;
+			reg-names = "rev";
 			ti,hwmods = "d_can0";
 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */
 			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;
@@ -1593,6 +1595,8 @@
 
 		target-module@d0000 {			/* 0x481d0000, ap 52 3a.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
+			reg = <0xd0020 0x4>;
+			reg-names = "rev";
 			ti,hwmods = "d_can1";
 			/* Domains (P, C): per_pwrdm, l4ls_clkdm */
 			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;
arch/arm/boot/dts/dra7-l4.dtsi +2 -2
@@ -3020,7 +3020,7 @@
 
 		target-module@80000 {			/* 0x48480000, ap 31 16.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
-			reg = <0x80000 0x4>;
+			reg = <0x80020 0x4>;
 			reg-names = "rev";
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_DCAN2_CLKCTRL 0>;
 			clock-names = "fck";
@@ -4572,7 +4572,7 @@
 
 		target-module@c000 {			/* 0x4ae3c000, ap 30 04.0 */
 			compatible = "ti,sysc-omap4", "ti,sysc";
-			reg = <0xc000 0x4>;
+			reg = <0xc020 0x4>;
 			reg-names = "rev";
 			clocks = <&wkupaon_clkctrl DRA7_WKUPAON_DCAN1_CLKCTRL 0>;
 			clock-names = "fck";
drivers/bus/ti-sysc.c +2 -1
@@ -1267,7 +1267,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
 	SYSC_QUIRK("control", 0, 0, 0x10, -1, 0x40000900, 0xffffffff, 0),
 	SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902,
 		   0xffff00f0, 0),
-	SYSC_QUIRK("dcan", 0, 0, -1, -1, 0xffffffff, 0xffffffff, 0),
+	SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0xa3170504, 0xffffffff, 0),
+	SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0x4edb1902, 0xffffffff, 0),
 	SYSC_QUIRK("dmic", 0, 0, 0x10, -1, 0x50010000, 0xffffffff, 0),
 	SYSC_QUIRK("dwc3", 0, 0, 0x10, -1, 0x500a0200, 0xffffffff, 0),
 	SYSC_QUIRK("epwmss", 0, 0, 0x4, -1, 0x47400001, 0xffffffff, 0),
Signature · 1 line
2.21.0
author maintainer
#22 lore raw

PATCH 8/8 ARM: dts: Fix lcdc sysc flags for am3

In reply to Tony Lindgren

The LCDC controller on am335x has a sysconfig register without a SOFTRESET bit. Let's configure that by setting ti,sysc-mask = <0> as otherwise we get the following warning:

ti-sysc 4830e000.target-module: idlemodes 00000087 != 00000007

And the legacy platform data has LCDC midle unconfigured so let's remove that property.

---
 arch/arm/boot/dts/am33xx-l4.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
@@ -2038,7 +2038,7 @@
 			reg = <0xe000 0x4>,
 			      <0xe054 0x4>;
 			reg-names = "rev", "sysc";
-			ti,sysc-midle ;
+			ti,sysc-mask = <0>;
 			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 					<SYSC_IDLE_NO>,
 					<SYSC_IDLE_SMART>;
Signature · 1 line
2.21.0
Tested-by on the v1 series
#23 lore raw
In reply to Tony Lindgren
Quoted 9 lines · Tony Lindgren

Hi all,

I noticed that with recent ti-sysc driver changes some new warnings have crept in. Mostly they are caused by having different configuration in the dts compared to the legacy platform data. Let's fix these first before we continue dropping the legacy platform data.

I also noticed we need two fixes for the ti-sysc driver while looking at the warnings.

Tony,

Apart from Patch 2(breaks DS0 on AM3). Rest all work fine.

Tested for DS0/RTC+ddr on AM4, DS0 on AM3 Boneblack.

You can add my:

For all the 7 patches except Patch 2.

Regards,
Keerthy

Quoted 25 lines

Regards,

Tony

Tony Lindgren (8):
ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
ARM: OMAP2+: Remove unconfigured midlemode for am3 lcdc
bus: ti-sysc: Fix handling of forced idle
bus: ti-sysc: Fix using configured sysc mask value
ARM: dts: Drop bogus ahclkr clocks for dra7 mcasp 3 to 8
ARM: dts: Fix flags for gpio7
ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7
ARM: dts: Fix lcdc sysc flags for am3

  arch/arm/boot/dts/am33xx-l4.dtsi              |  6 +++-
  arch/arm/boot/dts/am437x-l4.dtsi              |  4 +++
  .../boot/dts/am57xx-beagle-x15-common.dtsi    |  2 +-
  arch/arm/boot/dts/dra7-evm.dts                |  2 +-
  arch/arm/boot/dts/dra7-l4.dtsi                | 31 ++++++++-----------
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c    |  2 +-
  arch/arm/mach-omap2/omap_hwmod_7xx_data.c     |  3 +-
  drivers/bus/ti-sysc.c                         | 10 +++---
  8 files changed, 31 insertions(+), 29 deletions(-)