Skip to contentSkip to conversation

clk: tegra: fix ifdef for tegra_periph_reset_assert inline

PATCH New Stephen Warren 3 participants 5 messages Jun 24, 2013 – Jun 28, 2013

Subsystems (2)
Common clk Tegra architecture support
lore
Share & tools
lore

Stephen Warren

author
#0 lore raw

PATCH 1/1 clk: tegra: fix ifdef for tegra_periph_reset_assert inline

From: Stephen Warren <[email protected]>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert alternative" added ifdef'd static inline versions of some functions, but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling these function in all cases. In some cases, this caused HW modules to misbehave; for example, the Tegra I2C driver BUG()d during boot on Seaboard.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Stephen Warren <[email protected]>
---
 include/linux/clk/tegra.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/clk/tegra.h +1 -1
index e3cc872..23a0cee 100644
@@ -120,7 +120,7 @@ static inline void tegra_cpu_clock_resume(void)
 }
 #endif
 
-#ifdef ARCH_TEGRA
+#ifdef CONFIG_ARCH_TEGRA
 void tegra_periph_reset_deassert(struct clk *c);
 void tegra_periph_reset_assert(struct clk *c);
 #else
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 clk: tegra: fix ifdef for tegra_periph_reset_assert inline

Quoting Stephen Warren (2013-06-24 12:05:56)

Quoted 11 lines

From: Stephen Warren <[email protected]>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert alternative" added ifdef'd static inline versions of some functions, but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling these function in all cases. In some cases, this caused HW modules to misbehave; for example, the Tegra I2C driver BUG()d during boot on Seaboard.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Stephen Warren <[email protected]>

Thanks for the fixup. I had already published the offending commit and can't rebase it, so I just applied this patch on top.

Pulled into clk-next for 3.11.

Regards,
Mike

Quoted 19 lines
---
 include/linux/clk/tegra.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/clk/tegra.h +1 -1
index e3cc872..23a0cee 100644
@@ -120,7 +120,7 @@ static inline void tegra_cpu_clock_resume(void)
 }
 #endif
 
-#ifdef ARCH_TEGRA
+#ifdef CONFIG_ARCH_TEGRA
 void tegra_periph_reset_deassert(struct clk *c);
 void tegra_periph_reset_assert(struct clk *c);
 #else
Signature · 1 line
1.8.1.5
author
#2 lore raw

PATCH 1/1 clk: tegra: fix ifdef for tegra_periph_reset_assert inline

Quoted 10 lines · Mike Turquette

Quoting Stephen Warren (2013-06-24 12:05:56)

Quoted 9 lines

From: Stephen Warren <[email protected]>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert alternative" added ifdef'd static inline versions of some functions, but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling these function in all cases. In some cases, this caused HW modules to misbehave; for example, the Tegra I2C driver BUG()d during boot on Seaboard.

Quoted 7 lines
Quoted 2 lines
Reported-by Olof Johansson <[email protected]>
Signed-off-by Stephen Warren <[email protected]>

Thanks for the fixup. I had already published the offending commit and can't rebase it, so I just applied this patch on top.

Pulled into clk-next for 3.11.

Did that get pushed out to the git server? The patch isn't in next-20130627.

#3 lore raw

PATCH 1/1 clk: tegra: fix ifdef for tegra_periph_reset_assert inline

Quoting Stephen Warren (2013-06-27 15:59:04)

Quoted 14 lines · Mike Turquette
Quoted 13 lines

Quoting Stephen Warren (2013-06-24 12:05:56)

Quoted 11 lines

From: Stephen Warren <[email protected]>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert alternative" added ifdef'd static inline versions of some functions, but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling these function in all cases. In some cases, this caused HW modules to misbehave; for example, the Tegra I2C driver BUG()d during boot on Seaboard.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Stephen Warren <[email protected]>
Quoted 6 lines
Quoted 4 lines

Thanks for the fixup. I had already published the offending commit and can't rebase it, so I just applied this patch on top.

Pulled into clk-next for 3.11.

Did that get pushed out to the git server? The patch isn't in next-20130627.

It was sitting in my local tree. Sorry about that. Pushed to the public tree now.

Regards,
Mike

#4 lore raw

PATCH 1/1 clk: tegra: fix ifdef for tegra_periph_reset_assert inline

In reply to Stephen Warren
Quoted 11 lines · Stephen Warren

From: Stephen Warren <[email protected]>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert alternative" added ifdef'd static inline versions of some functions, but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling these function in all cases. In some cases, this caused HW modules to misbehave; for example, the Tegra I2C driver BUG()d during boot on Seaboard.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Stephen Warren <[email protected]>
Tested-by Paul Walmsley <[email protected]> # for the Tegra30 Beaver

board

Stephen pointed me at this patch to fix the boot on Tegra30 Beaver boad with linux-next 20130624. Thanks Stephen!

- Paul