[x-loader][PATCH] OMAP4: Select DPLL PER Clock as source for SGX FCLK

[Sebastien Jan]

This is a port of original patch from Rajeev Kulkarni <raj...@ti.com>:

The correct frequency for SGX is 307.2 Mhz. If DPLL_PER
is set 1536 Mhz, There is no need to change dividers, just
parent clock need to change. And DPLL PER is set at 1536.

Signed-off-by: Rajeev Kulkarni <raj...@ti.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo...@canonical.com>
Signed-off-by: Sebastien Jan <s-...@ti.com>
---
board/omap4430panda/clock.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c
index 4ccceca..27f7d92 100644
--- a/board/omap4430panda/clock.c
+++ b/board/omap4430panda/clock.c
@@ -715,6 +715,8 @@ static void enable_all_clocks(void)
/* Enable SGX clocks */
sr32(CM_SGX_CLKSTCTRL, 0, 32, 0x2);
sr32(CM_SGX_SGX_CLKCTRL, 0, 32, 0x2);
+ /* Select DPLL PER CLOCK as source for SGX FCLK */
+ sr32(CM_SGX_SGX_CLKCTRL, 24, 1, 0x1);
/* Check for SGX FCLK and ICLK */
while (__raw_readl(0x4A009200) != 0x302)
;
--
1.7.1

[Sebastien Jan]

With the introduction of the following patch:
97bb3ce xloader: Panda - fix ROM OTG boot path
prcm_init() is called earlier, but before scale_vcores().

This breaks when CONFIG_MPU_1000 is activated, so ensure that scale_vcores
is called before prcm_init().

Signed-off-by: Sebastien Jan <s-...@ti.com>
---

board/omap4430panda/omap4430panda.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/omap4430panda/omap4430panda.c b/board/omap4430panda/omap4430panda.c
index 9f16e56..962820b 100644
--- a/board/omap4430panda/omap4430panda.c
+++ b/board/omap4430panda/omap4430panda.c
@@ -689,6 +689,11 @@ void s_init(void)
* this is required to survive the muxconf in the case the ROM
* started up USB OTG
*/
+/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
+#if defined(CONFIG_MPU_600) || defined(CONFIG_MPU_1000)
+ scale_vcores();
+#endif
+
prcm_init();

set_muxconf_regs();
@@ -703,11 +708,6 @@ void s_init(void)

ddr_init();

-/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
-#if defined(CONFIG_MPU_600) || defined(CONFIG_MPU_1000)
- scale_vcores();
-#endif
-
if (rev == OMAP4430_ES1_0)
return;

--
1.7.1

[Sebastien Jan]

Signed-off-by: Sebastien Jan <s-...@ti.com>
---

include/configs/omap4430panda.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/omap4430panda.h b/include/configs/omap4430panda.h
index 74e2f42..0a95f39 100644
--- a/include/configs/omap4430panda.h
+++ b/include/configs/omap4430panda.h
@@ -44,7 +44,7 @@
* On Phoenix board vlotage needs to be bumped up
* before scaling the MPU up
*/
-#define CONFIG_MPU_600 1
+#define CONFIG_MPU_1000 1
#define CORE_190MHZ 1
/* Enable the below macro if MMC boot support is required */
#define CONFIG_MMC 1
--
1.7.1

[Menon, Nishanth]

On Wed, Mar 23, 2011 at 22:09, Sebastien Jan <s-...@ti.com> wrote:
>
> This is a port of original patch from Rajeev Kulkarni <raj...@ti.com>:

replace with:
From: Rajeev Kulkarni <raj...@ti.com>

Regards,
Nishanth Menon

> --
> --
> To unsubscribe from this group, email: x-loader+u...@googlegroups.com
> For more options: http://groups.google.com/group/x-loader?hl=en?hl=en
> Home Page: http://gitorious.org/x-loader

[Anand Gadiyar]

> With the introduction of the following patch:
> 97bb3ce xloader: Panda - fix ROM OTG boot path
> prcm_init() is called earlier, but before scale_vcores().
>
> This breaks when CONFIG_MPU_1000 is activated, so ensure that scale_vcores
> is called before prcm_init().
>
> Signed-off-by: Sebastien Jan <s-...@ti.com>

Applied, this and the next one as well. Thanks!