From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Nelson Date: Mon, 24 Sep 2012 08:11:59 -0700 Subject: [U-Boot] [PATCH V4] i.MX6: mx6qsabrelite: Add splash screen support In-Reply-To: <50607620.50701@denx.de> References: <1348268030-28723-1-git-send-email-eric.nelson@boundarydevices.com> <50607620.50701@denx.de> Message-ID: <5060783F.50208@boundarydevices.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Sorry Stefano, On 09/24/2012 08:02 AM, Stefano Babic wrote: > On 22/09/2012 00:53, Eric Nelson wrote: >> Adds support for two LVDS panels and one RGB panel to the SABRE-Lite >> board: >> Hannstar-XGA - 1024 x 768 LVDS (Freescale part number MCIMX-LVDS1) >> wsvga-lvds - 1024 x 600 LVDS (Boundary p/n Nit6X_1024x600) >> wvga-rgb - 800 x 480 RGB (Boundary p/n Nit6X_800x480) >> >> Auto-detects panel by probing the I2C touch controller of each. >> >> Setting 'panel' environment variable to one of the names above will override >> auto-detection. >> >> Signed-off-by: Eric Nelson >> --- > > >> board/freescale/mx6qsabrelite/mx6qsabrelite.c | 245 ++++++++++++++++++++++++- >> drivers/video/ipu_common.c | 2 +- >> include/configs/mx6qsabrelite.h | 15 ++- >> 3 files changed, 259 insertions(+), 3 deletions(-) > > Between V3 and V4 you changed also ipu_common.c, and that change does > not apply. > >> /* address of boot parameters */ >> diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c >> index cc8f881..5f0a1a8 100644 >> --- a/drivers/video/ipu_common.c >> +++ b/drivers/video/ipu_common.c >> @@ -218,7 +218,7 @@ static struct clk ipu_clk = { >> #else >> .enable_reg = (u32 *)(CCM_BASE_ADDR + >> offsetof(struct mxc_ccm_reg, CCGR3)), >> - .enable_shift = MXC_CCM_CCGR3_IPU1_IPU_DI0_OFFSET, >> + .enable_shift = MXC_CCM_CCGR3_IPU1_IPU_MASK, > > But in ipu_common.c: > > .enable_reg = (u32 *)(CCM_BASE_ADDR + > offsetof(struct mxc_ccm_reg, CCGR5)), > .enable_shift = MXC_CCM_CCGR5_CG5_OFFSET, > CCGR5/CG5 is the IPU clock on i.MX5x, not i.MX6x. > I do not see another patch changing that. Am I missing something ? > This patch requires the previous change to name the CCGRx bitfields: http://patchwork.ozlabs.org/patch/185856/ Regards, Eric