media: adv748x: Rename reset procedures

Rename the chip reset procedure as they configure the CP (HDMI) and SD
(AFE) cores.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index bd8a8c8d6f8ef42051533735129af9719707ac06..ba91db45547ab8e6aade0ae0bb5177441508e701 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -353,9 +353,8 @@ static const struct adv748x_reg_value adv748x_sw_reset[] = {
        {ADV748X_PAGE_EOR, 0xff, 0xff}  /* End of register table */
 };
 
-/* Supported Formats For Script Below */
-/* - 01-29 HDMI to MIPI TxA CSI 4-Lane - RGB888: */
-static const struct adv748x_reg_value adv748x_init_txa_4lane[] = {
+/* Initialize CP Core with RGB888 format. */
+static const struct adv748x_reg_value adv748x_init_hdmi[] = {
        /* Disable chip powerdown & Enable HDMI Rx block */
        {ADV748X_PAGE_IO, 0x00, 0x40},
 
@@ -399,10 +398,8 @@ static const struct adv748x_reg_value adv748x_init_txa_4lane[] = {
        {ADV748X_PAGE_EOR, 0xff, 0xff}  /* End of register table */
 };
 
-/* 02-01 Analog CVBS to MIPI TX-B CSI 1-Lane - */
-/* Autodetect CVBS Single Ended In Ain 1 - MIPI Out */
-static const struct adv748x_reg_value adv748x_init_txb_1lane[] = {
-
+/* Initialize AFE core with YUV8 format. */
+static const struct adv748x_reg_value adv748x_init_afe[] = {
        {ADV748X_PAGE_IO, 0x00, 0x30},  /* Disable chip powerdown Rx */
        {ADV748X_PAGE_IO, 0xf2, 0x01},  /* Enable I2C Read Auto-Increment */
 
@@ -445,19 +442,18 @@ static int adv748x_reset(struct adv748x_state *state)
        if (ret < 0)
                return ret;
 
-       /* Init and power down TXA */
-       ret = adv748x_write_regs(state, adv748x_init_txa_4lane);
+       /* Initialize CP and AFE cores. */
+       ret = adv748x_write_regs(state, adv748x_init_hdmi);
        if (ret)
                return ret;
 
-       adv748x_tx_power(&state->txa, 1);
-       adv748x_tx_power(&state->txa, 0);
-
-       /* Init and power down TXB */
-       ret = adv748x_write_regs(state, adv748x_init_txb_1lane);
+       ret = adv748x_write_regs(state, adv748x_init_afe);
        if (ret)
                return ret;
 
+       /* Reset TXA and TXB */
+       adv748x_tx_power(&state->txa, 1);
+       adv748x_tx_power(&state->txa, 0);
        adv748x_tx_power(&state->txb, 1);
        adv748x_tx_power(&state->txb, 0);