New year's pxa fixes
Subsystems (3)
cover New year's pxa fixes
First of all, happy new year !
Second, not even an hour after midnight (over here), here are some minor fixes squishing some warnings in pxa tree.
Marek Vasut (2):
pxa: Fix warning in zeus.c
pxa: Remove unused variable in clock-pxa3xx.c
arch/arm/mach-pxa/clock-pxa3xx.c | 1 - arch/arm/mach-pxa/zeus.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.2.3
PATCH 1/2 pxa: Fix warning in zeus.c
Signed-off-by Marek Vasut <[email protected]>
--- arch/arm/mach-pxa/zeus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-pxa/zeus.c +2 -2
@@ -830,8 +830,8 @@ static void __init zeus_init(void)pr_info ("Zeus CPLD V%dI%d\n" , (system_rev &0xf0 ) >>4 , (system_rev &0x0f ));/* Fix timings for dm9000s (CS1/CS2)*/ - msc0 =__raw_readl (MSC0 ) &0x0000ffff | (dm9000_msc <<16 ); - msc1 =__raw_readl (MSC1 ) &0xffff0000 | dm9000_msc; + msc0 = (__raw_readl (MSC0 ) &0x0000ffff ) | (dm9000_msc <<16 ); + msc1 = (__raw_readl (MSC1 ) &0xffff0000 ) | dm9000_msc;__raw_writel (msc0,MSC0 );__raw_writel (msc1,MSC1 );
Signature · 1 line
1.7.2.3
PATCH 2/2 pxa: Remove unused variable in clock-pxa3xx.c
In reply to Marek VasutSigned-off-by Marek Vasut <[email protected]>
--- arch/arm/mach-pxa/clock-pxa3xx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/clock-pxa3xx.c +0 -1
@@ -115,7 +115,6 @@ static unsigned long clk_pxa3xx_smemc_getrate(struct clk *clk) {unsigned long acsr =ACSR ;unsigned long memclkcfg =__raw_readl (MEMCLKCFG ); -unsigned int smcfs = (acsr >>23 ) &0x7 ;return BASE_CLK * smcfs_mult[(acsr >>23 ) &0x7 ] / df_clkdiv[(memclkcfg >>16 ) &0x3 ];
Signature · 1 line
1.7.2.3