diff mbox

[U-Boot] Efika: Configure additional regulators for HDMI output

Message ID 1317212397-19638-1-git-send-email-marek.vasut@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Marek Vasut Sept. 28, 2011, 12:19 p.m. UTC
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 board/efikamx/efikamx.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

Comments

Stefano Babic Nov. 17, 2011, 8:19 a.m. UTC | #1
On 09/28/2011 02:19 PM, Marek Vasut wrote:
> Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
> Cc: Stefano Babic<sbabic@denx.de>
> ---
>   board/efikamx/efikamx.c |   16 +++++++++++-----
>   1 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
> index 29fff72..276753c 100644
> --- a/board/efikamx/efikamx.c
> +++ b/board/efikamx/efikamx.c
> @@ -222,7 +222,7 @@ static void power_init(void)
>

Hi Marek,

sorry, I missed this patch - I rebased myself on the actual u-boot-imx, 
and I applied it. Can you take a look at it to check if it is still ok ?

Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Marek Vasut Nov. 17, 2011, 6:05 p.m. UTC | #2
> On 09/28/2011 02:19 PM, Marek Vasut wrote:
> > Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
> > Cc: Stefano Babic<sbabic@denx.de>
> > ---
> > 
> >   board/efikamx/efikamx.c |   16 +++++++++++-----
> >   1 files changed, 11 insertions(+), 5 deletions(-)
> > 
> > diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
> > index 29fff72..276753c 100644
> > --- a/board/efikamx/efikamx.c
> > +++ b/board/efikamx/efikamx.c
> > @@ -222,7 +222,7 @@ static void power_init(void)
> 
> Hi Marek,
> 
> sorry, I missed this patch - I rebased myself on the actual u-boot-imx,
> and I applied it. Can you take a look at it to check if it is still ok ?
> 
> Applied to u-boot-imx, thanks.
> Best regards,
> Stefano Babic

Jana, you have efikamx and I can get you HDMI cable. Can you recheck tomorrow ?

M
Jana Rapava Nov. 17, 2011, 6:19 p.m. UTC | #3
2011/11/17 Marek Vasut <marek.vasut@gmail.com>

>
> Jana, you have efikamx and I can get you HDMI cable. Can you recheck
> tomorrow ?
>
> M
>

Ok, I can.
Marek Vasut Nov. 19, 2011, 9:16 p.m. UTC | #4
> 2011/11/17 Marek Vasut <marek.vasut@gmail.com>
> 
> > Jana, you have efikamx and I can get you HDMI cable. Can you recheck
> > tomorrow ?
> > 
> > M
> 
> Ok, I can.

So any updates?
Jana Rapava Nov. 20, 2011, 5:54 p.m. UTC | #5
2011/11/19 Marek Vasut <marek.vasut@gmail.com>

> > 2011/11/17 Marek Vasut <marek.vasut@gmail.com>
> >
> > > Jana, you have efikamx and I can get you HDMI cable. Can you recheck
> > > tomorrow ?
> > >
> > > M
> >
> > Ok, I can.
>
> So any updates?
>

 HDMI output doesn't work with current u-boot-imx tree (no LCD output after
'setenv stdout lcd'),
but works with current u-boot-marex/efikasb tree.

Regards,
Jana Rapava
Marek Vasut Nov. 20, 2011, 6:51 p.m. UTC | #6
> 2011/11/19 Marek Vasut <marek.vasut@gmail.com>
> 
> > > 2011/11/17 Marek Vasut <marek.vasut@gmail.com>
> > > 
> > > > Jana, you have efikamx and I can get you HDMI cable. Can you recheck
> > > > tomorrow ?
> > > > 
> > > > M
> > > 
> > > Ok, I can.
> > 
> > So any updates?
> 
>  HDMI output doesn't work with current u-boot-imx tree (no LCD output after
> 'setenv stdout lcd'),
> but works with current u-boot-marex/efikasb tree.
> 
> Regards,
> Jana Rapava

Ok, so are you debugging it or not ?
Jana Rapava Nov. 20, 2011, 9:54 p.m. UTC | #7
2011/11/20 Marek Vasut <marek.vasut@gmail.com>

>
> >  HDMI output doesn't work with current u-boot-imx tree (no LCD output
> after
> > 'setenv stdout lcd'),
> > but works with current u-boot-marex/efikasb tree.
> >
>
> Ok, so are you debugging it or not ?
>

No, I thought that if it works with u-boot-marex/efikasb, it's only a
question of
getting some more patches into u-boot-imx.
Marek Vasut Nov. 21, 2011, 6:11 a.m. UTC | #8
> 2011/11/20 Marek Vasut <marek.vasut@gmail.com>
> 
> > >  HDMI output doesn't work with current u-boot-imx tree (no LCD output
> > 
> > after
> > 
> > > 'setenv stdout lcd'),
> > > but works with current u-boot-marex/efikasb tree.
> > 
> > Ok, so are you debugging it or not ?
> 
> No, I thought that if it works with u-boot-marex/efikasb, it's only a
> question of
> getting some more patches into u-boot-imx.

