Hans, Thank you for the patch. I have verified from the data sheet. It might be a copy mistake. It also says the vpif_vsclkdis_reg can be used to disable and enable in case we make any clock switches so as to avoid glitches. In this case I would imagine we would stream off before switching, so That might not be a necessity. I have not been able to test this however. Trust you would have.
Acked-by: Manjunath Hadli <[email protected]> Thanks and Regards, -Manju On Mon, Nov 14, 2011 at 23:50:49, Hans Verkuil wrote: > From: Hans Verkuil <[email protected]> > > The function setup_vpif_input_channel_mode() used the VSCLKDIS register > instead of VIDCLKCTL. This meant that when in HD mode videoport channel 0 > used a different clock from channel 1. > > Clearly a copy-and-paste error. > > Signed-off-by: Hans Verkuil <[email protected]> > --- > arch/arm/mach-davinci/board-dm646x-evm.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c > b/arch/arm/mach-davinci/board-dm646x-evm.c > index 337c45e..607a527 100644 > --- a/arch/arm/mach-davinci/board-dm646x-evm.c > +++ b/arch/arm/mach-davinci/board-dm646x-evm.c > @@ -563,7 +563,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) > int val; > u32 value; > > - if (!vpif_vsclkdis_reg || !cpld_client) > + if (!vpif_vidclkctl_reg || !cpld_client) > return -ENXIO; > > val = i2c_smbus_read_byte(cpld_client); @@ -571,7 +571,7 @@ static int > setup_vpif_input_channel_mode(int mux_mode) > return val; > > spin_lock_irqsave(&vpif_reg_lock, flags); > - value = __raw_readl(vpif_vsclkdis_reg); > + value = __raw_readl(vpif_vidclkctl_reg); > if (mux_mode) { > val &= VPIF_INPUT_TWO_CHANNEL; > value |= VIDCH1CLK; > @@ -579,7 +579,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) > val |= VPIF_INPUT_ONE_CHANNEL; > value &= ~VIDCH1CLK; > } > - __raw_writel(value, vpif_vsclkdis_reg); > + __raw_writel(value, vpif_vidclkctl_reg); > spin_unlock_irqrestore(&vpif_reg_lock, flags); > > err = i2c_smbus_write_byte(cpld_client, val); > -- > 1.7.7 > > _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
