* [PATCH] OMAP4: cleanup
@ 2012-07-27 7:52 Jan Weitzel
2012-07-27 8:02 ` Jan Weitzel
0 siblings, 1 reply; 2+ messages in thread
From: Jan Weitzel @ 2012-07-27 7:52 UTC (permalink / raw)
To: barebox
use rev to check revision
Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
arch/arm/mach-omap/omap4_generic.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index c6fb91f..f44fa4b 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -23,7 +23,7 @@
#define MIDR_CORTEX_A9_R1P3 0x411FC093
#define MIDR_CORTEX_A9_R2P10 0x412FC09A
-#define CONTROL_ID_CODE 0x4A002204
+#define CONTROL_ID_CODE 0x4A002204
#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F
#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F
@@ -278,8 +278,7 @@ static void reset_phy(unsigned int base)
void omap4_ddr_init(const struct ddr_regs *ddr_regs,
const struct dpll_param *core)
{
- unsigned int rev;
- rev = omap4_revision();
+ unsigned int rev = omap4_revision();
if (rev == OMAP4430_ES2_0) {
writel(0x9e9e9e9e, 0x4A100638);
@@ -302,7 +301,7 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,
*(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_2) = 0x00000000;
*(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_3) = 0xFF020100;
- if (omap4_revision() >= OMAP4460_ES1_0) {
+ if (rev >= OMAP4460_ES1_0) {
writel(0x80640300, OMAP44XX_MA_BASE + DMM_LISA_MAP_0);
*(volatile int*)(OMAP44XX_MA_BASE + DMM_LISA_MAP_2) = 0x00000000;
@@ -351,7 +350,7 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,
*(volatile int*)(OMAP44XX_EMIF1_BASE + EMIF_PWR_MGMT_CTRL) = 0x80000000;
*(volatile int*)(OMAP44XX_EMIF2_BASE + EMIF_PWR_MGMT_CTRL) = 0x80000000;
- if (omap4_revision() >= OMAP4460_ES1_0) {
+ if (rev >= OMAP4460_ES1_0) {
writel(EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0,
OMAP44XX_EMIF1_BASE + EMIF_L3_CONFIG);
writel(EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0,
--
1.7.0.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] OMAP4: cleanup
2012-07-27 7:52 [PATCH] OMAP4: cleanup Jan Weitzel
@ 2012-07-27 8:02 ` Jan Weitzel
0 siblings, 0 replies; 2+ messages in thread
From: Jan Weitzel @ 2012-07-27 8:02 UTC (permalink / raw)
To: barebox
Am Freitag, den 27.07.2012, 09:52 +0200 schrieb Jan Weitzel:
> use rev to check revision
>
sorry didn't apply on master, will rework
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> ---
> arch/arm/mach-omap/omap4_generic.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
> index c6fb91f..f44fa4b 100644
> --- a/arch/arm/mach-omap/omap4_generic.c
> +++ b/arch/arm/mach-omap/omap4_generic.c
> @@ -23,7 +23,7 @@
> #define MIDR_CORTEX_A9_R1P3 0x411FC093
> #define MIDR_CORTEX_A9_R2P10 0x412FC09A
>
> -#define CONTROL_ID_CODE 0x4A002204
> +#define CONTROL_ID_CODE 0x4A002204
>
> #define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F
> #define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F
> @@ -278,8 +278,7 @@ static void reset_phy(unsigned int base)
> void omap4_ddr_init(const struct ddr_regs *ddr_regs,
> const struct dpll_param *core)
> {
> - unsigned int rev;
> - rev = omap4_revision();
> + unsigned int rev = omap4_revision();
>
> if (rev == OMAP4430_ES2_0) {
> writel(0x9e9e9e9e, 0x4A100638);
> @@ -302,7 +301,7 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,
> *(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_2) = 0x00000000;
> *(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_3) = 0xFF020100;
>
> - if (omap4_revision() >= OMAP4460_ES1_0) {
> + if (rev >= OMAP4460_ES1_0) {
> writel(0x80640300, OMAP44XX_MA_BASE + DMM_LISA_MAP_0);
>
> *(volatile int*)(OMAP44XX_MA_BASE + DMM_LISA_MAP_2) = 0x00000000;
> @@ -351,7 +350,7 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,
> *(volatile int*)(OMAP44XX_EMIF1_BASE + EMIF_PWR_MGMT_CTRL) = 0x80000000;
> *(volatile int*)(OMAP44XX_EMIF2_BASE + EMIF_PWR_MGMT_CTRL) = 0x80000000;
>
> - if (omap4_revision() >= OMAP4460_ES1_0) {
> + if (rev >= OMAP4460_ES1_0) {
> writel(EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0,
> OMAP44XX_EMIF1_BASE + EMIF_L3_CONFIG);
> writel(EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0,
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-27 8:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-27 7:52 [PATCH] OMAP4: cleanup Jan Weitzel
2012-07-27 8:02 ` Jan Weitzel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox