Patchwork ARM: imx6q: add missing sentinel to divider table

login
register
mail settings
Submitter Lothar Waßmann
Date Oct. 31, 2013, 11:55 a.m.
Message ID <1383220548-8622-1-git-send-email-LW@KARO-electronics.de>
Download mbox | patch
Permalink /patch/287462/
State New
Headers show

Comments

Lothar Waßmann - Oct. 31, 2013, 11:55 a.m.
The clk_enet_ref_table[] is missing a final empty entry as end of list
marker. Also make the existing markers more obvious.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
 arch/arm/mach-imx/clk-imx6q.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Lothar Waßmann - Oct. 31, 2013, 12:04 p.m.
Hi,

Lothar Waßmann wrote:
> The clk_enet_ref_table[] is missing a final empty entry as end of list
> marker. Also make the existing markers more obvious.
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
> ---
>  arch/arm/mach-imx/clk-imx6q.c |    5 +++--
>
There is something else that looks suspicious in this file:
The video_div_table[] has four entries:
|	{ .val = 0, .div = 1, },
|	{ .val = 1, .div = 2, },
|	{ .val = 2, .div = 1, },
|	{ .val = 3, .div = 4, },

But the code that sets the dividers to '1' as a workaround for the TO1.0
chip revision only two dividers are modified, one of which is already
'1':
|if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_1_0) {
|	post_div_table[1].div = 1;
|	post_div_table[2].div = 1;
|	video_div_table[1].div = 1;
|	video_div_table[2].div = 1;
	                ^
This probably should be '3' instead?


Lothar Waßmann
Shawn Guo - Nov. 1, 2013, 9:14 a.m.
On Thu, Oct 31, 2013 at 12:55:48PM +0100, Lothar Waßmann wrote:
> The clk_enet_ref_table[] is missing a final empty entry as end of list
> marker. Also make the existing markers more obvious.
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Please have a blank line between commit log and SoB in the later
patches.

Applied, thanks.

Patch

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index d756d91..8979470 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -122,13 +122,14 @@  static struct clk_div_table clk_enet_ref_table[] = {
 	{ .val = 1, .div = 10, },
 	{ .val = 2, .div = 5, },
 	{ .val = 3, .div = 4, },
+	{ /* sentinel */ }
 };
 
 static struct clk_div_table post_div_table[] = {
 	{ .val = 2, .div = 1, },
 	{ .val = 1, .div = 2, },
 	{ .val = 0, .div = 4, },
-	{ }
+	{ /* sentinel */ }
 };
 
 static struct clk_div_table video_div_table[] = {
@@ -136,7 +137,7 @@  static struct clk_div_table video_div_table[] = {
 	{ .val = 1, .div = 2, },
 	{ .val = 2, .div = 1, },
 	{ .val = 3, .div = 4, },
-	{ }
+	{ /* sentinel */ }
 };
 
 static void __init imx6q_clocks_init(struct device_node *ccm_node)