drm: adv7511: Add reg_cec_offset variable to struct adv7511_chip_info

The ADV7533 and ADV7535 have an offset(0x70) for the CEC register map
compared to ADV7511. Add the reg_cec_offset variable to struct
adv7511_chip_info to handle this difference and drop the reg_cec_offset
variable from struct adv7511.

This will avoid assigning reg_cec_offset based on chip type and also
testing for multiple chip types by calling adv7533_patch_cec_registers().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230830142358.275459-6-biju.das.jz@bp.renesas.com

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index edf7be9c21d3a1b652c5e51e7a3eeb613698cdc1..a728bfb33d034e355166e1ff3ef85743b95a5bf4 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -339,6 +339,7 @@ struct adv7511_chip_info {
        unsigned int max_lane_freq_khz;
        const char * const *supply_names;
        unsigned int num_supplies;
+       unsigned int reg_cec_offset;
 };
 
 struct adv7511 {
@@ -349,7 +350,6 @@ struct adv7511 {
 
        struct regmap *regmap;
        struct regmap *regmap_cec;
-       unsigned int reg_cec_offset;
        enum drm_connector_status status;
        bool powered;
 

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
index 2a6b91f752cb620d44f4e7bb51655523c0a57138..44451a9658a32864275d6511c3a8f9235faf1c31 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
@@ -33,7 +33,7 @@ static const u8 ADV7511_REG_CEC_RX_FRAME_LEN[] = {
 
 static void adv_cec_tx_raw_status(struct adv7511 *adv7511, u8 tx_raw_status)
 {
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        unsigned int val;
 
        if (regmap_read(adv7511->regmap_cec,
@@ -84,7 +84,7 @@ static void adv_cec_tx_raw_status(struct adv7511 *adv7511, u8 tx_raw_status)
 
 static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)
 {
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        struct cec_msg msg = {};
        unsigned int len;
        unsigned int val;
@@ -121,7 +121,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)
 
 void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)
 {
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        const u32 irq_tx_mask = ADV7511_INT1_CEC_TX_READY |
                                ADV7511_INT1_CEC_TX_ARBIT_LOST |
                                ADV7511_INT1_CEC_TX_RETRY_TIMEOUT;
@@ -177,7 +177,7 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)
 static int adv7511_cec_adap_enable(struct cec_adapter *adap, bool enable)
 {
        struct adv7511 *adv7511 = cec_get_drvdata(adap);
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
 
        if (adv7511->i2c_cec == NULL)
                return -EIO;
@@ -223,7 +223,7 @@ static int adv7511_cec_adap_enable(struct cec_adapter *adap, bool enable)
 static int adv7511_cec_adap_log_addr(struct cec_adapter *adap, u8 addr)
 {
        struct adv7511 *adv7511 = cec_get_drvdata(adap);
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        unsigned int i, free_idx = ADV7511_MAX_ADDRS;
 
        if (!adv7511->cec_enabled_adap)
@@ -292,7 +292,7 @@ static int adv7511_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
                                     u32 signal_free_time, struct cec_msg *msg)
 {
        struct adv7511 *adv7511 = cec_get_drvdata(adap);
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        u8 len = msg->len;
        unsigned int i;
 
@@ -345,7 +345,7 @@ static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv7511)
 
 int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
 {
-       unsigned int offset = adv7511->reg_cec_offset;
+       unsigned int offset = adv7511->info->reg_cec_offset;
        int ret = adv7511_cec_parse_dt(dev, adv7511);
 
        if (ret)

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 6c223f0eb4dc70e57702f0cc8f4e5be9f3dc76de..45dcfc9d9212863cdd04ee1f8dd0f8f71ede5f64 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -1035,7 +1035,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);
 
-       reg -= adv7511->reg_cec_offset;
+       reg -= adv7511->info->reg_cec_offset;
 
        switch (reg) {
        case ADV7511_REG_CEC_RX1_FRAME_HDR:
@@ -1086,12 +1086,10 @@ static int adv7511_init_cec_regmap(struct adv7511 *adv)
                goto err;
        }
 
-       if (adv->info->type == ADV7533 || adv->info->type == ADV7535) {
+       if (adv->info->reg_cec_offset == ADV7533_REG_CEC_OFFSET) {
                ret = adv7533_patch_cec_registers(adv);
                if (ret)
                        goto err;
-
-               adv->reg_cec_offset = ADV7533_REG_CEC_OFFSET;
        }
 
        return 0;
@@ -1368,6 +1366,7 @@ static const struct adv7511_chip_info adv7533_chip_info = {
        .max_lane_freq_khz = 800000,
        .supply_names = adv7533_supply_names,
        .num_supplies = ARRAY_SIZE(adv7533_supply_names),
+       .reg_cec_offset = ADV7533_REG_CEC_OFFSET,
 };
 
 static const struct adv7511_chip_info adv7535_chip_info = {
@@ -1376,6 +1375,7 @@ static const struct adv7511_chip_info adv7535_chip_info = {
        .max_lane_freq_khz = 891000,
        .supply_names = adv7533_supply_names,
        .num_supplies = ARRAY_SIZE(adv7533_supply_names),
+       .reg_cec_offset = ADV7533_REG_CEC_OFFSET,
 };
 
 static const struct i2c_device_id adv7511_i2c_ids[] = {