diff options
Diffstat (limited to 'arch/arm/mach-davinci/board-dm646x-evm.c')
| -rw-r--r-- | 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 e574d7f837a8..635bf7740157 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
| @@ -564,7 +564,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) | |||
| 564 | int val; | 564 | int val; |
| 565 | u32 value; | 565 | u32 value; |
| 566 | 566 | ||
| 567 | if (!vpif_vsclkdis_reg || !cpld_client) | 567 | if (!vpif_vidclkctl_reg || !cpld_client) |
| 568 | return -ENXIO; | 568 | return -ENXIO; |
| 569 | 569 | ||
| 570 | val = i2c_smbus_read_byte(cpld_client); | 570 | val = i2c_smbus_read_byte(cpld_client); |
| @@ -572,7 +572,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) | |||
| 572 | return val; | 572 | return val; |
| 573 | 573 | ||
| 574 | spin_lock_irqsave(&vpif_reg_lock, flags); | 574 | spin_lock_irqsave(&vpif_reg_lock, flags); |
| 575 | value = __raw_readl(vpif_vsclkdis_reg); | 575 | value = __raw_readl(vpif_vidclkctl_reg); |
| 576 | if (mux_mode) { | 576 | if (mux_mode) { |
| 577 | val &= VPIF_INPUT_TWO_CHANNEL; | 577 | val &= VPIF_INPUT_TWO_CHANNEL; |
| 578 | value |= VIDCH1CLK; | 578 | value |= VIDCH1CLK; |
| @@ -580,7 +580,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) | |||
| 580 | val |= VPIF_INPUT_ONE_CHANNEL; | 580 | val |= VPIF_INPUT_ONE_CHANNEL; |
| 581 | value &= ~VIDCH1CLK; | 581 | value &= ~VIDCH1CLK; |
| 582 | } | 582 | } |
| 583 | __raw_writel(value, vpif_vsclkdis_reg); | 583 | __raw_writel(value, vpif_vidclkctl_reg); |
| 584 | spin_unlock_irqrestore(&vpif_reg_lock, flags); | 584 | spin_unlock_irqrestore(&vpif_reg_lock, flags); |
| 585 | 585 | ||
| 586 | err = i2c_smbus_write_byte(cpld_client, val); | 586 | err = i2c_smbus_write_byte(cpld_client, val); |
