diff options
| -rw-r--r-- | drivers/i2c/busses/i2c-rcar.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 8603f5e805aa..2c2fd7c2b116 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c | |||
| @@ -103,8 +103,8 @@ enum { | |||
| 103 | #define ID_NACK (1 << 4) | 103 | #define ID_NACK (1 << 4) |
| 104 | 104 | ||
| 105 | enum rcar_i2c_type { | 105 | enum rcar_i2c_type { |
| 106 | I2C_RCAR_H1, | 106 | I2C_RCAR_GEN1, |
| 107 | I2C_RCAR_H2, | 107 | I2C_RCAR_GEN2, |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| 110 | struct rcar_i2c_priv { | 110 | struct rcar_i2c_priv { |
| @@ -240,10 +240,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv, | |||
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | switch (priv->devtype) { | 242 | switch (priv->devtype) { |
| 243 | case I2C_RCAR_H1: | 243 | case I2C_RCAR_GEN1: |
| 244 | cdf_width = 2; | 244 | cdf_width = 2; |
| 245 | break; | 245 | break; |
| 246 | case I2C_RCAR_H2: | 246 | case I2C_RCAR_GEN2: |
| 247 | cdf_width = 3; | 247 | cdf_width = 3; |
| 248 | break; | 248 | break; |
| 249 | default: | 249 | default: |
| @@ -640,10 +640,10 @@ static const struct i2c_algorithm rcar_i2c_algo = { | |||
| 640 | }; | 640 | }; |
| 641 | 641 | ||
| 642 | static const struct of_device_id rcar_i2c_dt_ids[] = { | 642 | static const struct of_device_id rcar_i2c_dt_ids[] = { |
| 643 | { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_H1 }, | 643 | { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 }, |
| 644 | { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_H1 }, | 644 | { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 }, |
| 645 | { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_H1 }, | 645 | { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 }, |
| 646 | { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_H2 }, | 646 | { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 }, |
| 647 | {}, | 647 | {}, |
| 648 | }; | 648 | }; |
| 649 | MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); | 649 | MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); |
| @@ -731,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev) | |||
| 731 | } | 731 | } |
| 732 | 732 | ||
| 733 | static struct platform_device_id rcar_i2c_id_table[] = { | 733 | static struct platform_device_id rcar_i2c_id_table[] = { |
| 734 | { "i2c-rcar", I2C_RCAR_H1 }, | 734 | { "i2c-rcar", I2C_RCAR_GEN1 }, |
| 735 | { "i2c-rcar_h1", I2C_RCAR_H1 }, | 735 | { "i2c-rcar_gen1", I2C_RCAR_GEN1 }, |
| 736 | { "i2c-rcar_h2", I2C_RCAR_H2 }, | 736 | { "i2c-rcar_gen2", I2C_RCAR_GEN2 }, |
| 737 | {}, | 737 | {}, |
| 738 | }; | 738 | }; |
| 739 | MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table); | 739 | MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table); |
