[V2,05/13] cx231xx: Modifiy the symbolic constants for i2c ports and describe
Commit Message
Change to I2C_0 ... I2C_2 for the master ports
and add I2C_1_MUX_1 and I2C_1_MUX_3 for the muxed ones.
V2: Renamed mux adapters to seperate them from master adapters.
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
---
drivers/media/usb/cx231xx/cx231xx.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
Comments
Reviewed-by: Antti Palosaari <crope@iki.fi>
Antti
On 10/01/2014 08:20 AM, Matthias Schwarzott wrote:
> Change to I2C_0 ... I2C_2 for the master ports
> and add I2C_1_MUX_1 and I2C_1_MUX_3 for the muxed ones.
>
> V2: Renamed mux adapters to seperate them from master adapters.
>
> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> ---
> drivers/media/usb/cx231xx/cx231xx.h | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
> index c92382f..377216b 100644
> --- a/drivers/media/usb/cx231xx/cx231xx.h
> +++ b/drivers/media/usb/cx231xx/cx231xx.h
> @@ -322,10 +322,11 @@ enum cx231xx_decoder {
> };
>
> enum CX231XX_I2C_MASTER_PORT {
> - I2C_0 = 0,
> - I2C_1 = 1,
> - I2C_2 = 2,
> - I2C_3 = 3
> + I2C_0 = 0, /* master 0 - internal connection */
> + I2C_1 = 1, /* master 1 - used with mux */
> + I2C_2 = 2, /* master 2 */
> + I2C_1_MUX_1 = 3, /* master 1 - port 1 (I2C_DEMOD_EN = 0) */
> + I2C_1_MUX_3 = 4 /* master 1 - port 3 (I2C_DEMOD_EN = 1) */
> };
>
> struct cx231xx_board {
>
@@ -322,10 +322,11 @@ enum cx231xx_decoder {
};
enum CX231XX_I2C_MASTER_PORT {
- I2C_0 = 0,
- I2C_1 = 1,
- I2C_2 = 2,
- I2C_3 = 3
+ I2C_0 = 0, /* master 0 - internal connection */
+ I2C_1 = 1, /* master 1 - used with mux */
+ I2C_2 = 2, /* master 2 */
+ I2C_1_MUX_1 = 3, /* master 1 - port 1 (I2C_DEMOD_EN = 0) */
+ I2C_1_MUX_3 = 4 /* master 1 - port 3 (I2C_DEMOD_EN = 1) */
};
struct cx231xx_board {