Ok, I'll debug it myself later this week.
Marek Vasut Nov. 21, 2011, 6:16 a.m. UTC | #9
> 2011/11/20 Marek Vasut <marek.vasut@gmail.com>
> 
> > >  HDMI output doesn't work with current u-boot-imx tree (no LCD output
> > 
> > after
> > 
> > > 'setenv stdout lcd'),
> > > but works with current u-boot-marex/efikasb tree.
> > 
> > Ok, so are you debugging it or not ?
> 
> No, I thought that if it works with u-boot-marex/efikasb, it's only a
> question of
> getting some more patches into u-boot-imx.

Ah ok, nevermind, it seems it can't work yet -- I'll have to recheck.

M
Stefano Babic Nov. 21, 2011, 10:44 a.m. UTC | #10
On 21/11/2011 07:16, Marek Vasut wrote:
>> 2011/11/20 Marek Vasut <marek.vasut@gmail.com>
>>
>>>>  HDMI output doesn't work with current u-boot-imx tree (no LCD output
>>>
>>> after
>>>
>>>> 'setenv stdout lcd'),
>>>> but works with current u-boot-marex/efikasb tree.
>>>
>>> Ok, so are you debugging it or not ?
>>
>> No, I thought that if it works with u-boot-marex/efikasb, it's only a
>> question of
>> getting some more patches into u-boot-imx.
> 
> Ah ok, nevermind, it seems it can't work yet -- I'll have to recheck.
> 

Ok - then I'll drop the patch from u-boot-imx, because it is not working
(or it is not enough)

Best regards,
Stefano Babic
Marek Vasut Nov. 21, 2011, 11:03 a.m. UTC | #11
> On 21/11/2011 07:16, Marek Vasut wrote:
> >> 2011/11/20 Marek Vasut <marek.vasut@gmail.com>
> >> 
> >>>>  HDMI output doesn't work with current u-boot-imx tree (no LCD output
> >>> 
> >>> after
> >>> 
> >>>> 'setenv stdout lcd'),
> >>>> but works with current u-boot-marex/efikasb tree.
> >>> 
> >>> Ok, so are you debugging it or not ?
> >> 
> >> No, I thought that if it works with u-boot-marex/efikasb, it's only a
> >> question of
> >> getting some more patches into u-boot-imx.
> > 
> > Ah ok, nevermind, it seems it can't work yet -- I'll have to recheck.
> 
> Ok - then I'll drop the patch from u-boot-imx, because it is not working
> (or it is not enough)

No, you don't understand. This patch is important, leave it there!

The code which registers the ipuv3 is still missing, that's the point.

M
Stefano Babic Nov. 21, 2011, 11:14 a.m. UTC | #12
On 21/11/2011 12:03, Marek Vasut wrote:

>>
>> Ok - then I'll drop the patch from u-boot-imx, because it is not working
>> (or it is not enough)
> 
> No, you don't understand. This patch is important, leave it there!

Ok, the patch does not hurt at all....

> 
> The code which registers the ipuv3 is still missing, that's the point.

...no surprise it does not work...

Stefano
diff mbox

Patch

diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index 29fff72..276753c 100644
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -222,7 +222,7 @@  static void power_init(void)
 
 	/* Set core voltage to 1.1V */
 	val = pmic_reg_read(REG_SW_0);
-	val = (val & ~SWx_VOLT_MASK) | SWx_1_100V;
+	val = (val & ~SWx_VOLT_MASK) | SWx_1_200V;
 	pmic_reg_write(REG_SW_0, val);
 
 	/* Setup VCC (SW2) to 1.25 */
@@ -256,18 +256,24 @@  static void power_init(void)
 		(SWMODE_AUTO_AUTO << SWMODE4_SHIFT);
 	pmic_reg_write(REG_SW_5, val);
 
-	/* Set VDIG to 1.65V, VGEN3 to 1.8V, VCAM to 2.6V */
+	/* Set VDIG to 1.8V, VGEN3 to 1.8V, VCAM to 2.6V */
 	val = pmic_reg_read(REG_SETTING_0);
 	val &= ~(VCAM_MASK | VGEN3_MASK | VDIG_MASK);
-	val |= VDIG_1_65 | VGEN3_1_8 | VCAM_2_6;
+	val |= VDIG_1_8 | VGEN3_1_8 | VCAM_2_6;
 	pmic_reg_write(REG_SETTING_0, val);
 
+
 	/* Set VVIDEO to 2.775V, VAUDIO to 3V, VSD to 3.15V */
 	val = pmic_reg_read(REG_SETTING_1);
 	val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
-	val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775;
+	val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775 | VGEN1_1_2 | VGEN2_3_15;
 	pmic_reg_write(REG_SETTING_1, val);
 
+	/* Enable VGEN1, VGEN2, VDIG, VPLL */
+	val = pmic_reg_read(REG_MODE_0);
+	val |= VGEN1EN | VDIGEN | VGEN2EN | VPLLEN;
+	pmic_reg_write(REG_MODE_0, val);
+
 	/* Configure VGEN3 and VCAM regulators to use external PNP */
 	val = VGEN3CONFIG | VCAMCONFIG;
 	pmic_reg_write(REG_MODE_1, val);
@@ -275,7 +281,7 @@  static void power_init(void)
 
 	/* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
 	val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
-		VVIDEOEN | VAUDIOEN  | VSDEN;
+		VVIDEOEN | VAUDIOEN | VSDEN;
 	pmic_reg_write(REG_MODE_1, val);
 
 	val = pmic_reg_read(REG_POWER_CTL2);