[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1297433905-27925-1-git-send-email-subhasish@mistralsolutions.com>
Date: Fri, 11 Feb 2011 19:48:25 +0530
From: Subhasish Ghosh <subhasish@...tralsolutions.com>
To: davinci-linux-open-source@...ux.davincidsp.com
Cc: linux-arm-kernel@...ts.infradead.org, m-watkins@...com,
nsekhar@...com, sachi@...tralsolutions.com,
Subhasish Ghosh <subhasish@...tralsolutions.com>,
Kevin Hilman <khilman@...prootsystems.com> (supporter:TI DAVINCI
MACHIN...,commit_signer:3/4=75%),
Russell King <linux@....linux.org.uk> (maintainer:ARM PORT),
Cyril Chemparathy <cyril@...com> (commit_signer:2/4=50%),
Juha Kuikka <juha.kuikka@...ktrobit.com> (commit_signer:1/4=25%),
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH 1/1] da830: macro rename DA8XX_LPSC0_DMAX to DA8XX_LPSC0_PRUSS.
The PRUSS was named as DMAX on da830 platform.
This patch resolves the naming conflict by replacing the macro
DA8XX_LPSC0_DMAX with DA8XX_LPSC0_PRUSS.
Signed-off-by: Subhasish Ghosh <subhasish@...tralsolutions.com>
---
arch/arm/mach-davinci/da830.c | 2 +-
arch/arm/mach-davinci/include/mach/psc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index ec23ab4..0577a5d 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -148,7 +148,7 @@ static struct clk scr2_ss_clk = {
static struct clk dmax_clk = {
.name = "dmax",
.parent = &pll0_sysclk2,
- .lpsc = DA8XX_LPSC0_DMAX,
+ .lpsc = DA8XX_LPSC0_PRUSS,
.flags = ALWAYS_ENABLED,
};
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h
index 62b0858..a47e6f2 100644
--- a/arch/arm/mach-davinci/include/mach/psc.h
+++ b/arch/arm/mach-davinci/include/mach/psc.h
@@ -150,7 +150,7 @@
#define DA8XX_LPSC0_SCR0_SS 10
#define DA8XX_LPSC0_SCR1_SS 11
#define DA8XX_LPSC0_SCR2_SS 12
-#define DA8XX_LPSC0_DMAX 13
+#define DA8XX_LPSC0_PRUSS 13
#define DA8XX_LPSC0_ARM 14
#define DA8XX_LPSC0_GEM 15
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists