* [U-Boot] Disabling video in bootm (cleanup_before_linux) @ 2012-09-21 16:38 Eric Nelson 2012-09-21 17:22 ` Anatolij Gustschin 0 siblings, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-21 16:38 UTC (permalink / raw) To: u-boot Hi all, While looking into some trouble booting the latest Linux kernel patches for i.MX6 display support, I found that the kernel driver was thrown off by the interrupt status bits in the i.MX6 IPU. Until and unless we have the ability to hand off a 'live' display, it seems that we should disable the video driver as a part of the 'bootm' process. At the very least, doing this will avoid the possibility of trash on the display during the transition. I've been looking, and I don't see a place to tap into this process. It seems that having a shutdown routine for the display drivers (cfb_console?) is the way to go. Anybody know if I'm overlooking something? Please advise, Eric ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Disabling video in bootm (cleanup_before_linux) 2012-09-21 16:38 [U-Boot] Disabling video in bootm (cleanup_before_linux) Eric Nelson @ 2012-09-21 17:22 ` Anatolij Gustschin 2012-09-21 17:44 ` Eric Nelson 2012-09-21 20:36 ` [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S Eric Nelson 0 siblings, 2 replies; 33+ messages in thread From: Anatolij Gustschin @ 2012-09-21 17:22 UTC (permalink / raw) To: u-boot Hi Eric, On Fri, 21 Sep 2012 09:38:23 -0700 Eric Nelson <eric.nelson@boundarydevices.com> wrote: > Hi all, > > While looking into some trouble booting the latest Linux kernel patches > for i.MX6 display support, I found that the kernel driver was thrown off by > the interrupt status bits in the i.MX6 IPU. > > Until and unless we have the ability to hand off a 'live' display, it seems > that we should disable the video driver as a part of the 'bootm' process. > > At the very least, doing this will avoid the possibility of trash on the > display during the transition. > > I've been looking, and I don't see a place to tap into this process. > It seems that having a shutdown routine for the display drivers > (cfb_console?) is the way to go. cfb_console driver is a renderer of the characters and bitmaps to the framebuffer memory and is not a good place for a shutdown routine, I think. But we can add a shutdown function to the IPU driver drivers/video/mxc_ipuv3_fb.c and call it before booting. bootm code in common/cmd_bootm.c has a weak arch_preboot_os() function that can be overridden by platform specific preboot routine. We could define a preboot function in arch/arm/cpu/armv7/mx6/soc.c or in arch/arm/cpu/armv7/imx-common/cpu.c and call IPU shutdown routine in it. Thanks, Anatolij ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Disabling video in bootm (cleanup_before_linux) 2012-09-21 17:22 ` Anatolij Gustschin @ 2012-09-21 17:44 ` Eric Nelson 2012-09-22 13:35 ` Otavio Salvador 2012-09-21 20:36 ` [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S Eric Nelson 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-21 17:44 UTC (permalink / raw) To: u-boot On 09/21/2012 10:22 AM, Anatolij Gustschin wrote: > Hi Eric, > > On Fri, 21 Sep 2012 09:38:23 -0700 > Eric Nelson<eric.nelson@boundarydevices.com> wrote: > >> Hi all, >> >> While looking into some trouble booting the latest Linux kernel patches >> for i.MX6 display support, I found that the kernel driver was thrown off by >> the interrupt status bits in the i.MX6 IPU. >> >> Until and unless we have the ability to hand off a 'live' display, it seems >> that we should disable the video driver as a part of the 'bootm' process. >> >> At the very least, doing this will avoid the possibility of trash on the >> display during the transition. >> >> I've been looking, and I don't see a place to tap into this process. >> It seems that having a shutdown routine for the display drivers >> (cfb_console?) is the way to go. > > cfb_console driver is a renderer of the characters and bitmaps > to the framebuffer memory and is not a good place for a shutdown > routine, I think. But we can add a shutdown function to the IPU > driver drivers/video/mxc_ipuv3_fb.c and call it before booting. > bootm code in common/cmd_bootm.c has a weak arch_preboot_os() > function that can be overridden by platform specific preboot > routine. We could define a preboot function in > > arch/arm/cpu/armv7/mx6/soc.c > or in > arch/arm/cpu/armv7/imx-common/cpu.c > > and call IPU shutdown routine in it. > Thanks Anatolij. This is just what we need. I'll send a patch shortly. ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Disabling video in bootm (cleanup_before_linux) 2012-09-21 17:44 ` Eric Nelson @ 2012-09-22 13:35 ` Otavio Salvador 2012-09-22 15:35 ` Eric Nelson 0 siblings, 1 reply; 33+ messages in thread From: Otavio Salvador @ 2012-09-22 13:35 UTC (permalink / raw) To: u-boot On Fri, Sep 21, 2012 at 2:44 PM, Eric Nelson <eric.nelson@boundarydevices.com> wrote: > On 09/21/2012 10:22 AM, Anatolij Gustschin wrote: >> >> Hi Eric, >> >> On Fri, 21 Sep 2012 09:38:23 -0700 >> Eric Nelson<eric.nelson@boundarydevices.com> wrote: >> >>> Hi all, >>> >>> While looking into some trouble booting the latest Linux kernel patches >>> for i.MX6 display support, I found that the kernel driver was thrown off >>> by >>> the interrupt status bits in the i.MX6 IPU. >>> >>> Until and unless we have the ability to hand off a 'live' display, it >>> seems >>> that we should disable the video driver as a part of the 'bootm' process. >>> >>> At the very least, doing this will avoid the possibility of trash on the >>> display during the transition. >>> >>> I've been looking, and I don't see a place to tap into this process. >>> It seems that having a shutdown routine for the display drivers >>> (cfb_console?) is the way to go. >> >> >> cfb_console driver is a renderer of the characters and bitmaps >> to the framebuffer memory and is not a good place for a shutdown >> routine, I think. But we can add a shutdown function to the IPU >> driver drivers/video/mxc_ipuv3_fb.c and call it before booting. >> bootm code in common/cmd_bootm.c has a weak arch_preboot_os() >> function that can be overridden by platform specific preboot >> routine. We could define a preboot function in >> >> arch/arm/cpu/armv7/mx6/soc.c >> or in >> arch/arm/cpu/armv7/imx-common/cpu.c >> >> and call IPU shutdown routine in it. >> > > Thanks Anatolij. > > This is just what we need. I'll send a patch shortly. It would be nice to try to add support for mx5 too so we fix same boot hungs in mx5 kernels. I am adding Fabio in CC as he knows more about it. -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Disabling video in bootm (cleanup_before_linux) 2012-09-22 13:35 ` Otavio Salvador @ 2012-09-22 15:35 ` Eric Nelson 2012-09-22 15:37 ` Otavio Salvador 0 siblings, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-22 15:35 UTC (permalink / raw) To: u-boot On 09/22/2012 06:35 AM, Otavio Salvador wrote: > On Fri, Sep 21, 2012 at 2:44 PM, Eric Nelson > <eric.nelson@boundarydevices.com> wrote: >> On 09/21/2012 10:22 AM, Anatolij Gustschin wrote: >>> >>> Hi Eric, >>> >>> On Fri, 21 Sep 2012 09:38:23 -0700 >>> Eric Nelson<eric.nelson@boundarydevices.com> wrote: >>> >>>> Hi all, >>>> >>>> While looking into some trouble booting the latest Linux kernel patches >>>> for i.MX6 display support, I found that the kernel driver was thrown off >>>> by >>>> the interrupt status bits in the i.MX6 IPU. >>>> >>>> Until and unless we have the ability to hand off a 'live' display, it >>>> seems >>>> that we should disable the video driver as a part of the 'bootm' process. >>>> >>>> At the very least, doing this will avoid the possibility of trash on the >>>> display during the transition. >>>> >>>> I've been looking, and I don't see a place to tap into this process. >>>> It seems that having a shutdown routine for the display drivers >>>> (cfb_console?) is the way to go. >>> >>> >>> cfb_console driver is a renderer of the characters and bitmaps >>> to the framebuffer memory and is not a good place for a shutdown >>> routine, I think. But we can add a shutdown function to the IPU >>> driver drivers/video/mxc_ipuv3_fb.c and call it before booting. >>> bootm code in common/cmd_bootm.c has a weak arch_preboot_os() >>> function that can be overridden by platform specific preboot >>> routine. We could define a preboot function in >>> >>> arch/arm/cpu/armv7/mx6/soc.c >>> or in >>> arch/arm/cpu/armv7/imx-common/cpu.c >>> >>> and call IPU shutdown routine in it. >>> >> >> Thanks Anatolij. >> >> This is just what we need. I'll send a patch shortly. > > It would be nice to try to add support for mx5 too so we fix same boot > hungs in mx5 kernels. I am adding Fabio in CC as he knows more about > it. > Hi Otavio, I believe it will work on MX5 boards as well, though I haven't tested. http://patchwork.ozlabs.org/patch/185928/ Regards, Eric ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Disabling video in bootm (cleanup_before_linux) 2012-09-22 15:35 ` Eric Nelson @ 2012-09-22 15:37 ` Otavio Salvador 0 siblings, 0 replies; 33+ messages in thread From: Otavio Salvador @ 2012-09-22 15:37 UTC (permalink / raw) To: u-boot On Sat, Sep 22, 2012 at 12:35 PM, Eric Nelson <eric.nelson@boundarydevices.com> wrote: > On 09/22/2012 06:35 AM, Otavio Salvador wrote: >> >> On Fri, Sep 21, 2012 at 2:44 PM, Eric Nelson >> <eric.nelson@boundarydevices.com> wrote: >>> >>> On 09/21/2012 10:22 AM, Anatolij Gustschin wrote: >>>> >>>> >>>> Hi Eric, >>>> >>>> On Fri, 21 Sep 2012 09:38:23 -0700 >>>> Eric Nelson<eric.nelson@boundarydevices.com> wrote: >>>> >>>>> Hi all, >>>>> >>>>> While looking into some trouble booting the latest Linux kernel patches >>>>> for i.MX6 display support, I found that the kernel driver was thrown >>>>> off >>>>> by >>>>> the interrupt status bits in the i.MX6 IPU. >>>>> >>>>> Until and unless we have the ability to hand off a 'live' display, it >>>>> seems >>>>> that we should disable the video driver as a part of the 'bootm' >>>>> process. >>>>> >>>>> At the very least, doing this will avoid the possibility of trash on >>>>> the >>>>> display during the transition. >>>>> >>>>> I've been looking, and I don't see a place to tap into this process. >>>>> It seems that having a shutdown routine for the display drivers >>>>> (cfb_console?) is the way to go. >>>> >>>> >>>> >>>> cfb_console driver is a renderer of the characters and bitmaps >>>> to the framebuffer memory and is not a good place for a shutdown >>>> routine, I think. But we can add a shutdown function to the IPU >>>> driver drivers/video/mxc_ipuv3_fb.c and call it before booting. >>>> bootm code in common/cmd_bootm.c has a weak arch_preboot_os() >>>> function that can be overridden by platform specific preboot >>>> routine. We could define a preboot function in >>>> >>>> arch/arm/cpu/armv7/mx6/soc.c >>>> or in >>>> arch/arm/cpu/armv7/imx-common/cpu.c >>>> >>>> and call IPU shutdown routine in it. >>>> >>> >>> Thanks Anatolij. >>> >>> This is just what we need. I'll send a patch shortly. >> >> >> It would be nice to try to add support for mx5 too so we fix same boot >> hungs in mx5 kernels. I am adding Fabio in CC as he knows more about >> it. >> > > Hi Otavio, > > I believe it will work on MX5 boards as well, though I haven't tested. > http://patchwork.ozlabs.org/patch/185928/ Yes; Fabio tested it and it proved to work. -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S 2012-09-21 17:22 ` Anatolij Gustschin 2012-09-21 17:44 ` Eric Nelson @ 2012-09-21 20:36 ` Eric Nelson 2012-09-21 20:36 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Eric Nelson 2012-09-21 20:36 ` [U-Boot] [PATCH " Eric Nelson 1 sibling, 2 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-21 20:36 UTC (permalink / raw) To: u-boot This series implements a shut-down routine for the IPU Frame Buffer and calls it through arch_preboot_os() so the display won't be trashed during the transition. ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-21 20:36 ` [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S Eric Nelson @ 2012-09-21 20:36 ` Eric Nelson 2012-09-22 13:42 ` Otavio Salvador 2012-09-21 20:36 ` [U-Boot] [PATCH " Eric Nelson 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-21 20:36 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- drivers/video/mxc_ipuv3_fb.c | 20 ++++++++++++++++++++ include/ipu_pixfmt.h | 1 + 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index c38e22d..47b336e 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -38,6 +38,7 @@ #include "videomodes.h" #include "ipu.h" #include "mxcfb.h" +#include "ipu_regs.h" static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi); @@ -576,6 +577,25 @@ err0: return ret; } +void ipuv3_fb_shutdown(void) +{ + int i; + struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT; + + for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) { + struct fb_info *fbi = mxcfb_info[i]; + if (fbi) { + struct mxcfb_info *mxc_fbi = fbi->par; + ipu_disable_channel(mxc_fbi->ipu_ch); + ipu_uninit_channel(mxc_fbi->ipu_ch); + } + } + for (i = 0; i < ARRAY_SIZE(stat->int_stat); i++) { + __raw_writel(__raw_readl(&stat->int_stat[i]), + &stat->int_stat[i]); + } +} + void *video_hw_init(void) { int ret; diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h index 0019898..4baa711 100644 --- a/include/ipu_pixfmt.h +++ b/include/ipu_pixfmt.h @@ -77,5 +77,6 @@ #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*< 16 YUV 4:2:2 */ int ipuv3_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt); +void ipuv3_fb_shutdown(void); #endif -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-21 20:36 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Eric Nelson @ 2012-09-22 13:42 ` Otavio Salvador 2012-09-22 14:37 ` Fabio Estevam 0 siblings, 1 reply; 33+ messages in thread From: Otavio Salvador @ 2012-09-22 13:42 UTC (permalink / raw) To: u-boot Hello Eric, On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson <eric.nelson@boundarydevices.com> wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Did you test it in mx5 too? We seem to need to handle it in mx5 too as we had hungs in FSL kernel when using framebuffer in U-Boot. We're using a patch in kernel for workaround it but it seems your fix does what is need. Fabio did the workaround patch and knows the details. Added him in CC. -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-22 13:42 ` Otavio Salvador @ 2012-09-22 14:37 ` Fabio Estevam 2012-09-22 14:39 ` Otavio Salvador 2012-09-23 15:56 ` Stefano Babic 0 siblings, 2 replies; 33+ messages in thread From: Fabio Estevam @ 2012-09-22 14:37 UTC (permalink / raw) To: u-boot On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: > Hello Eric, > > On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson > <eric.nelson@boundarydevices.com> wrote: >> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > > Did you test it in mx5 too? We seem to need to handle it in mx5 too as > we had hungs in FSL kernel when using framebuffer in U-Boot. We're > using a patch in kernel for workaround it but it seems your fix does > what is need. I have just tested Eric's series on a mx53loco and it does fix the kernel hang issue. I made some comments on this series and hopefully Eric's v2 can get into 2012.10, since this is a bug fix. Regards, Fabio Estevam ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-22 14:37 ` Fabio Estevam @ 2012-09-22 14:39 ` Otavio Salvador 2012-09-23 15:56 ` Stefano Babic 1 sibling, 0 replies; 33+ messages in thread From: Otavio Salvador @ 2012-09-22 14:39 UTC (permalink / raw) To: u-boot On Sat, Sep 22, 2012 at 11:37 AM, Fabio Estevam <festevam@gmail.com> wrote: > On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador > <otavio@ossystems.com.br> wrote: >> Hello Eric, >> >> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >> <eric.nelson@boundarydevices.com> wrote: >>> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> >> >> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >> using a patch in kernel for workaround it but it seems your fix does >> what is need. > > I have just tested Eric's series on a mx53loco and it does fix the > kernel hang issue. > > I made some comments on this series and hopefully Eric's v2 can get > into 2012.10, since this is a bug fix. Neat. :-) -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-22 14:37 ` Fabio Estevam 2012-09-22 14:39 ` Otavio Salvador @ 2012-09-23 15:56 ` Stefano Babic 2012-09-23 16:32 ` Dirk Behme 2012-09-23 16:46 ` Eric Nelson 1 sibling, 2 replies; 33+ messages in thread From: Stefano Babic @ 2012-09-23 15:56 UTC (permalink / raw) To: u-boot On 22/09/2012 16:37, Fabio Estevam wrote: > On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador > <otavio@ossystems.com.br> wrote: >> Hello Eric, >> >> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >> <eric.nelson@boundarydevices.com> wrote: >>> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> >> >> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >> using a patch in kernel for workaround it but it seems your fix does >> what is need. > > I have just tested Eric's series on a mx53loco and it does fix the > kernel hang issue. > > I made some comments on this series and hopefully Eric's v2 can get > into 2012.10, since this is a bug fix. Ok, I am waiting for V2 and I will push it. Anyway, a question about the issue. It seems to me that it is not possible with IPUV3 (I have not tested myself, so my question) to get the u-boot splashscreen displayed on the LCD until the kernel has finished to boot. This could be possible (and it is possible on other SOC) if the IPU is loaded as module instead of statically linked to the kernel, and if the kernel does not touch the IPU setup. This means also that it should not disable the clocks used by U-Boot for the IPU. But I understand from your patch that this way is not possible on iMX53/MX6, and IPU must be always disabled. Is this correct ? Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-23 15:56 ` Stefano Babic @ 2012-09-23 16:32 ` Dirk Behme 2012-09-23 16:46 ` Eric Nelson 1 sibling, 0 replies; 33+ messages in thread From: Dirk Behme @ 2012-09-23 16:32 UTC (permalink / raw) To: u-boot On 23.09.2012 17:56, Stefano Babic wrote: > On 22/09/2012 16:37, Fabio Estevam wrote: >> On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador >> <otavio@ossystems.com.br> wrote: >>> Hello Eric, >>> >>> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >>> <eric.nelson@boundarydevices.com> wrote: >>>> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >>> >>> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >>> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >>> using a patch in kernel for workaround it but it seems your fix does >>> what is need. >> >> I have just tested Eric's series on a mx53loco and it does fix the >> kernel hang issue. >> >> I made some comments on this series and hopefully Eric's v2 can get >> into 2012.10, since this is a bug fix. > > Ok, I am waiting for V2 and I will push it. > > Anyway, a question about the issue. It seems to me that it is not > possible with IPUV3 (I have not tested myself, so my question) to get > the u-boot splashscreen displayed on the LCD until the kernel has > finished to boot. This could be possible (and it is possible on other > SOC) if the IPU is loaded as module instead of statically linked to the > kernel, and if the kernel does not touch the IPU setup. This means also > that it should not disable the clocks used by U-Boot for the IPU. > > But I understand from your patch that this way is not possible on > iMX53/MX6, and IPU must be always disabled. Is this correct ? I'm no expert on this, so I might be wrong and people will correct me: No, not always. It's my understanding that at the *moment* we have to disable the IPU in U-Boot before jumping into the kernel due to a bug in Sascha's kernel IPU driver: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/121980.html http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/122100.html So from my understanding, this isn't a SOC limitation. But we have to do it as long as the kernel's IPU driver isn't fixed. Sorry if this is wrong ;) Best regards Dirk ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-23 15:56 ` Stefano Babic 2012-09-23 16:32 ` Dirk Behme @ 2012-09-23 16:46 ` Eric Nelson 2012-09-23 16:59 ` Fabio Estevam ` (2 more replies) 1 sibling, 3 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 16:46 UTC (permalink / raw) To: u-boot Hi Stefano, On 09/23/2012 08:56 AM, Stefano Babic wrote: > On 22/09/2012 16:37, Fabio Estevam wrote: >> On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador >> <otavio@ossystems.com.br> wrote: >>> Hello Eric, >>> >>> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >>> <eric.nelson@boundarydevices.com> wrote: >>>> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >>> >>> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >>> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >>> using a patch in kernel for workaround it but it seems your fix does >>> what is need. >> >> I have just tested Eric's series on a mx53loco and it does fix the >> kernel hang issue. >> >> I made some comments on this series and hopefully Eric's v2 can get >> into 2012.10, since this is a bug fix. > > Ok, I am waiting for V2 and I will push it. > I'll forward this later today. > Anyway, a question about the issue. It seems to me that it is not > possible with IPUV3 (I have not tested myself, so my question) to get > the u-boot splashscreen displayed on the LCD until the kernel has > finished to boot. This could be possible (and it is possible on other > SOC) if the IPU is loaded as module instead of statically linked to the > kernel, and if the kernel does not touch the IPU setup. This means also > that it should not disable the clocks used by U-Boot for the IPU. > I'm not sure I understand. The splash screen comes up as soon as the call to ipuv3_fb_init() is made (in board_video_skip() in my implementation for SABRE Lite). As it stands, if we leave the IPU running, we'll see garbage on the display as the kernel re-purposes the RAM used by U-Boot's frame buffer. > But I understand from your patch that this way is not possible on > iMX53/MX6, and IPU must be always disabled. Is this correct ? > Sascha responded to a note about this on AKML that the hand-over of a live FB isn't a supported kernel use case and it's definitely tricky. I don't know about the policy, but from a practical matter, the IPU frame buffer implementation in U-Boot isn't currently up to that task, since: it only supports a single display (i.MX6 can handle 4) it only supports 16bpp Additional functionality would be helpful here. I would like to see a handoff of display settings from U-Boot to the kernel, but that's also a tricky thing as long as we're supporting different mechanisms (DT in main-line and kernel parameters in older kernels). Regards, Eric ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-23 16:46 ` Eric Nelson @ 2012-09-23 16:59 ` Fabio Estevam 2012-09-23 17:27 ` Stefano Babic 2012-09-23 17:30 ` [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting Eric Nelson 2 siblings, 0 replies; 33+ messages in thread From: Fabio Estevam @ 2012-09-23 16:59 UTC (permalink / raw) To: u-boot On Sun, Sep 23, 2012 at 1:46 PM, Eric Nelson <eric.nelson@boundarydevices.com> wrote: > As it stands, if we leave the IPU running, we'll see garbage on > the display as the kernel re-purposes the RAM used by U-Boot's > frame buffer. And on mx53qsb we get kernel hangs at about half of the boots (tested on 2.6.35 FSL kernel). So turning off the IPU in U-boot, as Eric did in this series is an important fix. Regards, Fabio Estevam ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-23 16:46 ` Eric Nelson 2012-09-23 16:59 ` Fabio Estevam @ 2012-09-23 17:27 ` Stefano Babic 2012-09-23 18:13 ` [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) Eric Nelson 2012-09-23 18:15 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Sascha Hauer 2012-09-23 17:30 ` [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting Eric Nelson 2 siblings, 2 replies; 33+ messages in thread From: Stefano Babic @ 2012-09-23 17:27 UTC (permalink / raw) To: u-boot On 23/09/2012 18:46, Eric Nelson wrote: > Hi Stefano, > > On 09/23/2012 08:56 AM, Stefano Babic wrote: >> On 22/09/2012 16:37, Fabio Estevam wrote: >>> On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador >>> <otavio@ossystems.com.br> wrote: >>>> Hello Eric, >>>> >>>> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >>>> <eric.nelson@boundarydevices.com> wrote: >>>>> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >>>> >>>> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >>>> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >>>> using a patch in kernel for workaround it but it seems your fix does >>>> what is need. >>> >>> I have just tested Eric's series on a mx53loco and it does fix the >>> kernel hang issue. >>> >>> I made some comments on this series and hopefully Eric's v2 can get >>> into 2012.10, since this is a bug fix. >> >> Ok, I am waiting for V2 and I will push it. >> > > I'll forward this later today. Ok > >> Anyway, a question about the issue. It seems to me that it is not >> possible with IPUV3 (I have not tested myself, so my question) to get >> the u-boot splashscreen displayed on the LCD until the kernel has >> finished to boot. This could be possible (and it is possible on other >> SOC) if the IPU is loaded as module instead of statically linked to the >> kernel, and if the kernel does not touch the IPU setup. This means also >> that it should not disable the clocks used by U-Boot for the IPU. >> > > I'm not sure I understand. The splash screen comes up as soon as > the call to ipuv3_fb_init() is made (in board_video_skip() in my > implementation for SABRE Lite). > > As it stands, if we leave the IPU running, we'll see garbage on > the display as the kernel re-purposes the RAM used by U-Boot's > frame buffer. Right, if the kernel reuse the same memory. I am aware that it is not implemented, I am asking if there some reason to make it impossible. Some customers want to have a picture shown on the LCD until their application is running. This makes sense, because the application can take a lot of time before displaying something on the LCD. If we reserve some memory for this scope, that is not used by the kernel later (passing the mem= parameter, for example, or using a .reserve entry in the board initialization code), we can reach the goal. In U-Boot we have a single display with 16bit, that means that the memory consumption is not very high. > >> But I understand from your patch that this way is not possible on >> iMX53/MX6, and IPU must be always disabled. Is this correct ? >> > > Sascha responded to a note about this on AKML that the hand-over of > a live FB isn't a supported kernel use case and it's definitely > tricky. And I agree with him, the handover is tricky and not easy, I mean, it can work with a SOC (it remains tricky..) but not with another one. What I am saying is not this, but what happens if the IPU is not touched until the IPU modules are loaded. > > I don't know about the policy, but from a practical matter, the > IPU frame buffer implementation in U-Boot isn't currently up to > that task, since: > it only supports a single display (i.MX6 can handle 4) > it only supports 16bpp > > Additional functionality would be helpful here. Agree with you. And this is the reason I am not supposing that the kernel takes the IPU setup made by U-Boot. It could be a nightmare. > > I would like to see a handoff of display settings from U-Boot to > the kernel, but that's also a tricky thing as long as we're supporting > different mechanisms (DT in main-line and kernel parameters in > older kernels). Yes, and a lot of other things. I know Anatolji implemented this behavior for a PPC5121, but we cannot generalize. I agree that the handoff is difficult and not maintainable. My question is different: if the IPU drivers in kernel are compiled as modules, and I will load them only after booting, and the framebuffer's memory is reserved so that the kernel does not touch it, is there still a known reason because the IPU should not run when we boot the kernel? I know this issue with USB, maybe we have now the same with the IPU. Note: this has nothing to do with this patch ;-). I will merge it into the current release when you push V2. Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) 2012-09-23 17:27 ` Stefano Babic @ 2012-09-23 18:13 ` Eric Nelson 2012-09-23 20:12 ` [U-Boot] [PATCH] i2c_probe: update for use in scripting Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson 2012-09-23 18:15 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Sascha Hauer 1 sibling, 2 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 18:13 UTC (permalink / raw) To: u-boot Hi Stefano, I changed the subject line because we've veered off-topic. On 09/23/2012 10:27 AM, Stefano Babic wrote: > On 23/09/2012 18:46, Eric Nelson wrote: >> Hi Stefano, >> >> On 09/23/2012 08:56 AM, Stefano Babic wrote: >>> On 22/09/2012 16:37, Fabio Estevam wrote: >>>> On Sat, Sep 22, 2012 at 10:42 AM, Otavio Salvador >>>> <otavio@ossystems.com.br> wrote: >>>>> Hello Eric, >>>>> >>>>> On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson >>>>> <eric.nelson@boundarydevices.com> wrote: >>>>>> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >>>>> >>>>> Did you test it in mx5 too? We seem to need to handle it in mx5 too as >>>>> we had hungs in FSL kernel when using framebuffer in U-Boot. We're >>>>> using a patch in kernel for workaround it but it seems your fix does >>>>> what is need. >>>> >>>> I have just tested Eric's series on a mx53loco and it does fix the >>>> kernel hang issue. >>>> >>>> I made some comments on this series and hopefully Eric's v2 can get >>>> into 2012.10, since this is a bug fix. >>> >>> Ok, I am waiting for V2 and I will push it. >>> >> >> I'll forward this later today. > > Ok > >> >>> Anyway, a question about the issue. It seems to me that it is not >>> possible with IPUV3 (I have not tested myself, so my question) to get >>> the u-boot splashscreen displayed on the LCD until the kernel has >>> finished to boot. This could be possible (and it is possible on other >>> SOC) if the IPU is loaded as module instead of statically linked to the >>> kernel, and if the kernel does not touch the IPU setup. This means also >>> that it should not disable the clocks used by U-Boot for the IPU. >>> >> >> I'm not sure I understand. The splash screen comes up as soon as >> the call to ipuv3_fb_init() is made (in board_video_skip() in my >> implementation for SABRE Lite). >> >> As it stands, if we leave the IPU running, we'll see garbage on >> the display as the kernel re-purposes the RAM used by U-Boot's >> frame buffer. > > Right, if the kernel reuse the same memory. I am aware that it is not > implemented, I am asking if there some reason to make it impossible. > > Some customers want to have a picture shown on the LCD until their > application is running. This makes sense, because the application can > take a lot of time before displaying something on the LCD. > > If we reserve some memory for this scope, that is not used by the kernel > later (passing the mem= parameter, for example, or using a .reserve > entry in the board initialization code), we can reach the goal. In > U-Boot we have a single display with 16bit, that means that the memory > consumption is not very high. > >> >>> But I understand from your patch that this way is not possible on >>> iMX53/MX6, and IPU must be always disabled. Is this correct ? >>> >> >> Sascha responded to a note about this on AKML that the hand-over of >> a live FB isn't a supported kernel use case and it's definitely >> tricky. > > And I agree with him, the handover is tricky and not easy, I mean, it > can work with a SOC (it remains tricky..) but not with another one. What > I am saying is not this, but what happens if the IPU is not touched > until the IPU modules are loaded. > >> >> I don't know about the policy, but from a practical matter, the >> IPU frame buffer implementation in U-Boot isn't currently up to >> that task, since: >> it only supports a single display (i.MX6 can handle 4) >> it only supports 16bpp >> >> Additional functionality would be helpful here. > > Agree with you. And this is the reason I am not supposing that the > kernel takes the IPU setup made by U-Boot. It could be a nightmare. > >> >> I would like to see a handoff of display settings from U-Boot to >> the kernel, but that's also a tricky thing as long as we're supporting >> different mechanisms (DT in main-line and kernel parameters in >> older kernels). > > Yes, and a lot of other things. I know Anatolji implemented this > behavior for a PPC5121, but we cannot generalize. I agree that the > handoff is difficult and not maintainable. My question is different: if > the IPU drivers in kernel are compiled as modules, and I will load them > only after booting, and the framebuffer's memory is reserved so that the > kernel does not touch it, is there still a known reason because the IPU > should not run when we boot the kernel? I know this issue with USB, > maybe we have now the same with the IPU. i > Note: this has nothing to do with this patch ;-). I will merge it into > the current release when you push V2. > I agree with all of your goals but have a more mundane set for U-Boot and i.MX6: -- HDMI support -- Better strategy for storing display setup. The implementation of a compiled-in list of supported displays doesn't scale. -- Hand-off of display setup to DT-enabled kernel (Sascha's drivers) -- Multiple displays -- Hand-off of display setup to older kernels My thought is to take things in more or less this order, although a couple of things can make the last one trivial to do in a boot script and it's a pain point for me. (My blog post on setting up bootargs doesn't seem to be doing the trick) My thinking is that: HDMI support can and should support EDID and flexible choice of resolution, and We'll need to store that choice somewhere, and The manner of display should be enough for the kernel to configure at least the screen resolution. Some of this really belongs in the boot loader where we're dealing with the board-specifics. It seems entirely appropriate for a board to tell the kernel that it wants: HDMI on IPU0/DI0 at 1920x1080 LVDS on IPU0/DI1 at 1024x768 using SPWG standard, and PRGB on IPU1/DI0 at 800x480 with inverted pixel clock and 18 bits of output Handing this off gracefully will help keep board-specific fixups out of the kernel and a lot of thrashing out of DT. Once we have this general display configuration and hand-off right, handing off a frame buffer address (or two or four) will likely be easier on the kernel side. I'm certainly over-simplifying, and the kernel and userspace will need more information, especially for multiple displays: who's on /dev/fb0? what bit depth is wanted? which of multiple touch screens is associated with which panel? which backlight is connected to which panel? Sorry for the long e-mail, but this gave me the a push to get some thoughts in writing. Regards, Eric ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH] i2c_probe: update for use in scripting 2012-09-23 18:13 ` [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) Eric Nelson @ 2012-09-23 20:12 ` Eric Nelson 2012-10-16 3:58 ` Heiko Schocher 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-23 20:12 UTC (permalink / raw) To: u-boot Allow the use of an I2C address to test and return success if one or more devices is found. This allows device presence to alter the flow of a script. e.g. if i2c probe 0x04 ; then echo found Hannstar touch ; fi Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- common/cmd_i2c.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 795814d..b64b975 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -557,18 +557,28 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg /* * Syntax: - * i2c probe {addr}{.0, .1, .2} + * i2c probe {addr} + * + * Returns zero (success) if one or more I2C devices was found */ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int j; + int addr = -1; + int found = 0; #if defined(CONFIG_SYS_I2C_NOPROBES) int k, skip; uchar bus = GET_BUS_NUM; #endif /* NOPROBES */ + if (argc == 2) + addr = simple_strtol(argv[1], 0, 16); + puts ("Valid chip addresses:"); for (j = 0; j < 128; j++) { + if ((0 <= addr) && (j != addr)) + continue; + #if defined(CONFIG_SYS_I2C_NOPROBES) skip = 0; for (k=0; k < NUM_ELEMENTS_NOPROBE; k++) { @@ -580,8 +590,10 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv if (skip) continue; #endif - if (i2c_probe(j) == 0) + if (i2c_probe(j) == 0) { printf(" %02X", j); + found++; + } } putc ('\n'); @@ -594,7 +606,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv putc ('\n'); #endif - return 0; + return (0 == found); } /* @@ -1331,7 +1343,7 @@ U_BOOT_CMD( "i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n" "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n" "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n" - "i2c probe - show devices on the I2C bus\n" + "i2c probe [address] - test for and show device(s) on the I2C bus\n" "i2c read chip address[.0, .1, .2] length memaddress - read to memory \n" "i2c reset - re-init the I2C Controller\n" #if defined(CONFIG_CMD_SDRAM) -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH] i2c_probe: update for use in scripting 2012-09-23 20:12 ` [U-Boot] [PATCH] i2c_probe: update for use in scripting Eric Nelson @ 2012-10-16 3:58 ` Heiko Schocher 0 siblings, 0 replies; 33+ messages in thread From: Heiko Schocher @ 2012-10-16 3:58 UTC (permalink / raw) To: u-boot Hello Eric Nelson, On 23.09.2012 22:12, Eric Nelson wrote: > Allow the use of an I2C address to test and return success > if one or more devices is found. > > This allows device presence to alter the flow of a script. > e.g. > if i2c probe 0x04 ; then > echo found Hannstar touch ; > fi > > Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> > --- > common/cmd_i2c.c | 20 ++++++++++++++++---- > 1 files changed, 16 insertions(+), 4 deletions(-) Applied to u-boot-i2c master Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command 2012-09-23 18:13 ` [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) Eric Nelson 2012-09-23 20:12 ` [U-Boot] [PATCH] i2c_probe: update for use in scripting Eric Nelson @ 2012-09-23 23:02 ` Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 1/3] i.MX6: add HDMI transmitter register declarations from kernel WIP Eric Nelson ` (3 more replies) 1 sibling, 4 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 23:02 UTC (permalink / raw) To: u-boot This series implements an HDMI detection command for i.MX6 boards and configures mx6qsabrelite to use it as discussed in this thread on the ML: http://lists.denx.de/pipermail/u-boot/2012-September/135037.html ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/3] i.MX6: add HDMI transmitter register declarations from kernel WIP. 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson @ 2012-09-23 23:02 ` Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 2/3] i.MX6: Add hdmidet command to detect attached HDMI monitor Eric Nelson ` (2 subsequent siblings) 3 siblings, 0 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 23:02 UTC (permalink / raw) To: u-boot Original source from Pengutronix HDMI driver work: http://git.pengutronix.de/?p=imx/linux-2.6.git;a=commitdiff;h=72c31cd67ac880bd90785af86f8e46f8ea7b3bb0 Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 1053 ++++++++++++++++++++++++++++++ 1 files changed, 1053 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx6/mxc_hdmi.h diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h new file mode 100644 index 0000000..02a413f --- /dev/null +++ b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h @@ -0,0 +1,1053 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __MXC_HDMI_H__ +#define __MXC_HDMI_H__ + +/* + * Hdmi controller registers + */ + +/* Identification Registers */ +#define HDMI_DESIGN_ID 0x0000 +#define HDMI_REVISION_ID 0x0001 +#define HDMI_PRODUCT_ID0 0x0002 +#define HDMI_PRODUCT_ID1 0x0003 +#define HDMI_CONFIG0_ID 0x0004 +#define HDMI_CONFIG1_ID 0x0005 +#define HDMI_CONFIG2_ID 0x0006 +#define HDMI_CONFIG3_ID 0x0007 + +/* Interrupt Registers */ +#define HDMI_IH_FC_STAT0 0x0100 +#define HDMI_IH_FC_STAT1 0x0101 +#define HDMI_IH_FC_STAT2 0x0102 +#define HDMI_IH_AS_STAT0 0x0103 +#define HDMI_IH_PHY_STAT0 0x0104 +#define HDMI_IH_I2CM_STAT0 0x0105 +#define HDMI_IH_CEC_STAT0 0x0106 +#define HDMI_IH_VP_STAT0 0x0107 +#define HDMI_IH_I2CMPHY_STAT0 0x0108 +#define HDMI_IH_AHBDMAAUD_STAT0 0x0109 + +#define HDMI_IH_MUTE_FC_STAT0 0x0180 +#define HDMI_IH_MUTE_FC_STAT1 0x0181 +#define HDMI_IH_MUTE_FC_STAT2 0x0182 +#define HDMI_IH_MUTE_AS_STAT0 0x0183 +#define HDMI_IH_MUTE_PHY_STAT0 0x0184 +#define HDMI_IH_MUTE_I2CM_STAT0 0x0185 +#define HDMI_IH_MUTE_CEC_STAT0 0x0186 +#define HDMI_IH_MUTE_VP_STAT0 0x0187 +#define HDMI_IH_MUTE_I2CMPHY_STAT0 0x0188 +#define HDMI_IH_MUTE_AHBDMAAUD_STAT0 0x0189 +#define HDMI_IH_MUTE 0x01FF + +/* Video Sample Registers */ +#define HDMI_TX_INVID0 0x0200 +#define HDMI_TX_INSTUFFING 0x0201 +#define HDMI_TX_GYDATA0 0x0202 +#define HDMI_TX_GYDATA1 0x0203 +#define HDMI_TX_RCRDATA0 0x0204 +#define HDMI_TX_RCRDATA1 0x0205 +#define HDMI_TX_BCBDATA0 0x0206 +#define HDMI_TX_BCBDATA1 0x0207 + +/* Video Packetizer Registers */ +#define HDMI_VP_STATUS 0x0800 +#define HDMI_VP_PR_CD 0x0801 +#define HDMI_VP_STUFF 0x0802 +#define HDMI_VP_REMAP 0x0803 +#define HDMI_VP_CONF 0x0804 +#define HDMI_VP_STAT 0x0805 +#define HDMI_VP_INT 0x0806 +#define HDMI_VP_MASK 0x0807 +#define HDMI_VP_POL 0x0808 + +/* Frame Composer Registers */ +#define HDMI_FC_INVIDCONF 0x1000 +#define HDMI_FC_INHACTV0 0x1001 +#define HDMI_FC_INHACTV1 0x1002 +#define HDMI_FC_INHBLANK0 0x1003 +#define HDMI_FC_INHBLANK1 0x1004 +#define HDMI_FC_INVACTV0 0x1005 +#define HDMI_FC_INVACTV1 0x1006 +#define HDMI_FC_INVBLANK 0x1007 +#define HDMI_FC_HSYNCINDELAY0 0x1008 +#define HDMI_FC_HSYNCINDELAY1 0x1009 +#define HDMI_FC_HSYNCINWIDTH0 0x100A +#define HDMI_FC_HSYNCINWIDTH1 0x100B +#define HDMI_FC_VSYNCINDELAY 0x100C +#define HDMI_FC_VSYNCINWIDTH 0x100D +#define HDMI_FC_INFREQ0 0x100E +#define HDMI_FC_INFREQ1 0x100F +#define HDMI_FC_INFREQ2 0x1010 +#define HDMI_FC_CTRLDUR 0x1011 +#define HDMI_FC_EXCTRLDUR 0x1012 +#define HDMI_FC_EXCTRLSPAC 0x1013 +#define HDMI_FC_CH0PREAM 0x1014 +#define HDMI_FC_CH1PREAM 0x1015 +#define HDMI_FC_CH2PREAM 0x1016 +#define HDMI_FC_AVICONF3 0x1017 +#define HDMI_FC_GCP 0x1018 +#define HDMI_FC_AVICONF0 0x1019 +#define HDMI_FC_AVICONF1 0x101A +#define HDMI_FC_AVICONF2 0x101B +#define HDMI_FC_AVIVID 0x101C +#define HDMI_FC_AVIETB0 0x101D +#define HDMI_FC_AVIETB1 0x101E +#define HDMI_FC_AVISBB0 0x101F +#define HDMI_FC_AVISBB1 0x1020 +#define HDMI_FC_AVIELB0 0x1021 +#define HDMI_FC_AVIELB1 0x1022 +#define HDMI_FC_AVISRB0 0x1023 +#define HDMI_FC_AVISRB1 0x1024 +#define HDMI_FC_AUDICONF0 0x1025 +#define HDMI_FC_AUDICONF1 0x1026 +#define HDMI_FC_AUDICONF2 0x1027 +#define HDMI_FC_AUDICONF3 0x1028 +#define HDMI_FC_VSDIEEEID0 0x1029 +#define HDMI_FC_VSDSIZE 0x102A +#define HDMI_FC_VSDIEEEID1 0x1030 +#define HDMI_FC_VSDIEEEID2 0x1031 +#define HDMI_FC_VSDPAYLOAD0 0x1032 +#define HDMI_FC_VSDPAYLOAD1 0x1033 +#define HDMI_FC_VSDPAYLOAD2 0x1034 +#define HDMI_FC_VSDPAYLOAD3 0x1035 +#define HDMI_FC_VSDPAYLOAD4 0x1036 +#define HDMI_FC_VSDPAYLOAD5 0x1037 +#define HDMI_FC_VSDPAYLOAD6 0x1038 +#define HDMI_FC_VSDPAYLOAD7 0x1039 +#define HDMI_FC_VSDPAYLOAD8 0x103A +#define HDMI_FC_VSDPAYLOAD9 0x103B +#define HDMI_FC_VSDPAYLOAD10 0x103C +#define HDMI_FC_VSDPAYLOAD11 0x103D +#define HDMI_FC_VSDPAYLOAD12 0x103E +#define HDMI_FC_VSDPAYLOAD13 0x103F +#define HDMI_FC_VSDPAYLOAD14 0x1040 +#define HDMI_FC_VSDPAYLOAD15 0x1041 +#define HDMI_FC_VSDPAYLOAD16 0x1042 +#define HDMI_FC_VSDPAYLOAD17 0x1043 +#define HDMI_FC_VSDPAYLOAD18 0x1044 +#define HDMI_FC_VSDPAYLOAD19 0x1045 +#define HDMI_FC_VSDPAYLOAD20 0x1046 +#define HDMI_FC_VSDPAYLOAD21 0x1047 +#define HDMI_FC_VSDPAYLOAD22 0x1048 +#define HDMI_FC_VSDPAYLOAD23 0x1049 +#define HDMI_FC_SPDVENDORNAME0 0x104A +#define HDMI_FC_SPDVENDORNAME1 0x104B +#define HDMI_FC_SPDVENDORNAME2 0x104C +#define HDMI_FC_SPDVENDORNAME3 0x104D +#define HDMI_FC_SPDVENDORNAME4 0x104E +#define HDMI_FC_SPDVENDORNAME5 0x104F +#define HDMI_FC_SPDVENDORNAME6 0x1050 +#define HDMI_FC_SPDVENDORNAME7 0x1051 +#define HDMI_FC_SDPPRODUCTNAME0 0x1052 +#define HDMI_FC_SDPPRODUCTNAME1 0x1053 +#define HDMI_FC_SDPPRODUCTNAME2 0x1054 +#define HDMI_FC_SDPPRODUCTNAME3 0x1055 +#define HDMI_FC_SDPPRODUCTNAME4 0x1056 +#define HDMI_FC_SDPPRODUCTNAME5 0x1057 +#define HDMI_FC_SDPPRODUCTNAME6 0x1058 +#define HDMI_FC_SDPPRODUCTNAME7 0x1059 +#define HDMI_FC_SDPPRODUCTNAME8 0x105A +#define HDMI_FC_SDPPRODUCTNAME9 0x105B +#define HDMI_FC_SDPPRODUCTNAME10 0x105C +#define HDMI_FC_SDPPRODUCTNAME11 0x105D +#define HDMI_FC_SDPPRODUCTNAME12 0x105E +#define HDMI_FC_SDPPRODUCTNAME13 0x105F +#define HDMI_FC_SDPPRODUCTNAME14 0x1060 +#define HDMI_FC_SPDPRODUCTNAME15 0x1061 +#define HDMI_FC_SPDDEVICEINF 0x1062 +#define HDMI_FC_AUDSCONF 0x1063 +#define HDMI_FC_AUDSSTAT 0x1064 +#define HDMI_FC_DATACH0FILL 0x1070 +#define HDMI_FC_DATACH1FILL 0x1071 +#define HDMI_FC_DATACH2FILL 0x1072 +#define HDMI_FC_CTRLQHIGH 0x1073 +#define HDMI_FC_CTRLQLOW 0x1074 +#define HDMI_FC_ACP0 0x1075 +#define HDMI_FC_ACP28 0x1076 +#define HDMI_FC_ACP27 0x1077 +#define HDMI_FC_ACP26 0x1078 +#define HDMI_FC_ACP25 0x1079 +#define HDMI_FC_ACP24 0x107A +#define HDMI_FC_ACP23 0x107B +#define HDMI_FC_ACP22 0x107C +#define HDMI_FC_ACP21 0x107D +#define HDMI_FC_ACP20 0x107E +#define HDMI_FC_ACP19 0x107F +#define HDMI_FC_ACP18 0x1080 +#define HDMI_FC_ACP17 0x1081 +#define HDMI_FC_ACP16 0x1082 +#define HDMI_FC_ACP15 0x1083 +#define HDMI_FC_ACP14 0x1084 +#define HDMI_FC_ACP13 0x1085 +#define HDMI_FC_ACP12 0x1086 +#define HDMI_FC_ACP11 0x1087 +#define HDMI_FC_ACP10 0x1088 +#define HDMI_FC_ACP9 0x1089 +#define HDMI_FC_ACP8 0x108A +#define HDMI_FC_ACP7 0x108B +#define HDMI_FC_ACP6 0x108C +#define HDMI_FC_ACP5 0x108D +#define HDMI_FC_ACP4 0x108E +#define HDMI_FC_ACP3 0x108F +#define HDMI_FC_ACP2 0x1090 +#define HDMI_FC_ACP1 0x1091 +#define HDMI_FC_ISCR1_0 0x1092 +#define HDMI_FC_ISCR1_16 0x1093 +#define HDMI_FC_ISCR1_15 0x1094 +#define HDMI_FC_ISCR1_14 0x1095 +#define HDMI_FC_ISCR1_13 0x1096 +#define HDMI_FC_ISCR1_12 0x1097 +#define HDMI_FC_ISCR1_11 0x1098 +#define HDMI_FC_ISCR1_10 0x1099 +#define HDMI_FC_ISCR1_9 0x109A +#define HDMI_FC_ISCR1_8 0x109B +#define HDMI_FC_ISCR1_7 0x109C +#define HDMI_FC_ISCR1_6 0x109D +#define HDMI_FC_ISCR1_5 0x109E +#define HDMI_FC_ISCR1_4 0x109F +#define HDMI_FC_ISCR1_3 0x10A0 +#define HDMI_FC_ISCR1_2 0x10A1 +#define HDMI_FC_ISCR1_1 0x10A2 +#define HDMI_FC_ISCR2_15 0x10A3 +#define HDMI_FC_ISCR2_14 0x10A4 +#define HDMI_FC_ISCR2_13 0x10A5 +#define HDMI_FC_ISCR2_12 0x10A6 +#define HDMI_FC_ISCR2_11 0x10A7 +#define HDMI_FC_ISCR2_10 0x10A8 +#define HDMI_FC_ISCR2_9 0x10A9 +#define HDMI_FC_ISCR2_8 0x10AA +#define HDMI_FC_ISCR2_7 0x10AB +#define HDMI_FC_ISCR2_6 0x10AC +#define HDMI_FC_ISCR2_5 0x10AD +#define HDMI_FC_ISCR2_4 0x10AE +#define HDMI_FC_ISCR2_3 0x10AF +#define HDMI_FC_ISCR2_2 0x10B0 +#define HDMI_FC_ISCR2_1 0x10B1 +#define HDMI_FC_ISCR2_0 0x10B2 +#define HDMI_FC_DATAUTO0 0x10B3 +#define HDMI_FC_DATAUTO1 0x10B4 +#define HDMI_FC_DATAUTO2 0x10B5 +#define HDMI_FC_DATMAN 0x10B6 +#define HDMI_FC_DATAUTO3 0x10B7 +#define HDMI_FC_RDRB0 0x10B8 +#define HDMI_FC_RDRB1 0x10B9 +#define HDMI_FC_RDRB2 0x10BA +#define HDMI_FC_RDRB3 0x10BB +#define HDMI_FC_RDRB4 0x10BC +#define HDMI_FC_RDRB5 0x10BD +#define HDMI_FC_RDRB6 0x10BE +#define HDMI_FC_RDRB7 0x10BF +#define HDMI_FC_STAT0 0x10D0 +#define HDMI_FC_INT0 0x10D1 +#define HDMI_FC_MASK0 0x10D2 +#define HDMI_FC_POL0 0x10D3 +#define HDMI_FC_STAT1 0x10D4 +#define HDMI_FC_INT1 0x10D5 +#define HDMI_FC_MASK1 0x10D6 +#define HDMI_FC_POL1 0x10D7 +#define HDMI_FC_STAT2 0x10D8 +#define HDMI_FC_INT2 0x10D9 +#define HDMI_FC_MASK2 0x10DA +#define HDMI_FC_POL2 0x10DB +#define HDMI_FC_PRCONF 0x10E0 + +#define HDMI_FC_GMD_STAT 0x1100 +#define HDMI_FC_GMD_EN 0x1101 +#define HDMI_FC_GMD_UP 0x1102 +#define HDMI_FC_GMD_CONF 0x1103 +#define HDMI_FC_GMD_HB 0x1104 +#define HDMI_FC_GMD_PB0 0x1105 +#define HDMI_FC_GMD_PB1 0x1106 +#define HDMI_FC_GMD_PB2 0x1107 +#define HDMI_FC_GMD_PB3 0x1108 +#define HDMI_FC_GMD_PB4 0x1109 +#define HDMI_FC_GMD_PB5 0x110A +#define HDMI_FC_GMD_PB6 0x110B +#define HDMI_FC_GMD_PB7 0x110C +#define HDMI_FC_GMD_PB8 0x110D +#define HDMI_FC_GMD_PB9 0x110E +#define HDMI_FC_GMD_PB10 0x110F +#define HDMI_FC_GMD_PB11 0x1110 +#define HDMI_FC_GMD_PB12 0x1111 +#define HDMI_FC_GMD_PB13 0x1112 +#define HDMI_FC_GMD_PB14 0x1113 +#define HDMI_FC_GMD_PB15 0x1114 +#define HDMI_FC_GMD_PB16 0x1115 +#define HDMI_FC_GMD_PB17 0x1116 +#define HDMI_FC_GMD_PB18 0x1117 +#define HDMI_FC_GMD_PB19 0x1118 +#define HDMI_FC_GMD_PB20 0x1119 +#define HDMI_FC_GMD_PB21 0x111A +#define HDMI_FC_GMD_PB22 0x111B +#define HDMI_FC_GMD_PB23 0x111C +#define HDMI_FC_GMD_PB24 0x111D +#define HDMI_FC_GMD_PB25 0x111E +#define HDMI_FC_GMD_PB26 0x111F +#define HDMI_FC_GMD_PB27 0x1120 + +#define HDMI_FC_DBGFORCE 0x1200 +#define HDMI_FC_DBGAUD0CH0 0x1201 +#define HDMI_FC_DBGAUD1CH0 0x1202 +#define HDMI_FC_DBGAUD2CH0 0x1203 +#define HDMI_FC_DBGAUD0CH1 0x1204 +#define HDMI_FC_DBGAUD1CH1 0x1205 +#define HDMI_FC_DBGAUD2CH1 0x1206 +#define HDMI_FC_DBGAUD0CH2 0x1207 +#define HDMI_FC_DBGAUD1CH2 0x1208 +#define HDMI_FC_DBGAUD2CH2 0x1209 +#define HDMI_FC_DBGAUD0CH3 0x120A +#define HDMI_FC_DBGAUD1CH3 0x120B +#define HDMI_FC_DBGAUD2CH3 0x120C +#define HDMI_FC_DBGAUD0CH4 0x120D +#define HDMI_FC_DBGAUD1CH4 0x120E +#define HDMI_FC_DBGAUD2CH4 0x120F +#define HDMI_FC_DBGAUD0CH5 0x1210 +#define HDMI_FC_DBGAUD1CH5 0x1211 +#define HDMI_FC_DBGAUD2CH5 0x1212 +#define HDMI_FC_DBGAUD0CH6 0x1213 +#define HDMI_FC_DBGAUD1CH6 0x1214 +#define HDMI_FC_DBGAUD2CH6 0x1215 +#define HDMI_FC_DBGAUD0CH7 0x1216 +#define HDMI_FC_DBGAUD1CH7 0x1217 +#define HDMI_FC_DBGAUD2CH7 0x1218 +#define HDMI_FC_DBGTMDS0 0x1219 +#define HDMI_FC_DBGTMDS1 0x121A +#define HDMI_FC_DBGTMDS2 0x121B + +/* HDMI Source PHY Registers */ +#define HDMI_PHY_CONF0 0x3000 +#define HDMI_PHY_TST0 0x3001 +#define HDMI_PHY_TST1 0x3002 +#define HDMI_PHY_TST2 0x3003 +#define HDMI_PHY_STAT0 0x3004 +#define HDMI_PHY_INT0 0x3005 +#define HDMI_PHY_MASK0 0x3006 +#define HDMI_PHY_POL0 0x3007 + +/* HDMI Master PHY Registers */ +#define HDMI_PHY_I2CM_SLAVE_ADDR 0x3020 +#define HDMI_PHY_I2CM_ADDRESS_ADDR 0x3021 +#define HDMI_PHY_I2CM_DATAO_1_ADDR 0x3022 +#define HDMI_PHY_I2CM_DATAO_0_ADDR 0x3023 +#define HDMI_PHY_I2CM_DATAI_1_ADDR 0x3024 +#define HDMI_PHY_I2CM_DATAI_0_ADDR 0x3025 +#define HDMI_PHY_I2CM_OPERATION_ADDR 0x3026 +#define HDMI_PHY_I2CM_INT_ADDR 0x3027 +#define HDMI_PHY_I2CM_CTLINT_ADDR 0x3028 +#define HDMI_PHY_I2CM_DIV_ADDR 0x3029 +#define HDMI_PHY_I2CM_SOFTRSTZ_ADDR 0x302a +#define HDMI_PHY_I2CM_SS_SCL_HCNT_1_ADDR 0x302b +#define HDMI_PHY_I2CM_SS_SCL_HCNT_0_ADDR 0x302c +#define HDMI_PHY_I2CM_SS_SCL_LCNT_1_ADDR 0x302d +#define HDMI_PHY_I2CM_SS_SCL_LCNT_0_ADDR 0x302e +#define HDMI_PHY_I2CM_FS_SCL_HCNT_1_ADDR 0x302f +#define HDMI_PHY_I2CM_FS_SCL_HCNT_0_ADDR 0x3030 +#define HDMI_PHY_I2CM_FS_SCL_LCNT_1_ADDR 0x3031 +#define HDMI_PHY_I2CM_FS_SCL_LCNT_0_ADDR 0x3032 + +/* Audio Sampler Registers */ +#define HDMI_AUD_CONF0 0x3100 +#define HDMI_AUD_CONF1 0x3101 +#define HDMI_AUD_INT 0x3102 +#define HDMI_AUD_CONF2 0x3103 +#define HDMI_AUD_N1 0x3200 +#define HDMI_AUD_N2 0x3201 +#define HDMI_AUD_N3 0x3202 +#define HDMI_AUD_CTS1 0x3203 +#define HDMI_AUD_CTS2 0x3204 +#define HDMI_AUD_CTS3 0x3205 +#define HDMI_AUD_INPUTCLKFS 0x3206 +#define HDMI_AUD_SPDIFINT 0x3302 +#define HDMI_AUD_CONF0_HBR 0x3400 +#define HDMI_AUD_HBR_STATUS 0x3401 +#define HDMI_AUD_HBR_INT 0x3402 +#define HDMI_AUD_HBR_POL 0x3403 +#define HDMI_AUD_HBR_MASK 0x3404 + +/* Generic Parallel Audio Interface Registers */ +/* Not used as GPAUD interface is not enabled in hw */ +#define HDMI_GP_CONF0 0x3500 +#define HDMI_GP_CONF1 0x3501 +#define HDMI_GP_CONF2 0x3502 +#define HDMI_GP_STAT 0x3503 +#define HDMI_GP_INT 0x3504 +#define HDMI_GP_MASK 0x3505 +#define HDMI_GP_POL 0x3506 + +/* Audio DMA Registers */ +#define HDMI_AHB_DMA_CONF0 0x3600 +#define HDMI_AHB_DMA_START 0x3601 +#define HDMI_AHB_DMA_STOP 0x3602 +#define HDMI_AHB_DMA_THRSLD 0x3603 +#define HDMI_AHB_DMA_STRADDR0 0x3604 +#define HDMI_AHB_DMA_STRADDR1 0x3605 +#define HDMI_AHB_DMA_STRADDR2 0x3606 +#define HDMI_AHB_DMA_STRADDR3 0x3607 +#define HDMI_AHB_DMA_STPADDR0 0x3608 +#define HDMI_AHB_DMA_STPADDR1 0x3609 +#define HDMI_AHB_DMA_STPADDR2 0x360a +#define HDMI_AHB_DMA_STPADDR3 0x360b +#define HDMI_AHB_DMA_BSTADDR0 0x360c +#define HDMI_AHB_DMA_BSTADDR1 0x360d +#define HDMI_AHB_DMA_BSTADDR2 0x360e +#define HDMI_AHB_DMA_BSTADDR3 0x360f +#define HDMI_AHB_DMA_MBLENGTH0 0x3610 +#define HDMI_AHB_DMA_MBLENGTH1 0x3611 +#define HDMI_AHB_DMA_STAT 0x3612 +#define HDMI_AHB_DMA_INT 0x3613 +#define HDMI_AHB_DMA_MASK 0x3614 +#define HDMI_AHB_DMA_POL 0x3615 +#define HDMI_AHB_DMA_CONF1 0x3616 +#define HDMI_AHB_DMA_BUFFSTAT 0x3617 +#define HDMI_AHB_DMA_BUFFINT 0x3618 +#define HDMI_AHB_DMA_BUFFMASK 0x3619 +#define HDMI_AHB_DMA_BUFFPOL 0x361a + +/* Main Controller Registers */ +#define HDMI_MC_SFRDIV 0x4000 +#define HDMI_MC_CLKDIS 0x4001 +#define HDMI_MC_SWRSTZ 0x4002 +#define HDMI_MC_OPCTRL 0x4003 +#define HDMI_MC_FLOWCTRL 0x4004 +#define HDMI_MC_PHYRSTZ 0x4005 +#define HDMI_MC_LOCKONCLOCK 0x4006 +#define HDMI_MC_HEACPHY_RST 0x4007 + +/* Color Space Converter Registers */ +#define HDMI_CSC_CFG 0x4100 +#define HDMI_CSC_SCALE 0x4101 +#define HDMI_CSC_COEF_A1_MSB 0x4102 +#define HDMI_CSC_COEF_A1_LSB 0x4103 +#define HDMI_CSC_COEF_A2_MSB 0x4104 +#define HDMI_CSC_COEF_A2_LSB 0x4105 +#define HDMI_CSC_COEF_A3_MSB 0x4106 +#define HDMI_CSC_COEF_A3_LSB 0x4107 +#define HDMI_CSC_COEF_A4_MSB 0x4108 +#define HDMI_CSC_COEF_A4_LSB 0x4109 +#define HDMI_CSC_COEF_B1_MSB 0x410A +#define HDMI_CSC_COEF_B1_LSB 0x410B +#define HDMI_CSC_COEF_B2_MSB 0x410C +#define HDMI_CSC_COEF_B2_LSB 0x410D +#define HDMI_CSC_COEF_B3_MSB 0x410E +#define HDMI_CSC_COEF_B3_LSB 0x410F +#define HDMI_CSC_COEF_B4_MSB 0x4110 +#define HDMI_CSC_COEF_B4_LSB 0x4111 +#define HDMI_CSC_COEF_C1_MSB 0x4112 +#define HDMI_CSC_COEF_C1_LSB 0x4113 +#define HDMI_CSC_COEF_C2_MSB 0x4114 +#define HDMI_CSC_COEF_C2_LSB 0x4115 +#define HDMI_CSC_COEF_C3_MSB 0x4116 +#define HDMI_CSC_COEF_C3_LSB 0x4117 +#define HDMI_CSC_COEF_C4_MSB 0x4118 +#define HDMI_CSC_COEF_C4_LSB 0x4119 + +/* HDCP Encryption Engine Registers */ +#define HDMI_A_HDCPCFG0 0x5000 +#define HDMI_A_HDCPCFG1 0x5001 +#define HDMI_A_HDCPOBS0 0x5002 +#define HDMI_A_HDCPOBS1 0x5003 +#define HDMI_A_HDCPOBS2 0x5004 +#define HDMI_A_HDCPOBS3 0x5005 +#define HDMI_A_APIINTCLR 0x5006 +#define HDMI_A_APIINTSTAT 0x5007 +#define HDMI_A_APIINTMSK 0x5008 +#define HDMI_A_VIDPOLCFG 0x5009 +#define HDMI_A_OESSWCFG 0x500A +#define HDMI_A_TIMER1SETUP0 0x500B +#define HDMI_A_TIMER1SETUP1 0x500C +#define HDMI_A_TIMER2SETUP0 0x500D +#define HDMI_A_TIMER2SETUP1 0x500E +#define HDMI_A_100MSCFG 0x500F +#define HDMI_A_2SCFG0 0x5010 +#define HDMI_A_2SCFG1 0x5011 +#define HDMI_A_5SCFG0 0x5012 +#define HDMI_A_5SCFG1 0x5013 +#define HDMI_A_SRMVERLSB 0x5014 +#define HDMI_A_SRMVERMSB 0x5015 +#define HDMI_A_SRMCTRL 0x5016 +#define HDMI_A_SFRSETUP 0x5017 +#define HDMI_A_I2CHSETUP 0x5018 +#define HDMI_A_INTSETUP 0x5019 +#define HDMI_A_PRESETUP 0x501A +#define HDMI_A_SRM_BASE 0x5020 + +/* CEC Engine Registers */ +#define HDMI_CEC_CTRL 0x7D00 +#define HDMI_CEC_STAT 0x7D01 +#define HDMI_CEC_MASK 0x7D02 +#define HDMI_CEC_POLARITY 0x7D03 +#define HDMI_CEC_INT 0x7D04 +#define HDMI_CEC_ADDR_L 0x7D05 +#define HDMI_CEC_ADDR_H 0x7D06 +#define HDMI_CEC_TX_CNT 0x7D07 +#define HDMI_CEC_RX_CNT 0x7D08 +#define HDMI_CEC_TX_DATA0 0x7D10 +#define HDMI_CEC_TX_DATA1 0x7D11 +#define HDMI_CEC_TX_DATA2 0x7D12 +#define HDMI_CEC_TX_DATA3 0x7D13 +#define HDMI_CEC_TX_DATA4 0x7D14 +#define HDMI_CEC_TX_DATA5 0x7D15 +#define HDMI_CEC_TX_DATA6 0x7D16 +#define HDMI_CEC_TX_DATA7 0x7D17 +#define HDMI_CEC_TX_DATA8 0x7D18 +#define HDMI_CEC_TX_DATA9 0x7D19 +#define HDMI_CEC_TX_DATA10 0x7D1a +#define HDMI_CEC_TX_DATA11 0x7D1b +#define HDMI_CEC_TX_DATA12 0x7D1c +#define HDMI_CEC_TX_DATA13 0x7D1d +#define HDMI_CEC_TX_DATA14 0x7D1e +#define HDMI_CEC_TX_DATA15 0x7D1f +#define HDMI_CEC_RX_DATA0 0x7D20 +#define HDMI_CEC_RX_DATA1 0x7D21 +#define HDMI_CEC_RX_DATA2 0x7D22 +#define HDMI_CEC_RX_DATA3 0x7D23 +#define HDMI_CEC_RX_DATA4 0x7D24 +#define HDMI_CEC_RX_DATA5 0x7D25 +#define HDMI_CEC_RX_DATA6 0x7D26 +#define HDMI_CEC_RX_DATA7 0x7D27 +#define HDMI_CEC_RX_DATA8 0x7D28 +#define HDMI_CEC_RX_DATA9 0x7D29 +#define HDMI_CEC_RX_DATA10 0x7D2a +#define HDMI_CEC_RX_DATA11 0x7D2b +#define HDMI_CEC_RX_DATA12 0x7D2c +#define HDMI_CEC_RX_DATA13 0x7D2d +#define HDMI_CEC_RX_DATA14 0x7D2e +#define HDMI_CEC_RX_DATA15 0x7D2f +#define HDMI_CEC_LOCK 0x7D30 +#define HDMI_CEC_WKUPCTRL 0x7D31 + +/* I2C Master Registers (E-DDC) */ +#define HDMI_I2CM_SLAVE 0x7E00 +#define HDMI_I2CMESS 0x7E01 +#define HDMI_I2CM_DATAO 0x7E02 +#define HDMI_I2CM_DATAI 0x7E03 +#define HDMI_I2CM_OPERATION 0x7E04 +#define HDMI_I2CM_INT 0x7E05 +#define HDMI_I2CM_CTLINT 0x7E06 +#define HDMI_I2CM_DIV 0x7E07 +#define HDMI_I2CM_SEGADDR 0x7E08 +#define HDMI_I2CM_SOFTRSTZ 0x7E09 +#define HDMI_I2CM_SEGPTR 0x7E0A +#define HDMI_I2CM_SS_SCL_HCNT_1_ADDR 0x7E0B +#define HDMI_I2CM_SS_SCL_HCNT_0_ADDR 0x7E0C +#define HDMI_I2CM_SS_SCL_LCNT_1_ADDR 0x7E0D +#define HDMI_I2CM_SS_SCL_LCNT_0_ADDR 0x7E0E +#define HDMI_I2CM_FS_SCL_HCNT_1_ADDR 0x7E0F +#define HDMI_I2CM_FS_SCL_HCNT_0_ADDR 0x7E10 +#define HDMI_I2CM_FS_SCL_LCNT_1_ADDR 0x7E11 +#define HDMI_I2CM_FS_SCL_LCNT_0_ADDR 0x7E12 + +/* Random Number Generator Registers (RNG) */ +#define HDMI_RNG_BASE 0x8000 + + +/* + * Register field definitions + */ +enum { +/* IH_FC_INT2 field values */ + HDMI_IH_FC_INT2_OVERFLOW_MASK = 0x03, + HDMI_IH_FC_INT2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_IH_FC_INT2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* IH_FC_STAT2 field values */ + HDMI_IH_FC_STAT2_OVERFLOW_MASK = 0x03, + HDMI_IH_FC_STAT2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_IH_FC_STAT2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* IH_PHY_STAT0 field values */ + HDMI_IH_PHY_STAT0_RX_SENSE3 = 0x20, + HDMI_IH_PHY_STAT0_RX_SENSE2 = 0x10, + HDMI_IH_PHY_STAT0_RX_SENSE1 = 0x8, + HDMI_IH_PHY_STAT0_RX_SENSE0 = 0x4, + HDMI_IH_PHY_STAT0_TX_PHY_LOCK = 0x2, + HDMI_IH_PHY_STAT0_HPD = 0x1, + +/* IH_MUTE_I2CMPHY_STAT0 field values */ + HDMI_IH_MUTE_I2CMPHY_STAT0_I2CMPHYDONE = 0x2, + HDMI_IH_MUTE_I2CMPHY_STAT0_I2CMPHYERROR = 0x1, + +/* IH_AHBDMAAUD_STAT0 field values */ + HDMI_IH_AHBDMAAUD_STAT0_ERROR = 0x20, + HDMI_IH_AHBDMAAUD_STAT0_LOST = 0x10, + HDMI_IH_AHBDMAAUD_STAT0_RETRY = 0x08, + HDMI_IH_AHBDMAAUD_STAT0_DONE = 0x04, + HDMI_IH_AHBDMAAUD_STAT0_BUFFFULL = 0x02, + HDMI_IH_AHBDMAAUD_STAT0_BUFFEMPTY = 0x01, + +/* IH_MUTE_FC_STAT2 field values */ + HDMI_IH_MUTE_FC_STAT2_OVERFLOW_MASK = 0x03, + HDMI_IH_MUTE_FC_STAT2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_IH_MUTE_FC_STAT2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* IH_MUTE_AHBDMAAUD_STAT0 field values */ + HDMI_IH_MUTE_AHBDMAAUD_STAT0_ERROR = 0x20, + HDMI_IH_MUTE_AHBDMAAUD_STAT0_LOST = 0x10, + HDMI_IH_MUTE_AHBDMAAUD_STAT0_RETRY = 0x08, + HDMI_IH_MUTE_AHBDMAAUD_STAT0_DONE = 0x04, + HDMI_IH_MUTE_AHBDMAAUD_STAT0_BUFFFULL = 0x02, + HDMI_IH_MUTE_AHBDMAAUD_STAT0_BUFFEMPTY = 0x01, + +/* IH_MUTE field values */ + HDMI_IH_MUTE_MUTE_WAKEUP_INTERRUPT = 0x2, + HDMI_IH_MUTE_MUTE_ALL_INTERRUPT = 0x1, + +/* TX_INVID0 field values */ + HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_MASK = 0x80, + HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_ENABLE = 0x80, + HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_DISABLE = 0x00, + HDMI_TX_INVID0_VIDEO_MAPPING_MASK = 0x1F, + HDMI_TX_INVID0_VIDEO_MAPPING_OFFSET = 0, + +/* TX_INSTUFFING field values */ + HDMI_TX_INSTUFFING_BDBDATA_STUFFING_MASK = 0x4, + HDMI_TX_INSTUFFING_BDBDATA_STUFFING_ENABLE = 0x4, + HDMI_TX_INSTUFFING_BDBDATA_STUFFING_DISABLE = 0x0, + HDMI_TX_INSTUFFING_RCRDATA_STUFFING_MASK = 0x2, + HDMI_TX_INSTUFFING_RCRDATA_STUFFING_ENABLE = 0x2, + HDMI_TX_INSTUFFING_RCRDATA_STUFFING_DISABLE = 0x0, + HDMI_TX_INSTUFFING_GYDATA_STUFFING_MASK = 0x1, + HDMI_TX_INSTUFFING_GYDATA_STUFFING_ENABLE = 0x1, + HDMI_TX_INSTUFFING_GYDATA_STUFFING_DISABLE = 0x0, + +/* VP_PR_CD field values */ + HDMI_VP_PR_CD_COLOR_DEPTH_MASK = 0xF0, + HDMI_VP_PR_CD_COLOR_DEPTH_OFFSET = 4, + HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK = 0x0F, + HDMI_VP_PR_CD_DESIRED_PR_FACTOR_OFFSET = 0, + +/* VP_STUFF field values */ + HDMI_VP_STUFF_IDEFAULT_PHASE_MASK = 0x20, + HDMI_VP_STUFF_IDEFAULT_PHASE_OFFSET = 5, + HDMI_VP_STUFF_IFIX_PP_TO_LAST_MASK = 0x10, + HDMI_VP_STUFF_IFIX_PP_TO_LAST_OFFSET = 4, + HDMI_VP_STUFF_ICX_GOTO_P0_ST_MASK = 0x8, + HDMI_VP_STUFF_ICX_GOTO_P0_ST_OFFSET = 3, + HDMI_VP_STUFF_YCC422_STUFFING_MASK = 0x4, + HDMI_VP_STUFF_YCC422_STUFFING_STUFFING_MODE = 0x4, + HDMI_VP_STUFF_YCC422_STUFFING_DIRECT_MODE = 0x0, + HDMI_VP_STUFF_PP_STUFFING_MASK = 0x2, + HDMI_VP_STUFF_PP_STUFFING_STUFFING_MODE = 0x2, + HDMI_VP_STUFF_PP_STUFFING_DIRECT_MODE = 0x0, + HDMI_VP_STUFF_PR_STUFFING_MASK = 0x1, + HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE = 0x1, + HDMI_VP_STUFF_PR_STUFFING_DIRECT_MODE = 0x0, + +/* VP_CONF field values */ + HDMI_VP_CONF_BYPASS_EN_MASK = 0x40, + HDMI_VP_CONF_BYPASS_EN_ENABLE = 0x40, + HDMI_VP_CONF_BYPASS_EN_DISABLE = 0x00, + HDMI_VP_CONF_PP_EN_ENMASK = 0x20, + HDMI_VP_CONF_PP_EN_ENABLE = 0x20, + HDMI_VP_CONF_PP_EN_DISABLE = 0x00, + HDMI_VP_CONF_PR_EN_MASK = 0x10, + HDMI_VP_CONF_PR_EN_ENABLE = 0x10, + HDMI_VP_CONF_PR_EN_DISABLE = 0x00, + HDMI_VP_CONF_YCC422_EN_MASK = 0x8, + HDMI_VP_CONF_YCC422_EN_ENABLE = 0x8, + HDMI_VP_CONF_YCC422_EN_DISABLE = 0x0, + HDMI_VP_CONF_BYPASS_SELECT_MASK = 0x4, + HDMI_VP_CONF_BYPASS_SELECT_VID_PACKETIZER = 0x4, + HDMI_VP_CONF_BYPASS_SELECT_PIX_REPEATER = 0x0, + HDMI_VP_CONF_OUTPUT_SELECTOR_MASK = 0x3, + HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS = 0x3, + HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422 = 0x1, + HDMI_VP_CONF_OUTPUT_SELECTOR_PP = 0x0, + +/* VP_REMAP field values */ + HDMI_VP_REMAP_MASK = 0x3, + HDMI_VP_REMAP_YCC422_24bit = 0x2, + HDMI_VP_REMAP_YCC422_20bit = 0x1, + HDMI_VP_REMAP_YCC422_16bit = 0x0, + +/* FC_INVIDCONF field values */ + HDMI_FC_INVIDCONF_HDCP_KEEPOUT_MASK = 0x80, + HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE = 0x80, + HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE = 0x00, + HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_MASK = 0x40, + HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_HIGH = 0x40, + HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_LOW = 0x00, + HDMI_FC_INVIDCONF_HSYNC_IN_POLARITY_MASK = 0x20, + HDMI_FC_INVIDCONF_HSYNC_IN_POLARITY_ACTIVE_HIGH = 0x20, + HDMI_FC_INVIDCONF_HSYNC_IN_POLARITY_ACTIVE_LOW = 0x00, + HDMI_FC_INVIDCONF_DE_IN_POLARITY_MASK = 0x10, + HDMI_FC_INVIDCONF_DE_IN_POLARITY_ACTIVE_HIGH = 0x10, + HDMI_FC_INVIDCONF_DE_IN_POLARITY_ACTIVE_LOW = 0x00, + HDMI_FC_INVIDCONF_DVI_MODEZ_MASK = 0x8, + HDMI_FC_INVIDCONF_DVI_MODEZ_HDMI_MODE = 0x8, + HDMI_FC_INVIDCONF_DVI_MODEZ_DVI_MODE = 0x0, + HDMI_FC_INVIDCONF_R_V_BLANK_IN_OSC_MASK = 0x2, + HDMI_FC_INVIDCONF_R_V_BLANK_IN_OSC_ACTIVE_HIGH = 0x2, + HDMI_FC_INVIDCONF_R_V_BLANK_IN_OSC_ACTIVE_LOW = 0x0, + HDMI_FC_INVIDCONF_IN_I_P_MASK = 0x1, + HDMI_FC_INVIDCONF_IN_I_P_INTERLACED = 0x1, + HDMI_FC_INVIDCONF_IN_I_P_PROGRESSIVE = 0x0, + +/* FC_AUDICONF0 field values */ + HDMI_FC_AUDICONF0_CC_OFFSET = 4, + HDMI_FC_AUDICONF0_CC_MASK = 0x70, + HDMI_FC_AUDICONF0_CT_OFFSET = 0, + HDMI_FC_AUDICONF0_CT_MASK = 0xF, + +/* FC_AUDICONF1 field values */ + HDMI_FC_AUDICONF1_SS_OFFSET = 3, + HDMI_FC_AUDICONF1_SS_MASK = 0x18, + HDMI_FC_AUDICONF1_SF_OFFSET = 0, + HDMI_FC_AUDICONF1_SF_MASK = 0x7, + +/* FC_AUDICONF3 field values */ + HDMI_FC_AUDICONF3_LFEPBL_OFFSET = 5, + HDMI_FC_AUDICONF3_LFEPBL_MASK = 0x60, + HDMI_FC_AUDICONF3_DM_INH_OFFSET = 4, + HDMI_FC_AUDICONF3_DM_INH_MASK = 0x10, + HDMI_FC_AUDICONF3_LSV_OFFSET = 0, + HDMI_FC_AUDICONF3_LSV_MASK = 0xF, + +/* FC_AUDSCHNLS0 field values */ + HDMI_FC_AUDSCHNLS0_CGMSA_OFFSET = 4, + HDMI_FC_AUDSCHNLS0_CGMSA_MASK = 0x30, + HDMI_FC_AUDSCHNLS0_COPYRIGHT_OFFSET = 0, + HDMI_FC_AUDSCHNLS0_COPYRIGHT_MASK = 0x01, + +/* FC_AUDSCHNLS3-6 field values */ + HDMI_FC_AUDSCHNLS3_OIEC_CH0_OFFSET = 0, + HDMI_FC_AUDSCHNLS3_OIEC_CH0_MASK = 0x0f, + HDMI_FC_AUDSCHNLS3_OIEC_CH1_OFFSET = 4, + HDMI_FC_AUDSCHNLS3_OIEC_CH1_MASK = 0xf0, + HDMI_FC_AUDSCHNLS4_OIEC_CH2_OFFSET = 0, + HDMI_FC_AUDSCHNLS4_OIEC_CH2_MASK = 0x0f, + HDMI_FC_AUDSCHNLS4_OIEC_CH3_OFFSET = 4, + HDMI_FC_AUDSCHNLS4_OIEC_CH3_MASK = 0xf0, + + HDMI_FC_AUDSCHNLS5_OIEC_CH0_OFFSET = 0, + HDMI_FC_AUDSCHNLS5_OIEC_CH0_MASK = 0x0f, + HDMI_FC_AUDSCHNLS5_OIEC_CH1_OFFSET = 4, + HDMI_FC_AUDSCHNLS5_OIEC_CH1_MASK = 0xf0, + HDMI_FC_AUDSCHNLS6_OIEC_CH2_OFFSET = 0, + HDMI_FC_AUDSCHNLS6_OIEC_CH2_MASK = 0x0f, + HDMI_FC_AUDSCHNLS6_OIEC_CH3_OFFSET = 4, + HDMI_FC_AUDSCHNLS6_OIEC_CH3_MASK = 0xf0, + +/* HDMI_FC_AUDSCHNLS7 field values */ + HDMI_FC_AUDSCHNLS7_ACCURACY_OFFSET = 4, + HDMI_FC_AUDSCHNLS7_ACCURACY_MASK = 0x30, + +/* HDMI_FC_AUDSCHNLS8 field values */ + HDMI_FC_AUDSCHNLS8_ORIGSAMPFREQ_MASK = 0xf0, + HDMI_FC_AUDSCHNLS8_ORIGSAMPFREQ_OFFSET = 4, + HDMI_FC_AUDSCHNLS8_WORDLEGNTH_MASK = 0x0f, + HDMI_FC_AUDSCHNLS8_WORDLEGNTH_OFFSET = 0, + +/* FC_AUDSCONF field values */ + HDMI_FC_AUDSCONF_AUD_PACKET_SAMPFIT_MASK = 0xF0, + HDMI_FC_AUDSCONF_AUD_PACKET_SAMPFIT_OFFSET = 4, + HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_MASK = 0x1, + HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_OFFSET = 0, + HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_LAYOUT1 = 0x1, + HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_LAYOUT0 = 0x0, + +/* FC_STAT2 field values */ + HDMI_FC_STAT2_OVERFLOW_MASK = 0x03, + HDMI_FC_STAT2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_FC_STAT2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* FC_INT2 field values */ + HDMI_FC_INT2_OVERFLOW_MASK = 0x03, + HDMI_FC_INT2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_FC_INT2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* FC_MASK2 field values */ + HDMI_FC_MASK2_OVERFLOW_MASK = 0x03, + HDMI_FC_MASK2_LOW_PRIORITY_OVERFLOW = 0x02, + HDMI_FC_MASK2_HIGH_PRIORITY_OVERFLOW = 0x01, + +/* FC_PRCONF field values */ + HDMI_FC_PRCONF_INCOMING_PR_FACTOR_MASK = 0xF0, + HDMI_FC_PRCONF_INCOMING_PR_FACTOR_OFFSET = 4, + HDMI_FC_PRCONF_OUTPUT_PR_FACTOR_MASK = 0x0F, + HDMI_FC_PRCONF_OUTPUT_PR_FACTOR_OFFSET = 0, + +/* FC_AVICONF0-FC_AVICONF3 field values */ + HDMI_FC_AVICONF0_PIX_FMT_MASK = 0x03, + HDMI_FC_AVICONF0_PIX_FMT_RGB = 0x00, + HDMI_FC_AVICONF0_PIX_FMT_YCBCR422 = 0x01, + HDMI_FC_AVICONF0_PIX_FMT_YCBCR444 = 0x02, + HDMI_FC_AVICONF0_ACTIVE_FMT_MASK = 0x40, + HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT = 0x40, + HDMI_FC_AVICONF0_ACTIVE_FMT_NO_INFO = 0x00, + HDMI_FC_AVICONF0_BAR_DATA_MASK = 0x0C, + HDMI_FC_AVICONF0_BAR_DATA_NO_DATA = 0x00, + HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR = 0x04, + HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR = 0x08, + HDMI_FC_AVICONF0_BAR_DATA_VERT_HORIZ_BAR = 0x0C, + HDMI_FC_AVICONF0_SCAN_INFO_MASK = 0x30, + HDMI_FC_AVICONF0_SCAN_INFO_OVERSCAN = 0x10, + HDMI_FC_AVICONF0_SCAN_INFO_UNDERSCAN = 0x20, + HDMI_FC_AVICONF0_SCAN_INFO_NODATA = 0x00, + + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_MASK = 0x0F, + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_USE_CODED = 0x08, + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_4_3 = 0x09, + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_16_9 = 0x0A, + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_14_9 = 0x0B, + HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_MASK = 0x30, + HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_NO_DATA = 0x00, + HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_4_3 = 0x10, + HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_16_9 = 0x20, + HDMI_FC_AVICONF1_COLORIMETRY_MASK = 0xC0, + HDMI_FC_AVICONF1_COLORIMETRY_NO_DATA = 0x00, + HDMI_FC_AVICONF1_COLORIMETRY_SMPTE = 0x40, + HDMI_FC_AVICONF1_COLORIMETRY_ITUR = 0x80, + HDMI_FC_AVICONF1_COLORIMETRY_EXTENDED_INFO = 0xC0, + + HDMI_FC_AVICONF2_SCALING_MASK = 0x03, + HDMI_FC_AVICONF2_SCALING_NONE = 0x00, + HDMI_FC_AVICONF2_SCALING_HORIZ = 0x01, + HDMI_FC_AVICONF2_SCALING_VERT = 0x02, + HDMI_FC_AVICONF2_SCALING_HORIZ_VERT = 0x03, + HDMI_FC_AVICONF2_RGB_QUANT_MASK = 0x0C, + HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT = 0x00, + HDMI_FC_AVICONF2_RGB_QUANT_LIMITED_RANGE = 0x04, + HDMI_FC_AVICONF2_RGB_QUANT_FULL_RANGE = 0x08, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_MASK = 0x70, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601 = 0x00, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC709 = 0x10, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_SYCC601 = 0x20, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_ADOBE_YCC601 = 0x30, + HDMI_FC_AVICONF2_EXT_COLORIMETRY_ADOBE_RGB = 0x40, + HDMI_FC_AVICONF2_IT_CONTENT_MASK = 0x80, + HDMI_FC_AVICONF2_IT_CONTENT_NO_DATA = 0x00, + HDMI_FC_AVICONF2_IT_CONTENT_VALID = 0x80, + + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_MASK = 0x03, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_GRAPHICS = 0x00, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_PHOTO = 0x01, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_CINEMA = 0x02, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_GAME = 0x03, + HDMI_FC_AVICONF3_QUANT_RANGE_MASK = 0x0C, + HDMI_FC_AVICONF3_QUANT_RANGE_LIMITED = 0x00, + HDMI_FC_AVICONF3_QUANT_RANGE_FULL = 0x04, + +/* FC_DBGFORCE field values */ + HDMI_FC_DBGFORCE_FORCEAUDIO = 0x10, + HDMI_FC_DBGFORCE_FORCEVIDEO = 0x1, + +/* PHY_CONF0 field values */ + HDMI_PHY_CONF0_PDZ_MASK = 0x80, + HDMI_PHY_CONF0_PDZ_OFFSET = 7, + HDMI_PHY_CONF0_ENTMDS_MASK = 0x40, + HDMI_PHY_CONF0_ENTMDS_OFFSET = 6, + HDMI_PHY_CONF0_SPARECTRL = 0x20, + HDMI_PHY_CONF0_GEN2_PDDQ_MASK = 0x10, + HDMI_PHY_CONF0_GEN2_PDDQ_OFFSET = 4, + HDMI_PHY_CONF0_GEN2_TXPWRON_MASK = 0x8, + HDMI_PHY_CONF0_GEN2_TXPWRON_OFFSET = 3, + HDMI_PHY_CONF0_GEN2_ENHPDRXSENSE_MASK = 0x4, + HDMI_PHY_CONF0_GEN2_ENHPDRXSENSE_OFFSET = 2, + HDMI_PHY_CONF0_SELDATAENPOL_MASK = 0x2, + HDMI_PHY_CONF0_SELDATAENPOL_OFFSET = 1, + HDMI_PHY_CONF0_SELDIPIF_MASK = 0x1, + HDMI_PHY_CONF0_SELDIPIF_OFFSET = 0, + +/* PHY_TST0 field values */ + HDMI_PHY_TST0_TSTCLR_MASK = 0x20, + HDMI_PHY_TST0_TSTCLR_OFFSET = 5, + HDMI_PHY_TST0_TSTEN_MASK = 0x10, + HDMI_PHY_TST0_TSTEN_OFFSET = 4, + HDMI_PHY_TST0_TSTCLK_MASK = 0x1, + HDMI_PHY_TST0_TSTCLK_OFFSET = 0, + +/* PHY_STAT0 field values */ + HDMI_PHY_RX_SENSE3 = 0x80, + HDMI_PHY_RX_SENSE2 = 0x40, + HDMI_PHY_RX_SENSE1 = 0x20, + HDMI_PHY_RX_SENSE0 = 0x10, + HDMI_PHY_HPD = 0x02, + HDMI_PHY_TX_PHY_LOCK = 0x01, + +/* PHY_I2CM_SLAVE_ADDR field values */ + HDMI_PHY_I2CM_SLAVE_ADDR_PHY_GEN2 = 0x69, + HDMI_PHY_I2CM_SLAVE_ADDR_HEAC_PHY = 0x49, + +/* PHY_I2CM_OPERATION_ADDR field values */ + HDMI_PHY_I2CM_OPERATION_ADDR_WRITE = 0x10, + HDMI_PHY_I2CM_OPERATION_ADDR_READ = 0x1, + +/* HDMI_PHY_I2CM_INT_ADDR */ + HDMI_PHY_I2CM_INT_ADDR_DONE_POL = 0x08, + HDMI_PHY_I2CM_INT_ADDR_DONE_MASK = 0x04, + +/* HDMI_PHY_I2CM_CTLINT_ADDR */ + HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL = 0x80, + HDMI_PHY_I2CM_CTLINT_ADDR_NAC_MASK = 0x40, + HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL = 0x08, + HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_MASK = 0x04, + +/* AUD_CTS3 field values */ + HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5, + HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0, + HDMI_AUD_CTS3_N_SHIFT_1 = 0, + HDMI_AUD_CTS3_N_SHIFT_16 = 0x20, + HDMI_AUD_CTS3_N_SHIFT_32 = 0x40, + HDMI_AUD_CTS3_N_SHIFT_64 = 0x60, + HDMI_AUD_CTS3_N_SHIFT_128 = 0x80, + HDMI_AUD_CTS3_N_SHIFT_256 = 0xa0, + /* note that the CTS3 MANUAL bit has been removed + from our part. Can't set it, will read as 0. */ + HDMI_AUD_CTS3_CTS_MANUAL = 0x10, + HDMI_AUD_CTS3_AUDCTS19_16_MASK = 0x0f, + +/* AHB_DMA_CONF0 field values */ + HDMI_AHB_DMA_CONF0_SW_FIFO_RST_OFFSET = 7, + HDMI_AHB_DMA_CONF0_SW_FIFO_RST_MASK = 0x80, + HDMI_AHB_DMA_CONF0_HBR = 0x10, + HDMI_AHB_DMA_CONF0_EN_HLOCK_OFFSET = 3, + HDMI_AHB_DMA_CONF0_EN_HLOCK_MASK = 0x08, + HDMI_AHB_DMA_CONF0_INCR_TYPE_OFFSET = 1, + HDMI_AHB_DMA_CONF0_INCR_TYPE_MASK = 0x06, + HDMI_AHB_DMA_CONF0_INCR4 = 0x0, + HDMI_AHB_DMA_CONF0_INCR8 = 0x2, + HDMI_AHB_DMA_CONF0_INCR16 = 0x4, + HDMI_AHB_DMA_CONF0_BURST_MODE = 0x1, + +/* HDMI_AHB_DMA_START field values */ + HDMI_AHB_DMA_START_START_OFFSET = 0, + HDMI_AHB_DMA_START_START_MASK = 0x01, + +/* HDMI_AHB_DMA_STOP field values */ + HDMI_AHB_DMA_STOP_STOP_OFFSET = 0, + HDMI_AHB_DMA_STOP_STOP_MASK = 0x01, + +/* AHB_DMA_STAT, AHB_DMA_INT, AHB_DMA_MASK, AHB_DMA_POL field values */ + HDMI_AHB_DMA_DONE = 0x80, + HDMI_AHB_DMA_RETRY_SPLIT = 0x40, + HDMI_AHB_DMA_LOSTOWNERSHIP = 0x20, + HDMI_AHB_DMA_ERROR = 0x10, + HDMI_AHB_DMA_FIFO_THREMPTY = 0x04, + HDMI_AHB_DMA_FIFO_FULL = 0x02, + HDMI_AHB_DMA_FIFO_EMPTY = 0x01, + +/* AHB_DMA_BUFFSTAT, AHB_DMA_BUFFINT, AHB_DMA_BUFFMASK, AHB_DMA_BUFFPOL field values */ + HDMI_AHB_DMA_BUFFSTAT_FULL = 0x02, + HDMI_AHB_DMA_BUFFSTAT_EMPTY = 0x01, + +/* MC_CLKDIS field values */ + HDMI_MC_CLKDIS_HDCPCLK_DISABLE = 0x40, + HDMI_MC_CLKDIS_CECCLK_DISABLE = 0x20, + HDMI_MC_CLKDIS_CSCCLK_DISABLE = 0x10, + HDMI_MC_CLKDIS_AUDCLK_DISABLE = 0x8, + HDMI_MC_CLKDIS_PREPCLK_DISABLE = 0x4, + HDMI_MC_CLKDIS_TMDSCLK_DISABLE = 0x2, + HDMI_MC_CLKDIS_PIXELCLK_DISABLE = 0x1, + +/* MC_SWRSTZ field values */ + HDMI_MC_SWRSTZ_TMDSSWRST_REQ = 0x02, + +/* MC_FLOWCTRL field values */ + HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_MASK = 0x1, + HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_CSC_IN_PATH = 0x1, + HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_CSC_BYPASS = 0x0, + +/* MC_PHYRSTZ field values */ + HDMI_MC_PHYRSTZ_ASSERT = 0x0, + HDMI_MC_PHYRSTZ_DEASSERT = 0x1, + +/* MC_HEACPHY_RST field values */ + HDMI_MC_HEACPHY_RST_ASSERT = 0x1, + HDMI_MC_HEACPHY_RST_DEASSERT = 0x0, + +/* CSC_CFG field values */ + HDMI_CSC_CFG_INTMODE_MASK = 0x30, + HDMI_CSC_CFG_INTMODE_OFFSET = 4, + HDMI_CSC_CFG_INTMODE_DISABLE = 0x00, + HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1 = 0x10, + HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA2 = 0x20, + HDMI_CSC_CFG_DECMODE_MASK = 0x3, + HDMI_CSC_CFG_DECMODE_OFFSET = 0, + HDMI_CSC_CFG_DECMODE_DISABLE = 0x0, + HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA1 = 0x1, + HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA2 = 0x2, + HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3 = 0x3, + +/* CSC_SCALE field values */ + HDMI_CSC_SCALE_CSC_COLORDE_PTH_MASK = 0xF0, + HDMI_CSC_SCALE_CSC_COLORDE_PTH_24BPP = 0x00, + HDMI_CSC_SCALE_CSC_COLORDE_PTH_30BPP = 0x50, + HDMI_CSC_SCALE_CSC_COLORDE_PTH_36BPP = 0x60, + HDMI_CSC_SCALE_CSC_COLORDE_PTH_48BPP = 0x70, + HDMI_CSC_SCALE_CSCSCALE_MASK = 0x03, + +/* A_HDCPCFG0 field values */ + HDMI_A_HDCPCFG0_ELVENA_MASK = 0x80, + HDMI_A_HDCPCFG0_ELVENA_ENABLE = 0x80, + HDMI_A_HDCPCFG0_ELVENA_DISABLE = 0x00, + HDMI_A_HDCPCFG0_I2CFASTMODE_MASK = 0x40, + HDMI_A_HDCPCFG0_I2CFASTMODE_ENABLE = 0x40, + HDMI_A_HDCPCFG0_I2CFASTMODE_DISABLE = 0x00, + HDMI_A_HDCPCFG0_BYPENCRYPTION_MASK = 0x20, + HDMI_A_HDCPCFG0_BYPENCRYPTION_ENABLE = 0x20, + HDMI_A_HDCPCFG0_BYPENCRYPTION_DISABLE = 0x00, + HDMI_A_HDCPCFG0_SYNCRICHECK_MASK = 0x10, + HDMI_A_HDCPCFG0_SYNCRICHECK_ENABLE = 0x10, + HDMI_A_HDCPCFG0_SYNCRICHECK_DISABLE = 0x00, + HDMI_A_HDCPCFG0_AVMUTE_MASK = 0x8, + HDMI_A_HDCPCFG0_AVMUTE_ENABLE = 0x8, + HDMI_A_HDCPCFG0_AVMUTE_DISABLE = 0x0, + HDMI_A_HDCPCFG0_RXDETECT_MASK = 0x4, + HDMI_A_HDCPCFG0_RXDETECT_ENABLE = 0x4, + HDMI_A_HDCPCFG0_RXDETECT_DISABLE = 0x0, + HDMI_A_HDCPCFG0_EN11FEATURE_MASK = 0x2, + HDMI_A_HDCPCFG0_EN11FEATURE_ENABLE = 0x2, + HDMI_A_HDCPCFG0_EN11FEATURE_DISABLE = 0x0, + HDMI_A_HDCPCFG0_HDMIDVI_MASK = 0x1, + HDMI_A_HDCPCFG0_HDMIDVI_HDMI = 0x1, + HDMI_A_HDCPCFG0_HDMIDVI_DVI = 0x0, + +/* A_HDCPCFG1 field values */ + HDMI_A_HDCPCFG1_DISSHA1CHECK_MASK = 0x8, + HDMI_A_HDCPCFG1_DISSHA1CHECK_DISABLE = 0x8, + HDMI_A_HDCPCFG1_DISSHA1CHECK_ENABLE = 0x0, + HDMI_A_HDCPCFG1_PH2UPSHFTENC_MASK = 0x4, + HDMI_A_HDCPCFG1_PH2UPSHFTENC_ENABLE = 0x4, + HDMI_A_HDCPCFG1_PH2UPSHFTENC_DISABLE = 0x0, + HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_MASK = 0x2, + HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_DISABLE = 0x2, + HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_ENABLE = 0x0, + HDMI_A_HDCPCFG1_SWRESET_MASK = 0x1, + HDMI_A_HDCPCFG1_SWRESET_ASSERT = 0x0, + +/* A_VIDPOLCFG field values */ + HDMI_A_VIDPOLCFG_UNENCRYPTCONF_MASK = 0x60, + HDMI_A_VIDPOLCFG_UNENCRYPTCONF_OFFSET = 5, + HDMI_A_VIDPOLCFG_DATAENPOL_MASK = 0x10, + HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_HIGH = 0x10, + HDMI_A_VIDPOLCFG_DATAENPOL_ACTIVE_LOW = 0x0, + HDMI_A_VIDPOLCFG_VSYNCPOL_MASK = 0x8, + HDMI_A_VIDPOLCFG_VSYNCPOL_ACTIVE_HIGH = 0x8, + HDMI_A_VIDPOLCFG_VSYNCPOL_ACTIVE_LOW = 0x0, + HDMI_A_VIDPOLCFG_HSYNCPOL_MASK = 0x2, + HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_HIGH = 0x2, + HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW = 0x0, +}; + +#endif /* __MXC_HDMI_H__ */ -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 2/3] i.MX6: Add hdmidet command to detect attached HDMI monitor 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 1/3] i.MX6: add HDMI transmitter register declarations from kernel WIP Eric Nelson @ 2012-09-23 23:02 ` Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 3/3] i.MX6: mx6qsabrelite: Include hdmidet command Eric Nelson 2012-10-02 8:28 ` [U-Boot] [PATCH 0/3] i.MX6: implement " Stefano Babic 3 siblings, 0 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 23:02 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/cmd_hdmidet.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 arch/arm/imx-common/cmd_hdmidet.c diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 31dc52e..7c1e34c 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -33,6 +33,7 @@ COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o endif COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o COBJS-y += preboot_os.o +COBJS-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o COBJS := $(sort $(COBJS-y)) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/imx-common/cmd_hdmidet.c new file mode 100644 index 0000000..ede5d88 --- /dev/null +++ b/arch/arm/imx-common/cmd_hdmidet.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#include <common.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/io.h> + +int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + u8 reg = __raw_readb(HDMI_ARB_BASE_ADDR+HDMI_PHY_STAT0); + return (reg&HDMI_PHY_HPD) + ? 0 : 1; +} + +U_BOOT_CMD(hdmidet, 1, 1, do_hdmidet, + "detect HDMI monitor", + "" +); -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 3/3] i.MX6: mx6qsabrelite: Include hdmidet command. 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 1/3] i.MX6: add HDMI transmitter register declarations from kernel WIP Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 2/3] i.MX6: Add hdmidet command to detect attached HDMI monitor Eric Nelson @ 2012-09-23 23:02 ` Eric Nelson 2012-10-02 8:28 ` [U-Boot] [PATCH 0/3] i.MX6: implement " Stefano Babic 3 siblings, 0 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 23:02 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 6 ++++++ include/configs/mx6qsabrelite.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index d274d8c..ed60c6d 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -551,6 +551,12 @@ void lcd_iomux(void) |MXC_CCM_CCGR3_LDB_DI0_MASK; writel(reg, &mxc_ccm->CCGR3); + /* Turn on HDMI PHY clock */ + reg = __raw_readl(&mxc_ccm->CCGR2); + reg |= MXC_CCM_CCGR2_HDMI_TX_IAHBCLK_MASK + |MXC_CCM_CCGR2_HDMI_TX_ISFRCLK_MASK; + writel(reg, &mxc_ccm->CCGR2); + /* set PFD1_FRAC to 0x13 == 455 MHz (480*18)/0x13 */ writel(ANATOP_PFD_480_PFD1_FRAC_MASK, &anatop->pfd_480_clr); writel(0x13<<ANATOP_PFD_480_PFD1_FRAC_SHIFT, &anatop->pfd_480_set); diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 8601685..80707d0 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -144,6 +144,7 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 +#define CONFIG_CMD_HDMIDETECT /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson ` (2 preceding siblings ...) 2012-09-23 23:02 ` [U-Boot] [PATCH 3/3] i.MX6: mx6qsabrelite: Include hdmidet command Eric Nelson @ 2012-10-02 8:28 ` Stefano Babic 3 siblings, 0 replies; 33+ messages in thread From: Stefano Babic @ 2012-10-02 8:28 UTC (permalink / raw) To: u-boot On 24/09/2012 01:02, Eric Nelson wrote: > This series implements an HDMI detection command for i.MX6 boards > and configures mx6qsabrelite to use it as discussed in this > thread on the ML: > http://lists.denx.de/pipermail/u-boot/2012-September/135037.html > > Applied to u-boot-imx, next branch, thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm 2012-09-23 17:27 ` Stefano Babic 2012-09-23 18:13 ` [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) Eric Nelson @ 2012-09-23 18:15 ` Sascha Hauer 1 sibling, 0 replies; 33+ messages in thread From: Sascha Hauer @ 2012-09-23 18:15 UTC (permalink / raw) To: u-boot On Sun, Sep 23, 2012 at 07:27:41PM +0200, Stefano Babic wrote: > > > > > I would like to see a handoff of display settings from U-Boot to > > the kernel, but that's also a tricky thing as long as we're supporting > > different mechanisms (DT in main-line and kernel parameters in > > older kernels). > > Yes, and a lot of other things. I know Anatolji implemented this > behavior for a PPC5121, but we cannot generalize. I agree that the > handoff is difficult and not maintainable. My question is different: if > the IPU drivers in kernel are compiled as modules, and I will load them > only after booting, and the framebuffer's memory is reserved so that the > kernel does not touch it, is there still a known reason because the IPU > should not run when we boot the kernel? I know this issue with USB, > maybe we have now the same with the IPU. The clock framework disables all unused clocks in a late_initcall. when the IPU is compiled as a module, the IPU clock will be one of those. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting 2012-09-23 16:46 ` Eric Nelson 2012-09-23 16:59 ` Fabio Estevam 2012-09-23 17:27 ` Stefano Babic @ 2012-09-23 17:30 ` Eric Nelson 2012-09-23 17:30 ` [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer Eric Nelson 2012-09-23 17:30 ` [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S Eric Nelson 2 siblings, 2 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-23 17:30 UTC (permalink / raw) To: u-boot V2 moves arch_preboot_os() into arch/arm/imx-common/cpu.c ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer 2012-09-23 17:30 ` [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting Eric Nelson @ 2012-09-23 17:30 ` Eric Nelson 2012-09-24 8:50 ` Stefano Babic 2012-09-23 17:30 ` [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S Eric Nelson 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-23 17:30 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Tested-by: Fabio Estevam <fabio.estevam@freescale.com> --- V2 is unchanged from V1 drivers/video/mxc_ipuv3_fb.c | 20 ++++++++++++++++++++ include/ipu_pixfmt.h | 1 + 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index c38e22d..47b336e 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -38,6 +38,7 @@ #include "videomodes.h" #include "ipu.h" #include "mxcfb.h" +#include "ipu_regs.h" static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi); @@ -576,6 +577,25 @@ err0: return ret; } +void ipuv3_fb_shutdown(void) +{ + int i; + struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT; + + for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) { + struct fb_info *fbi = mxcfb_info[i]; + if (fbi) { + struct mxcfb_info *mxc_fbi = fbi->par; + ipu_disable_channel(mxc_fbi->ipu_ch); + ipu_uninit_channel(mxc_fbi->ipu_ch); + } + } + for (i = 0; i < ARRAY_SIZE(stat->int_stat); i++) { + __raw_writel(__raw_readl(&stat->int_stat[i]), + &stat->int_stat[i]); + } +} + void *video_hw_init(void) { int ret; diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h index 0019898..4baa711 100644 --- a/include/ipu_pixfmt.h +++ b/include/ipu_pixfmt.h @@ -77,5 +77,6 @@ #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*< 16 YUV 4:2:2 */ int ipuv3_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt); +void ipuv3_fb_shutdown(void); #endif -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer 2012-09-23 17:30 ` [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer Eric Nelson @ 2012-09-24 8:50 ` Stefano Babic 0 siblings, 0 replies; 33+ messages in thread From: Stefano Babic @ 2012-09-24 8:50 UTC (permalink / raw) To: u-boot On 23/09/2012 19:30, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > Tested-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > V2 is unchanged from V1 > Applied to u-boot-imx (fix), thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S 2012-09-23 17:30 ` [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting Eric Nelson 2012-09-23 17:30 ` [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer Eric Nelson @ 2012-09-23 17:30 ` Eric Nelson 2012-09-24 8:50 ` Stefano Babic 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-23 17:30 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- V2 moves arch_preboot_os() into imx-common/cpu.c instead of adding file imx-common/preboot.c arch/arm/imx-common/cpu.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index fa1d468..a10d12d 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -30,6 +30,7 @@ #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <ipu_pixfmt.h> #ifdef CONFIG_FSL_ESDHC #include <fsl_esdhc.h> @@ -138,3 +139,11 @@ u32 get_ahb_clk(void) return get_periph_clk() / (ahb_podf + 1); } + +#if defined(CONFIG_VIDEO_IPUV3) +void arch_preboot_os(void) +{ + /* disable video before launching O/S */ + ipuv3_fb_shutdown(); +} +#endif -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S 2012-09-23 17:30 ` [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S Eric Nelson @ 2012-09-24 8:50 ` Stefano Babic 0 siblings, 0 replies; 33+ messages in thread From: Stefano Babic @ 2012-09-24 8:50 UTC (permalink / raw) To: u-boot On 23/09/2012 19:30, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > --- Applied to u-boot-imx (fix), thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 2/2] i.MX: shut down video before launch of O/S 2012-09-21 20:36 ` [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S Eric Nelson 2012-09-21 20:36 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Eric Nelson @ 2012-09-21 20:36 ` Eric Nelson 2012-09-21 22:41 ` Fabio Estevam 1 sibling, 1 reply; 33+ messages in thread From: Eric Nelson @ 2012-09-21 20:36 UTC (permalink / raw) To: u-boot Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/preboot_os.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) create mode 100644 arch/arm/imx-common/preboot_os.c diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index b3e608e..31dc52e 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -32,6 +32,7 @@ COBJS-y = iomux-v3.o timer.o cpu.o speed.o COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o endif COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o +COBJS-y += preboot_os.o COBJS := $(sort $(COBJS-y)) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/arch/arm/imx-common/preboot_os.c b/arch/arm/imx-common/preboot_os.c new file mode 100644 index 0000000..ed7a9e0 --- /dev/null +++ b/arch/arm/imx-common/preboot_os.c @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#include <common.h> + +#if defined(CONFIG_VIDEO_IPUV3) +#include <ipu_pixfmt.h> +#endif + +void arch_preboot_os(void) +{ +#if defined(CONFIG_VIDEO_IPUV3) + /* disable video before launching O/S */ + ipuv3_fb_shutdown(); +#endif +} -- 1.7.9 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 2/2] i.MX: shut down video before launch of O/S 2012-09-21 20:36 ` [U-Boot] [PATCH " Eric Nelson @ 2012-09-21 22:41 ` Fabio Estevam 2012-09-21 23:02 ` Eric Nelson 0 siblings, 1 reply; 33+ messages in thread From: Fabio Estevam @ 2012-09-21 22:41 UTC (permalink / raw) To: u-boot Hi Eric, Thanks for working on this. I will try it probably tomorrow. On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson <eric.nelson@boundarydevices.com> wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Please add a commit log description. This is an important bug fix. With the framebuffer enabled in U-boot, I get kernel hangs at aproximately 50% of the times I boot a 2.6.35 kernel on a mx53qsb. > --- > arch/arm/imx-common/Makefile | 1 + > arch/arm/imx-common/preboot_os.c | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/imx-common/preboot_os.c > > diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > index b3e608e..31dc52e 100644 > --- a/arch/arm/imx-common/Makefile > +++ b/arch/arm/imx-common/Makefile > @@ -32,6 +32,7 @@ COBJS-y = iomux-v3.o timer.o cpu.o speed.o > COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o > endif > COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o > +COBJS-y += preboot_os.o > COBJS := $(sort $(COBJS-y)) > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > diff --git a/arch/arm/imx-common/preboot_os.c b/arch/arm/imx-common/preboot_os.c > new file mode 100644 > index 0000000..ed7a9e0 > --- /dev/null > +++ b/arch/arm/imx-common/preboot_os.c Do we really need a new file to store a single function? What about placing it at arch/arm/imx-common/cpu.c ? > @@ -0,0 +1,34 @@ > +/* > + * Copyright (C) 2012 Boundary Devices Inc. > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > +#include <common.h> > + > +#if defined(CONFIG_VIDEO_IPUV3) > +#include <ipu_pixfmt.h> > +#endif ifdef's for headers is not recommended. > + > +void arch_preboot_os(void) > +{ > +#if defined(CONFIG_VIDEO_IPUV3) > + /* disable video before launching O/S */ > + ipuv3_fb_shutdown(); > +#endif The #if defined(CONFIG_VIDEO_IPUV3) could go outside of the arch_preboot_os(). Regards, Fabio Estevam ^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH 2/2] i.MX: shut down video before launch of O/S 2012-09-21 22:41 ` Fabio Estevam @ 2012-09-21 23:02 ` Eric Nelson 0 siblings, 0 replies; 33+ messages in thread From: Eric Nelson @ 2012-09-21 23:02 UTC (permalink / raw) To: u-boot Hi Fabio, On 09/21/2012 03:41 PM, Fabio Estevam wrote: > Hi Eric, > > Thanks for working on this. I will try it probably tomorrow. > > On Fri, Sep 21, 2012 at 5:36 PM, Eric Nelson > <eric.nelson@boundarydevices.com> wrote: >> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> > > Please add a commit log description. This is an important bug fix. > > With the framebuffer enabled in U-boot, I get kernel hangs at > aproximately 50% of the times I boot a 2.6.35 kernel on a mx53qsb. > Ok. >> --- >> arch/arm/imx-common/Makefile | 1 + >> arch/arm/imx-common/preboot_os.c | 34 ++++++++++++++++++++++++++++++++++ >> 2 files changed, 35 insertions(+), 0 deletions(-) >> create mode 100644 arch/arm/imx-common/preboot_os.c >> >> diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile >> index b3e608e..31dc52e 100644 >> --- a/arch/arm/imx-common/Makefile >> +++ b/arch/arm/imx-common/Makefile >> @@ -32,6 +32,7 @@ COBJS-y = iomux-v3.o timer.o cpu.o speed.o >> COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o >> endif >> COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o >> +COBJS-y += preboot_os.o >> COBJS := $(sort $(COBJS-y)) >> >> SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) >> diff --git a/arch/arm/imx-common/preboot_os.c b/arch/arm/imx-common/preboot_os.c >> new file mode 100644 >> index 0000000..ed7a9e0 >> --- /dev/null >> +++ b/arch/arm/imx-common/preboot_os.c > > Do we really need a new file to store a single function? > > What about placing it at arch/arm/imx-common/cpu.c ? > That seems reasonable. >> @@ -0,0 +1,34 @@ >> +/* >> + * Copyright (C) 2012 Boundary Devices Inc. >> + * >> + * See file CREDITS for list of people who contributed to this >> + * project. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License as >> + * published by the Free Software Foundation; either version 2 of >> + * the License, or (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, >> + * MA 02111-1307 USA >> + */ >> +#include<common.h> >> + >> +#if defined(CONFIG_VIDEO_IPUV3) >> +#include<ipu_pixfmt.h> >> +#endif > > ifdef's for headers is not recommended. > Ok. >> + >> +void arch_preboot_os(void) >> +{ >> +#if defined(CONFIG_VIDEO_IPUV3) >> + /* disable video before launching O/S */ >> + ipuv3_fb_shutdown(); >> +#endif > > The #if defined(CONFIG_VIDEO_IPUV3) could go outside of the arch_preboot_os(). > That occurred to me as well, but I figured this might not be the only bit that could/should/might be shut down prior to O/S boot (USB?) and that this would make that clearer. Regards, Eric ^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2012-10-16 3:58 UTC | newest] Thread overview: 33+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-21 16:38 [U-Boot] Disabling video in bootm (cleanup_before_linux) Eric Nelson 2012-09-21 17:22 ` Anatolij Gustschin 2012-09-21 17:44 ` Eric Nelson 2012-09-22 13:35 ` Otavio Salvador 2012-09-22 15:35 ` Eric Nelson 2012-09-22 15:37 ` Otavio Salvador 2012-09-21 20:36 ` [U-Boot] [PATCH 0/2] i.MX: ipufb: shut down IPU frame buffer before booting O/S Eric Nelson 2012-09-21 20:36 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Eric Nelson 2012-09-22 13:42 ` Otavio Salvador 2012-09-22 14:37 ` Fabio Estevam 2012-09-22 14:39 ` Otavio Salvador 2012-09-23 15:56 ` Stefano Babic 2012-09-23 16:32 ` Dirk Behme 2012-09-23 16:46 ` Eric Nelson 2012-09-23 16:59 ` Fabio Estevam 2012-09-23 17:27 ` Stefano Babic 2012-09-23 18:13 ` [U-Boot] Displays on i.MX (was Re: [PATCH 1/2]) Eric Nelson 2012-09-23 20:12 ` [U-Boot] [PATCH] i2c_probe: update for use in scripting Eric Nelson 2012-10-16 3:58 ` Heiko Schocher 2012-09-23 23:02 ` [U-Boot] [PATCH 0/3] i.MX6: implement hdmidet command Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 1/3] i.MX6: add HDMI transmitter register declarations from kernel WIP Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 2/3] i.MX6: Add hdmidet command to detect attached HDMI monitor Eric Nelson 2012-09-23 23:02 ` [U-Boot] [PATCH 3/3] i.MX6: mx6qsabrelite: Include hdmidet command Eric Nelson 2012-10-02 8:28 ` [U-Boot] [PATCH 0/3] i.MX6: implement " Stefano Babic 2012-09-23 18:15 ` [U-Boot] [PATCH 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU before bootm Sascha Hauer 2012-09-23 17:30 ` [U-Boot] [PATCH V2 0/2] i.MX: ipufb: shut down IPU frame buffer before booting Eric Nelson 2012-09-23 17:30 ` [U-Boot] [PATCH V2 1/2] i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer Eric Nelson 2012-09-24 8:50 ` Stefano Babic 2012-09-23 17:30 ` [U-Boot] [PATCH V2 2/2] i.MX: shut down video before launch of O/S Eric Nelson 2012-09-24 8:50 ` Stefano Babic 2012-09-21 20:36 ` [U-Boot] [PATCH " Eric Nelson 2012-09-21 22:41 ` Fabio Estevam 2012-09-21 23:02 ` Eric Nelson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox