public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 04/11] sdrc register defs
@ 2008-07-01 14:16 Rajendra Nayak
  0 siblings, 0 replies; 4+ messages in thread
From: Rajendra Nayak @ 2008-07-01 14:16 UTC (permalink / raw)
  To: linux-omap

This patch adds some missing sdrc register definitions

Signed-off-by: Rajendra Nayak <rnayak@ti.com>

---
 arch/arm/mach-omap2/sram34xx.S   |    4 ++--
 include/asm-arm/arch-omap/sdrc.h |   13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

Index: linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/sram34xx.S	2008-05-30 09:48:07.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S	2008-05-30 10:54:10.377835914 +0530
@@ -185,9 +185,9 @@ omap34xx_cm_iclken1_core:
 omap34xx_sdrc_rfr_ctrl:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0)
 omap34xx_sdrc_actim_ctrla:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0)
 omap34xx_sdrc_actim_ctrlb:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0)
 omap34xx_sdrc_dlla_status:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)
 omap34xx_sdrc_dlla_ctrl:
Index: linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h
===================================================================
--- linux-omap-2.6.orig/include/asm-arm/arch-omap/sdrc.h	2008-05-30 09:48:15.000000000 +0530
+++ linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h	2008-05-30 10:54:19.223556769 +0530
@@ -19,15 +19,24 @@
 /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
 
 #define SDRC_SYSCONFIG		0x010
+#define SDRC_CS_CFG		0x040
+#define SDRC_SHARING		0x044
+#define SDRC_ERR_TYPE		0x04C
 #define SDRC_DLLA_CTRL		0x060
 #define SDRC_DLLA_STATUS	0x064
 #define SDRC_DLLB_CTRL		0x068
 #define SDRC_DLLB_STATUS	0x06C
 #define SDRC_POWER		0x070
+#define SDRC_MCFG_0		0x080
 #define SDRC_MR_0		0x084
-#define SDRC_ACTIM_CTRL_A	0x09c
-#define SDRC_ACTIM_CTRL_B	0x0a0
+#define SDRC_ACTIM_CTRL_A_0	0x09c
+#define SDRC_ACTIM_CTRL_B_0	0x0a0
 #define SDRC_RFR_CTRL_0		0x0a4
+#define SDRC_MCFG_1		0x0B0
+#define SDRC_MR_1		0x0B4
+#define SDRC_ACTIM_CTRL_A_1	0x0C4
+#define SDRC_ACTIM_CTRL_B_1	0x0C8
+#define SDRC_RFR_CTRL_1		0x0D4
 
 /*
  * These values represent the number of memory clock cycles between


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 04/11] sdrc register defs
@ 2008-07-18 13:19 Rajendra Nayak
  0 siblings, 0 replies; 4+ messages in thread
From: Rajendra Nayak @ 2008-07-18 13:19 UTC (permalink / raw)
  To: linux-omap

This patch adds some missing sdrc register definitions

Signed-off-by: Rajendra Nayak <rnayak@ti.com>

---
 arch/arm/mach-omap2/sram34xx.S   |    4 ++--
 include/asm-arm/arch-omap/sdrc.h |   13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

Index: linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/sram34xx.S	2008-05-30 09:48:07.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S	2008-05-30 10:54:10.377835914 +0530
@@ -185,9 +185,9 @@ omap34xx_cm_iclken1_core:
 omap34xx_sdrc_rfr_ctrl:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0)
 omap34xx_sdrc_actim_ctrla:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0)
 omap34xx_sdrc_actim_ctrlb:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0)
 omap34xx_sdrc_dlla_status:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)
 omap34xx_sdrc_dlla_ctrl:
Index: linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h
===================================================================
--- linux-omap-2.6.orig/include/asm-arm/arch-omap/sdrc.h	2008-05-30 09:48:15.000000000 +0530
+++ linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h	2008-05-30 10:54:19.223556769 +0530
@@ -19,15 +19,24 @@
 /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
 
 #define SDRC_SYSCONFIG		0x010
+#define SDRC_CS_CFG		0x040
+#define SDRC_SHARING		0x044
+#define SDRC_ERR_TYPE		0x04C
 #define SDRC_DLLA_CTRL		0x060
 #define SDRC_DLLA_STATUS	0x064
 #define SDRC_DLLB_CTRL		0x068
 #define SDRC_DLLB_STATUS	0x06C
 #define SDRC_POWER		0x070
+#define SDRC_MCFG_0		0x080
 #define SDRC_MR_0		0x084
-#define SDRC_ACTIM_CTRL_A	0x09c
-#define SDRC_ACTIM_CTRL_B	0x0a0
+#define SDRC_ACTIM_CTRL_A_0	0x09c
+#define SDRC_ACTIM_CTRL_B_0	0x0a0
 #define SDRC_RFR_CTRL_0		0x0a4
+#define SDRC_MCFG_1		0x0B0
+#define SDRC_MR_1		0x0B4
+#define SDRC_ACTIM_CTRL_A_1	0x0C4
+#define SDRC_ACTIM_CTRL_B_1	0x0C8
+#define SDRC_RFR_CTRL_1		0x0D4
 
 /*
  * These values represent the number of memory clock cycles between


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 04/11] sdrc register defs
@ 2008-08-06 13:14 Rajendra Nayak
  2008-08-20 12:50 ` Tony Lindgren
  0 siblings, 1 reply; 4+ messages in thread
From: Rajendra Nayak @ 2008-08-06 13:14 UTC (permalink / raw)
  To: linux-omap

This patch adds some missing sdrc register definitions

Signed-off-by: Rajendra Nayak <rnayak@ti.com>

---
 arch/arm/mach-omap2/sram34xx.S   |    4 ++--
 include/asm-arm/arch-omap/sdrc.h |   13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

Index: linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/sram34xx.S	2008-08-06
18:07:31.000000000 +0530
+++ linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S	2008-08-06 18:10:18.000000000
+0530
@@ -165,9 +165,9 @@ omap3_cm_iclken1_core:
 omap3_sdrc_rfr_ctrl:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0)
 omap3_sdrc_actim_ctrla:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0)
 omap3_sdrc_actim_ctrlb:
-	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B)
+	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0)
 omap3_sdrc_dlla_status:
 	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)
 omap3_sdrc_dlla_ctrl:
Index: linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h
===================================================================
--- linux-omap-2.6.orig/include/asm-arm/arch-omap/sdrc.h	2008-08-06
18:07:31.000000000 +0530
+++ linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h	2008-08-06
18:10:18.000000000 +0530
@@ -21,15 +21,24 @@
 /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */

 #define SDRC_SYSCONFIG		0x010
