[PATCH 1/2] [ARM] Kirkwood: enhance TLCK detection

[Saeed Bishara]

>-----Original Message-----
>From: Simon Guinot [mailto:simon at sequanux.org] 
>Sent: Thursday, October 21, 2010 9:45 AM
>To: Lennert Buytenhek; Nicolas Pitre
>Cc: linux-arm-kernel at lists.infradead.org; Benoit Canet; Saeed 
>Bishara; Simon Guinot
>Subject: [PATCH 1/2] [ARM] Kirkwood: enhance TLCK detection
>
>From: Simon Guinot <sguinot at lacie.com>
>
>According to the Marvell LSP, the Sample at Reset regiter bit 21 can be
>used to detect TCLK on 6281 and 6282 devices.
>
>This patch has only been tested on LaCie boards.
>
>Signed-off-by: Simon Guinot <sguinot at lacie.com>
>---
> arch/arm/mach-kirkwood/common.c |    7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/arch/arm/mach-kirkwood/common.c 
>b/arch/arm/mach-kirkwood/common.c
>index 1c82d42..72bb76f 100644
>--- a/arch/arm/mach-kirkwood/common.c
>+++ b/arch/arm/mach-kirkwood/common.c
>@@ -854,10 +854,9 @@ int __init kirkwood_find_tclk(void)
> 
> 	kirkwood_pcie_id(&dev, &rev);
> 
>-	if ((dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 ||
>-					rev == MV88F6281_REV_A1)) ||
>-	    (dev == MV88F6282_DEV_ID))
>-		return 200000000;
>+	if (dev == MV88F6281_DEV_ID || dev == MV88F6282_DEV_ID)
>+		if ((readl(SAMPLE_AT_RESET) >> 21 & 1) == 0)
>+			return 200000000;
The flow is ok, but the code doesn't look correct, the & precedence is higher thatn >>.
saeed
> 
> 	return 166666667;
> }
>-- 
>1.6.3.1
>
>