aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Cousson <b-cousson@ti.com>2012-04-19 15:33:51 -0400
committerPaul Walmsley <paul@pwsan.com>2012-04-19 15:33:51 -0400
commiteb42b5d3997c3a7d0da6c3bb56c1a0055ba3b2be (patch)
tree975f81828f7debf8519e2b8a679b49e614ae64a7
parenta091c08e65ebf7a06c0bdf563f00e77961d3b49c (diff)
ARM: OMAP4: hwmod data: add GPMC
Add the GPMC hwmod and associated interconnect data. The GPMC is a programmable parallel-bus memory controller. Signed-off-by: Benoît Cousson <b-cousson@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c67
1 files changed, 66 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0eeea887a720..c31ae9aa9fd3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -263,7 +263,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = {
263 * elm 263 * elm
264 * emif1 264 * emif1
265 * emif2 265 * emif2
266 * gpmc
267 * gpu 266 * gpu
268 * mcasp 267 * mcasp
269 * mpu_c0 268 * mpu_c0
@@ -1066,6 +1065,53 @@ static struct omap_hwmod omap44xx_gpio6_hwmod = {
1066}; 1065};
1067 1066
1068/* 1067/*
1068 * 'gpmc' class
1069 * general purpose memory controller
1070 */
1071
1072static struct omap_hwmod_class_sysconfig omap44xx_gpmc_sysc = {
1073 .rev_offs = 0x0000,
1074 .sysc_offs = 0x0010,
1075 .syss_offs = 0x0014,
1076 .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
1077 SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
1078 .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
1079 .sysc_fields = &omap_hwmod_sysc_type1,
1080};
1081
1082static struct omap_hwmod_class omap44xx_gpmc_hwmod_class = {
1083 .name = "gpmc",
1084 .sysc = &omap44xx_gpmc_sysc,
1085};
1086
1087/* gpmc */
1088static struct omap_hwmod_irq_info omap44xx_gpmc_irqs[] = {
1089 { .irq = 20 + OMAP44XX_IRQ_GIC_START },
1090 { .irq = -1 }
1091};
1092
1093static struct omap_hwmod_dma_info omap44xx_gpmc_sdma_reqs[] = {
1094 { .dma_req = 3 + OMAP44XX_DMA_REQ_START },
1095 { .dma_req = -1 }
1096};
1097
1098static struct omap_hwmod omap44xx_gpmc_hwmod = {
1099 .name = "gpmc",
1100 .class = &omap44xx_gpmc_hwmod_class,
1101 .clkdm_name = "l3_2_clkdm",
1102 .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
1103 .mpu_irqs = omap44xx_gpmc_irqs,
1104 .sdma_reqs = omap44xx_gpmc_sdma_reqs,
1105 .prcm = {
1106 .omap4 = {
1107 .clkctrl_offs = OMAP4_CM_L3_2_GPMC_CLKCTRL_OFFSET,
1108 .context_offs = OMAP4_RM_L3_2_GPMC_CONTEXT_OFFSET,
1109 .modulemode = MODULEMODE_HWCTRL,
1110 },
1111 },
1112};
1113
1114/*
1069 * 'hdq1w' class 1115 * 'hdq1w' class
1070 * hdq / 1-wire serial interface controller 1116 * hdq / 1-wire serial interface controller
1071 */ 1117 */
@@ -3753,6 +3799,24 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio6 = {
3753 .user = OCP_USER_MPU | OCP_USER_SDMA, 3799 .user = OCP_USER_MPU | OCP_USER_SDMA,
3754}; 3800};
3755 3801
3802static struct omap_hwmod_addr_space omap44xx_gpmc_addrs[] = {
3803 {
3804 .pa_start = 0x50000000,
3805 .pa_end = 0x500003ff,
3806 .flags = ADDR_TYPE_RT
3807 },
3808 { }
3809};
3810
3811/* l3_main_2 -> gpmc */
3812static struct omap_hwmod_ocp_if omap44xx_l3_main_2__gpmc = {
3813 .master = &omap44xx_l3_main_2_hwmod,
3814 .slave = &omap44xx_gpmc_hwmod,
3815 .clk = "l3_div_ck",
3816 .addr = omap44xx_gpmc_addrs,
3817 .user = OCP_USER_MPU | OCP_USER_SDMA,
3818};
3819
3756static struct omap_hwmod_addr_space omap44xx_hdq1w_addrs[] = { 3820static struct omap_hwmod_addr_space omap44xx_hdq1w_addrs[] = {
3757 { 3821 {
3758 .pa_start = 0x480b2000, 3822 .pa_start = 0x480b2000,
@@ -4869,6 +4933,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
4869 &omap44xx_l4_per__gpio4, 4933 &omap44xx_l4_per__gpio4,
4870 &omap44xx_l4_per__gpio5, 4934 &omap44xx_l4_per__gpio5,
4871 &omap44xx_l4_per__gpio6, 4935 &omap44xx_l4_per__gpio6,
4936 &omap44xx_l3_main_2__gpmc,
4872 &omap44xx_l4_per__hdq1w, 4937 &omap44xx_l4_per__hdq1w,
4873 &omap44xx_l4_cfg__hsi, 4938 &omap44xx_l4_cfg__hsi,
4874 &omap44xx_l4_per__i2c1, 4939 &omap44xx_l4_per__i2c1,