+#define SDRC_CS_CFG		0x040
+#define SDRC_SHARING		0x044
+#define SDRC_ERR_TYPE		0x04C
 #define SDRC_DLLA_CTRL		0x060
 #define SDRC_DLLA_STATUS	0x064
 #define SDRC_DLLB_CTRL		0x068
 #define SDRC_DLLB_STATUS	0x06C
 #define SDRC_POWER		0x070
+#define SDRC_MCFG_0		0x080
 #define SDRC_MR_0		0x084
-#define SDRC_ACTIM_CTRL_A	0x09c
-#define SDRC_ACTIM_CTRL_B	0x0a0
+#define SDRC_ACTIM_CTRL_A_0	0x09c
+#define SDRC_ACTIM_CTRL_B_0	0x0a0
 #define SDRC_RFR_CTRL_0		0x0a4
+#define SDRC_MCFG_1		0x0B0
+#define SDRC_MR_1		0x0B4
+#define SDRC_ACTIM_CTRL_A_1	0x0C4
+#define SDRC_ACTIM_CTRL_B_1	0x0C8
+#define SDRC_RFR_CTRL_1		0x0D4

 /*
  * These values represent the number of memory clock cycles between



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 04/11] sdrc register defs
  2008-08-06 13:14 [PATCH 04/11] sdrc register defs Rajendra Nayak
@ 2008-08-20 12:50 ` Tony Lindgren
  0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2008-08-20 12:50 UTC (permalink / raw)
  To: Rajendra Nayak; +Cc: linux-omap

* Rajendra Nayak <rnayak@ti.com> [080806 16:16]:
> This patch adds some missing sdrc register definitions

Pushing this today (after header path rewriting).

Tony

> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> 
> ---
>  arch/arm/mach-omap2/sram34xx.S   |    4 ++--
>  include/asm-arm/arch-omap/sdrc.h |   13 +++++++++++--
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> Index: linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/sram34xx.S	2008-08-06
> 18:07:31.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap2/sram34xx.S	2008-08-06 18:10:18.000000000
> +0530
> @@ -165,9 +165,9 @@ omap3_cm_iclken1_core:
>  omap3_sdrc_rfr_ctrl:
>  	.word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0)
>  omap3_sdrc_actim_ctrla:
> -	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A)
> +	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0)
>  omap3_sdrc_actim_ctrlb:
> -	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B)
> +	.word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0)
>  omap3_sdrc_dlla_status:
>  	.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)
>  omap3_sdrc_dlla_ctrl:
> Index: linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h
> ===================================================================
> --- linux-omap-2.6.orig/include/asm-arm/arch-omap/sdrc.h	2008-08-06
> 18:07:31.000000000 +0530
> +++ linux-omap-2.6/include/asm-arm/arch-omap/sdrc.h	2008-08-06
> 18:10:18.000000000 +0530
> @@ -21,15 +21,24 @@
>  /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
> 
>  #define SDRC_SYSCONFIG		0x010
> +#define SDRC_CS_CFG		0x040
> +#define SDRC_SHARING		0x044
> +#define SDRC_ERR_TYPE		0x04C
>  #define SDRC_DLLA_CTRL		0x060
>  #define SDRC_DLLA_STATUS	0x064
>  #define SDRC_DLLB_CTRL		0x068
>  #define SDRC_DLLB_STATUS	0x06C
>  #define SDRC_POWER		0x070
> +#define SDRC_MCFG_0		0x080
>  #define SDRC_MR_0		0x084
> -#define SDRC_ACTIM_CTRL_A	0x09c
> -#define SDRC_ACTIM_CTRL_B	0x0a0
> +#define SDRC_ACTIM_CTRL_A_0	0x09c
> +#define SDRC_ACTIM_CTRL_B_0	0x0a0
>  #define SDRC_RFR_CTRL_0		0x0a4
> +#define SDRC_MCFG_1		0x0B0
> +#define SDRC_MR_1		0x0B4
> +#define SDRC_ACTIM_CTRL_A_1	0x0C4
> +#define SDRC_ACTIM_CTRL_B_1	0x0C8
> +#define SDRC_RFR_CTRL_1		0x0D4
> 
>  /*
>   * These values represent the number of memory clock cycles between
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-08-20 12:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-06 13:14 [PATCH 04/11] sdrc register defs Rajendra Nayak
2008-08-20 12:50 ` Tony Lindgren
  -- strict thread matches above, loose matches on Subject: below --
2008-07-18 13:19 Rajendra Nayak
2008-07-01 14:16 Rajendra Nayak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox