drm: bridge: adv7511: Add support for ADV7535

ADV7535 is a DSI to HDMI bridge chip like ADV7533 but it allows
1080p@60Hz. v1p2 is fixed to 1.8V on ADV7535.

Signed-off-by: Bogdan Togorean <bogdan.togorean@analog.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200121082719.27972-3-bogdan.togorean@analog.com

diff --git a/drivers/gpu/drm/bridge/adv7511/Kconfig b/drivers/gpu/drm/bridge/adv7511/Kconfig
index a7fe071..47d4eb9 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/Kconfig
+++ b/drivers/gpu/drm/bridge/adv7511/Kconfig
@@ -6,7 +6,7 @@ config DRM_I2C_ADV7511
        select REGMAP_I2C
        select DRM_MIPI_DSI
        help
-         Support for the Analog Device ADV7511(W)/13/33 HDMI encoders.
+         Support for the Analog Device ADV7511(W)/13/33/35 HDMI encoders.
 
 config DRM_I2C_ADV7511_AUDIO
        bool "ADV7511 HDMI Audio driver"
@@ -17,7 +17,7 @@ config DRM_I2C_ADV7511_AUDIO
          conjunction with the AV7511  HDMI driver.
 
 config DRM_I2C_ADV7511_CEC
-       bool "ADV7511/33 HDMI CEC driver"
+       bool "ADV7511/33/35 HDMI CEC driver"
        depends on DRM_I2C_ADV7511
        select CEC_CORE
        default y

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index 12552d5..a9bb734 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -320,6 +320,7 @@ struct adv7511_video_config {
 enum adv7511_type {
        ADV7511,
        ADV7533,
+       ADV7535,
 };
 
 #define ADV7511_MAX_ADDRS 3

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 34df29d..a275e6c 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -367,7 +367,7 @@ static void adv7511_power_on(struct adv7511 *adv7511)
         */
        regcache_sync(adv7511->regmap);
 
-       if (adv7511->type == ADV7533)
+       if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                adv7533_dsi_power_on(adv7511);
        adv7511->powered = true;
 }
@@ -387,7 +387,7 @@ static void __adv7511_power_off(struct adv7511 *adv7511)
 static void adv7511_power_off(struct adv7511 *adv7511)
 {
        __adv7511_power_off(adv7511);
-       if (adv7511->type == ADV7533)
+       if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                adv7533_dsi_power_off(adv7511);
        adv7511->powered = false;
 }
@@ -761,7 +761,7 @@ static void adv7511_mode_set(struct adv7511 *adv7511,
        regmap_update_bits(adv7511->regmap, 0x17,
                0x60, (vsync_polarity << 6) | (hsync_polarity << 5));
 
-       if (adv7511->type == ADV7533)
+       if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                adv7533_mode_set(adv7511, adj_mode);
 
        drm_mode_copy(&adv7511->curr_mode, adj_mode);
@@ -874,7 +874,7 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge)
                                 &adv7511_connector_helper_funcs);
        drm_connector_attach_encoder(&adv->connector, bridge->encoder);
 
-       if (adv->type == ADV7533)
+       if (adv->type == ADV7533 || adv->type == ADV7535)
                ret = adv7533_attach_dsi(adv);
 
        if (adv->i2c_main->irq)
@@ -952,7 +952,7 @@ static bool adv7511_cec_register_volatile(struct device *dev, unsigned int reg)
        struct i2c_client *i2c = to_i2c_client(dev);
        struct adv7511 *adv7511 = i2c_get_clientdata(i2c);
 
-       if (adv7511->type == ADV7533)
+       if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                reg -= ADV7533_REG_CEC_OFFSET;
 
        switch (reg) {
@@ -994,7 +994,7 @@ static int adv7511_init_cec_regmap(struct adv7511 *adv)
                goto err;
        }
 
-       if (adv->type == ADV7533) {
+       if (adv->type == ADV7533 || adv->type == ADV7535) {
                ret = adv7533_patch_cec_registers(adv);
                if (ret)
                        goto err;
@@ -1242,7 +1242,7 @@ static int adv7511_remove(struct i2c_client *i2c)
 {
        struct adv7511 *adv7511 = i2c_get_clientdata(i2c);
 
-       if (adv7511->type == ADV7533)
+       if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                adv7533_detach_dsi(adv7511);
        i2c_unregister_device(adv7511->i2c_cec);
        if (adv7511->cec_clk)
@@ -1267,6 +1267,7 @@ static const struct i2c_device_id adv7511_i2c_ids[] = {
        { "adv7511w", ADV7511 },
        { "adv7513", ADV7511 },
        { "adv7533", ADV7533 },
+       { "adv7535", ADV7535 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids);
@@ -1276,6 +1277,7 @@ static const struct of_device_id adv7511_of_ids[] = {
        { .compatible = "adi,adv7511w", .data = (void *)ADV7511 },
        { .compatible = "adi,adv7513", .data = (void *)ADV7511 },
        { .compatible = "adi,adv7533", .data = (void *)ADV7533 },
+       { .compatible = "adi,adv7535", .data = (void *)ADV7535 },
        { }
 };
 MODULE_DEVICE_TABLE(of, adv7511_of_ids);