| Message ID | 1385014699-7257-2-git-send-email-lokeshvutla@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Lokesh, On Thu, Nov 21, 2013 at 1:18 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote: [...] > +#define CM_DPLL 0x44DF4200 > +#define CM_RTC 0x44df8500 > nit: CM_RTC address should be in caps for the sake of consistency > #define PRM_RSTCTRL (PRCM_BASE + 0x4000) > #define PRM_RSTST (PRM_RSTCTRL + 4) > diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h > index 4509a23..9080b6f 100644 > --- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h > +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h > @@ -27,6 +27,8 @@ > #define PRCM_BASE 0x48180000 > #define CM_PER 0x44E00000 > #define CM_WKUP 0x44E00400 > +#define CM_DPLL 0x44E00500 > +#define CM_RTC 0x44E00800 > Looking at these address i strongly suspect the CM_XXX ones are wrong for the TI81xx family. Does this really match with the TRM? Regards, Vaibhav
On Friday 22 November 2013 01:50 AM, Vaibhav Bedia wrote: > Hi Lokesh, > > On Thu, Nov 21, 2013 at 1:18 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote: > [...] >> +#define CM_DPLL 0x44DF4200 >> +#define CM_RTC 0x44df8500 >> > > nit: CM_RTC address should be in caps for the sake of consistency OK ll change it. > >> #define PRM_RSTCTRL (PRCM_BASE + 0x4000) >> #define PRM_RSTST (PRM_RSTCTRL + 4) >> diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h >> index 4509a23..9080b6f 100644 >> --- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h >> +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h >> @@ -27,6 +27,8 @@ >> #define PRCM_BASE 0x48180000 >> #define CM_PER 0x44E00000 >> #define CM_WKUP 0x44E00400 >> +#define CM_DPLL 0x44E00500 >> +#define CM_RTC 0x44E00800 >> > > Looking at these address i strongly suspect the CM_XXX ones are wrong > for the TI81xx > family. Does this really match with the TRM? Yes, you are correct. TI814x code doesn't use these defines at all. Ill drop these. Thanks Lokesh > > Regards, > Vaibhav >
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index 05752ce..19b8469 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -237,6 +237,14 @@ struct cm_perpll { unsigned int cpswclkstctrl; /* offset 0x144 */ unsigned int lcdcclkstctrl; /* offset 0x148 */ }; + +/* Encapsulating Display pll registers */ +struct cm_dpll { + unsigned int resv1[2]; + unsigned int clktimer2clk; /* offset 0x08 */ + unsigned int resv2[10]; + unsigned int clklcdcpixelclk; /* offset 0x34 */ +}; #else /* Encapsulating core pll registers */ struct cm_wkuppll { @@ -392,15 +400,12 @@ struct cm_perpll { unsigned int resv40[7]; unsigned int cpgmac0clkctrl; /* offset 0xB20 */ }; -#endif /* CONFIG_AM43XX */ -/* Encapsulating Display pll registers */ struct cm_dpll { - unsigned int resv1[2]; - unsigned int clktimer2clk; /* offset 0x08 */ - unsigned int resv2[10]; - unsigned int clklcdcpixelclk; /* offset 0x34 */ + unsigned int resv1; + unsigned int clktimer2clk; /* offset 0x04 */ }; +#endif /* CONFIG_AM43XX */ /* Control Module RTC registers */ struct cm_rtc { diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h index ee5fce0..dd950e5 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware.h +++ b/arch/arm/include/asm/arch-am33xx/hardware.h @@ -48,13 +48,6 @@ #define EMIF4_0_CFG_BASE 0x4C000000 #define EMIF4_1_CFG_BASE 0x4D000000 -/* PLL related registers */ -#define CM_DPLL 0x44E00500 -#define CM_DEVICE 0x44E00700 -#define CM_RTC 0x44E00800 -#define CM_CEFUSE 0x44E00A00 -#define PRM_DEVICE 0x44E00F00 - /* DDR Base address */ #define DDR_CTRL_ADDR 0x44E10E04 #define DDR_CONTROL_BASE_ADDR 0x44E11404 diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h index e4231c8..c67a080 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h @@ -30,6 +30,8 @@ #define PRCM_BASE 0x44E00000 #define CM_PER 0x44E00000 #define CM_WKUP 0x44E00400 +#define CM_DPLL 0x44E00500 +#define CM_RTC 0x44E00800 #define PRM_RSTCTRL (PRCM_BASE + 0x0F00) #define PRM_RSTST (PRM_RSTCTRL + 8) diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index 3b665e6..64f9c99 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -30,6 +30,8 @@ #define PRCM_BASE 0x44DF0000 #define CM_WKUP 0x44DF2800 #define CM_PER 0x44DF8800 +#define CM_DPLL 0x44DF4200 +#define CM_RTC 0x44df8500 #define PRM_RSTCTRL (PRCM_BASE + 0x4000) #define PRM_RSTST (PRM_RSTCTRL + 4) diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h index 4509a23..9080b6f 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h @@ -27,6 +27,8 @@ #define PRCM_BASE 0x48180000 #define CM_PER 0x44E00000 #define CM_WKUP 0x44E00400 +#define CM_DPLL 0x44E00500 +#define CM_RTC 0x44E00800 #define PRM_RSTCTRL (PRCM_BASE + 0x00A0) #define PRM_RSTST (PRM_RSTCTRL + 8) diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h index 3c68064..0f6a016 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h @@ -34,6 +34,8 @@ /* PRCM Base Address */ #define PRCM_BASE 0x48180000 +#define CM_DPLL 0x44E00500 +#define CM_RTC 0x44E00800 #define PRM_RSTCTRL (PRCM_BASE + 0x00A0) #define PRM_RSTST (PRM_RSTCTRL + 8)
PRCM, timer base addresses and offsets are different from AM33xx. Updating the same. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/include/asm/arch-am33xx/cpu.h | 17 +++++++++++------ arch/arm/include/asm/arch-am33xx/hardware.h | 7 ------- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 2 ++ arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 2 ++ arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 2 ++ arch/arm/include/asm/arch-am33xx/hardware_ti816x.h | 2 ++ 6 files changed, 19 insertions(+), 13 deletions(-)