drm/bridge: parade-ps8640: Use regmap APIs

Replace the direct i2c access (i2c_smbus_* functions) with regmap APIs,
which will simplify the future update on ps8640 driver.

Signed-off-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
[dianders: whitespace fixes reported by dim apply-branch]
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210921110556.v6.1.I2351df94f18d5d8debc22d4d100f36fac560409a@changeid

diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
index 685e9c3..cd505d4 100644 (file)
--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
@@ -9,6 +9,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 
 #include <drm/drm_bridge.h>
@@ -31,6 +32,11 @@
 
 #define NUM_MIPI_LANES         4
 
+#define COMMON_PS8640_REGMAP_CONFIG \
+       .reg_bits = 8, \
+       .val_bits = 8, \
+       .cache_type = REGCACHE_NONE
+
 /*
  * PS8640 uses multiple addresses:
  * page[0]: for DP control
@@ -64,12 +70,48 @@ struct ps8640 {
        struct drm_bridge *panel_bridge;
        struct mipi_dsi_device *dsi;
        struct i2c_client *page[MAX_DEVS];
+       struct regmap   *regmap[MAX_DEVS];
        struct regulator_bulk_data supplies[2];
        struct gpio_desc *gpio_reset;
        struct gpio_desc *gpio_powerdown;
        bool powered;
 };
 
+static const struct regmap_config ps8640_regmap_config[] = {
+       [PAGE0_DP_CNTL] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xbf,
+       },
+       [PAGE1_VDO_BDG] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+       [PAGE2_TOP_CNTL] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+       [PAGE3_DSI_CNTL1] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+       [PAGE4_MIPI_PHY] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+       [PAGE5_VPLL] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0x7f,
+       },
+       [PAGE6_DSI_CNTL2] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+       [PAGE7_SPI_CNTL] = {
+               COMMON_PS8640_REGMAP_CONFIG,
+               .max_register = 0xff,
+       },
+};
+
 static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e)
 {
        return container_of(e, struct ps8640, bridge);
@@ -78,13 +120,13 @@ static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e)
 static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
                                     const enum ps8640_vdo_control ctrl)
 {
-       struct i2c_client *client = ps_bridge->page[PAGE3_DSI_CNTL1];
+       struct regmap *map = ps_bridge->regmap[PAGE3_DSI_CNTL1];
        u8 vdo_ctrl_buf[] = { VDO_CTL_ADD, ctrl };
        int ret;
 
-       ret = i2c_smbus_write_i2c_block_data(client, PAGE3_SET_ADD,
-                                            sizeof(vdo_ctrl_buf),
-                                            vdo_ctrl_buf);
+       ret = regmap_bulk_write(map, PAGE3_SET_ADD,
+                               vdo_ctrl_buf, sizeof(vdo_ctrl_buf));
+
        if (ret < 0) {
                DRM_ERROR("failed to %sable VDO: %d\n",
                          ctrl == ENABLE ? "en" : "dis", ret);
@@ -96,8 +138,7 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
 
 static void ps8640_bridge_poweron(struct ps8640 *ps_bridge)
 {
-       struct i2c_client *client = ps_bridge->page[PAGE2_TOP_CNTL];
-       unsigned long timeout;
+       struct regmap *map = ps_bridge->regmap[PAGE2_TOP_CNTL];
        int ret, status;
 
        if (ps_bridge->powered)
@@ -121,18 +162,12 @@ static void ps8640_bridge_poweron(struct ps8640 *ps_bridge)
         */
        msleep(200);
 
-       timeout = jiffies + msecs_to_jiffies(200) + 1;
-
-       while (time_is_after_jiffies(timeout)) {
-               status = i2c_smbus_read_byte_data(client, PAGE2_GPIO_H);
-               if (status < 0) {
-                       DRM_ERROR("failed read PAGE2_GPIO_H: %d\n", status);
-                       goto err_regulators_disable;
-               }
-               if ((status & PS_GPIO9) == PS_GPIO9)
-                       break;
+       ret = regmap_read_poll_timeout(map, PAGE2_GPIO_H, status,
+                                      status & PS_GPIO9, 20 * 1000, 200 * 1000);
 
-               msleep(20);
+       if (ret < 0) {
+               DRM_ERROR("failed read PAGE2_GPIO_H: %d\n", ret);
+               goto err_regulators_disable;
        }
 
        msleep(50);
@@ -144,22 +179,15 @@ static void ps8640_bridge_poweron(struct ps8640 *ps_bridge)
         * disabled by the manufacturer. Once disabled, all MCS commands are
         * ignored by the display interface.
         */
-       status = i2c_smbus_read_byte_data(client, PAGE2_MCS_EN);
-       if (status < 0) {
-               DRM_ERROR("failed read PAGE2_MCS_EN: %d\n", status);
-               goto err_regulators_disable;
-       }
 
-       ret = i2c_smbus_write_byte_data(client, PAGE2_MCS_EN,
-                                       status & ~MCS_EN);
+       ret = regmap_update_bits(map, PAGE2_MCS_EN, MCS_EN, 0);
        if (ret < 0) {
                DRM_ERROR("failed write PAGE2_MCS_EN: %d\n", ret);
                goto err_regulators_disable;
        }
 
        /* Switch access edp panel's edid through i2c */
-       ret = i2c_smbus_write_byte_data(client, PAGE2_I2C_BYPASS,
-                                       I2C_BYPASS_EN);
+       ret = regmap_write(map, PAGE2_I2C_BYPASS, I2C_BYPASS_EN);
        if (ret < 0) {
                DRM_ERROR("failed write PAGE2_I2C_BYPASS: %d\n", ret);
                goto err_regulators_disable;
@@ -362,15 +390,21 @@ static int ps8640_probe(struct i2c_client *client)
 
        ps_bridge->page[PAGE0_DP_CNTL] = client;
 
+       ps_bridge->regmap[PAGE0_DP_CNTL] = devm_regmap_init_i2c(client, ps8640_regmap_config);
+       if (IS_ERR(ps_bridge->regmap[PAGE0_DP_CNTL]))
+               return PTR_ERR(ps_bridge->regmap[PAGE0_DP_CNTL]);
+
        for (i = 1; i < ARRAY_SIZE(ps_bridge->page); i++) {
                ps_bridge->page[i] = devm_i2c_new_dummy_device(&client->dev,
                                                             client->adapter,
                                                             client->addr + i);
-               if (IS_ERR(ps_bridge->page[i])) {
-                       dev_err(dev, "failed i2c dummy device, address %02x\n",
-                               client->addr + i);
+               if (IS_ERR(ps_bridge->page[i]))
                        return PTR_ERR(ps_bridge->page[i]);
-               }
+
+               ps_bridge->regmap[i] = devm_regmap_init_i2c(ps_bridge->page[i],
+                                                           ps8640_regmap_config + i);
+               if (IS_ERR(ps_bridge->regmap[i]))
+                       return PTR_ERR(ps_bridge->regmap[i]);
        }
 
        i2c_set_clientdata(client, ps_bridge);