Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83713fc9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Sekhar Nori
Browse files

ARM: davinci: dm646x evm: wrong register used in setup_vpif_input_channel_mode 



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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarManjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Cc: stable@kernel.org
parent 9ab409e4

arch/arm/mach-davinci/board-dm646x-evm.c

+3 −3
Original line number Diff line number Diff line
@@ -564,7 +564,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);
@@ -572,7 +572,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;
@@ -580,7 +580,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);