summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexander Shiyan <eagle.alexander923@gmail.com>2022-06-03 14:25:34 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2022-06-07 09:32:36 +0200
commitccde27b0049777fedd32c195b3ad5c8255f0df91 (patch)
tree90215607b43151e4e431f2b232fec6335f55d8fb /arch
parenta71a6f68954b7746dc92a9b0c3e013094bfec1e0 (diff)
downloadbarebox-ccde27b0049777fedd32c195b3ad5c8255f0df91.tar.gz
barebox-ccde27b0049777fedd32c195b3ad5c8255f0df91.tar.xz
ARM: OMAP: Move EMIF4 definitions to appropriate header
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com> Link: https://lore.barebox.org/20220603112540.51644-2-eagle.alexander923@gmail.com Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/afi-gf/lowlevel.c1
-rw-r--r--arch/arm/mach-omap/am33xx_generic.c1
-rw-r--r--arch/arm/mach-omap/include/mach/am33xx-silicon.h21
-rw-r--r--arch/arm/mach-omap/include/mach/emif4.h21
4 files changed, 23 insertions, 21 deletions
diff --git a/arch/arm/boards/afi-gf/lowlevel.c b/arch/arm/boards/afi-gf/lowlevel.c
index 88ffcfae5b..d28cc8fad3 100644
--- a/arch/arm/boards/afi-gf/lowlevel.c
+++ b/arch/arm/boards/afi-gf/lowlevel.c
@@ -10,6 +10,7 @@
#include <mach/am33xx-generic.h>
#include <mach/am33xx-silicon.h>
#include <mach/am33xx-clock.h>
+#include <mach/emif4.h>
#include <mach/sdrc.h>
#include <mach/sys_info.h>
#include <mach/syslib.h>
diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c
index 896968f2f3..bdfa0e9e26 100644
--- a/arch/arm/mach-omap/am33xx_generic.c
+++ b/arch/arm/mach-omap/am33xx_generic.c
@@ -23,6 +23,7 @@
#include <asm/barebox-arm.h>
#include <mach/am33xx-silicon.h>
#include <mach/am33xx-clock.h>
+#include <mach/emif4.h>
#include <mach/generic.h>
#include <mach/sys_info.h>
#include <mach/am33xx-generic.h>
diff --git a/arch/arm/mach-omap/include/mach/am33xx-silicon.h b/arch/arm/mach-omap/include/mach/am33xx-silicon.h
index d090b0f29c..671706ff49 100644
--- a/arch/arm/mach-omap/include/mach/am33xx-silicon.h
+++ b/arch/arm/mach-omap/include/mach/am33xx-silicon.h
@@ -94,27 +94,6 @@
#define AM33XX_DMM_LISA_MAP__3 (AM33XX_DMM_BASE + 0x4C)
#define AM33XX_DMM_PAT_BASE_ADDR (AM33XX_DMM_BASE + 0x460)
-#define EMIF4_MOD_ID_REV 0x0
-#define EMIF4_SDRAM_STATUS 0x04
-#define EMIF4_SDRAM_CONFIG 0x08
-#define EMIF4_SDRAM_CONFIG2 0x0C
-#define EMIF4_SDRAM_REF_CTRL 0x10
-#define EMIF4_SDRAM_REF_CTRL_SHADOW 0x14
-#define EMIF4_SDRAM_TIM_1 0x18
-#define EMIF4_SDRAM_TIM_1_SHADOW 0x1C
-#define EMIF4_SDRAM_TIM_2 0x20
-#define EMIF4_SDRAM_TIM_2_SHADOW 0x24
-#define EMIF4_SDRAM_TIM_3 0x28
-#define EMIF4_SDRAM_TIM_3_SHADOW 0x2C
-#define EMIF0_SDRAM_MGMT_CTRL 0x38
-#define EMIF0_SDRAM_MGMT_CTRL_SHD 0x3C
-#define EMIF4_OCP_CONFIG 0x54
-#define EMIF4_ZQ_CONFIG 0xC8
-#define EMIF4_DDR_PHY_CTRL_1 0xE4
-#define EMIF4_DDR_PHY_CTRL_1_SHADOW 0xE8
-#define EMIF4_DDR_PHY_CTRL_2 0xEC
-#define EMIF4_IODFT_TLGC 0x60
-
#define AM33XX_VTP0_CTRL_REG 0x44E10E0C
#define AM33XX_VTP1_CTRL_REG 0x48140E10
diff --git a/arch/arm/mach-omap/include/mach/emif4.h b/arch/arm/mach-omap/include/mach/emif4.h
index 1f9c2938a1..559443c9a6 100644
--- a/arch/arm/mach-omap/include/mach/emif4.h
+++ b/arch/arm/mach-omap/include/mach/emif4.h
@@ -24,6 +24,27 @@
#ifndef _EMIF_H_
#define _EMIF_H_
+#define EMIF4_MOD_ID_REV 0x0
+#define EMIF4_STATUS 0x04
+#define EMIF4_SDRAM_CONFIG 0x08
+#define EMIF4_SDRAM_CONFIG2 0x0c
+#define EMIF4_SDRAM_REF_CTRL 0x10
+#define EMIF4_SDRAM_REF_CTRL_SHADOW 0x14
+#define EMIF4_SDRAM_TIM_1 0x18
+#define EMIF4_SDRAM_TIM_1_SHADOW 0x1c
+#define EMIF4_SDRAM_TIM_2 0x20
+#define EMIF4_SDRAM_TIM_2_SHADOW 0x24
+#define EMIF4_SDRAM_TIM_3 0x28
+#define EMIF4_SDRAM_TIM_3_SHADOW 0x2c
+#define EMIF4_POWER_MANAGEMENT_CTRL 0x38
+#define EMIF4_POWER_MANAGEMENT_CTRL_SHADOW 0x3c
+#define EMIF4_OCP_CONFIG 0x54
+#define EMIF4_ZQ_CONFIG 0xc8
+#define EMIF4_DDR_PHY_CTRL_1 0xe4
+#define EMIF4_DDR_PHY_CTRL_1_SHADOW 0xe8
+#define EMIF4_DDR_PHY_CTRL_2 0xec
+#define EMIF4_IODFT_TLGC 0x60
+
/*
* Configuration values
*/