media: i2c: adv748x: reuse power up sequence when initializing CSI-2

Extend the MIPI CSI-2 power up sequence to match the power up sequence
in the hardware manual chapter "9.5.1 Power Up Sequence". This change
allows the power up functions to be reused when initializing the
hardware reducing code duplicating as well aligning with the
documentation.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
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 6854d898fdd1f1920755ebc05ef620e8f5ebfbb0..2384f50dacb0ccffd6ac38dd20c00b3783c7f613 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -234,6 +234,12 @@ static const struct adv748x_reg_value adv748x_power_up_txa_4lane[] = {
 
        {ADV748X_PAGE_TXA, 0x00, 0x84}, /* Enable 4-lane MIPI */
        {ADV748X_PAGE_TXA, 0x00, 0xa4}, /* Set Auto DPHY Timing */
+       {ADV748X_PAGE_TXA, 0xdb, 0x10}, /* ADI Required Write */
+       {ADV748X_PAGE_TXA, 0xd6, 0x07}, /* ADI Required Write */
+       {ADV748X_PAGE_TXA, 0xc4, 0x0a}, /* ADI Required Write */
+       {ADV748X_PAGE_TXA, 0x71, 0x33}, /* ADI Required Write */
+       {ADV748X_PAGE_TXA, 0x72, 0x11}, /* ADI Required Write */
+       {ADV748X_PAGE_TXA, 0xf0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
 
        {ADV748X_PAGE_TXA, 0x31, 0x82}, /* ADI Required Write */
        {ADV748X_PAGE_TXA, 0x1e, 0x40}, /* ADI Required Write */
@@ -263,6 +269,11 @@ static const struct adv748x_reg_value adv748x_power_up_txb_1lane[] = {
 
        {ADV748X_PAGE_TXB, 0x00, 0x81}, /* Enable 1-lane MIPI */
        {ADV748X_PAGE_TXB, 0x00, 0xa1}, /* Set Auto DPHY Timing */
+       {ADV748X_PAGE_TXB, 0xd2, 0x40}, /* ADI Required Write */
+       {ADV748X_PAGE_TXB, 0xc4, 0x0a}, /* ADI Required Write */
+       {ADV748X_PAGE_TXB, 0x71, 0x33}, /* ADI Required Write */
+       {ADV748X_PAGE_TXB, 0x72, 0x11}, /* ADI Required Write */
+       {ADV748X_PAGE_TXB, 0xf0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
 
        {ADV748X_PAGE_TXB, 0x31, 0x82}, /* ADI Required Write */
        {ADV748X_PAGE_TXB, 0x1e, 0x40}, /* ADI Required Write */
@@ -383,25 +394,6 @@ static const struct adv748x_reg_value adv748x_init_txa_4lane[] = {
        {ADV748X_PAGE_IO, 0x0c, 0xe0},  /* Enable LLC_DLL & Double LLC Timing */
        {ADV748X_PAGE_IO, 0x0e, 0xdd},  /* LLC/PIX/SPI PINS TRISTATED AUD */
 
-       {ADV748X_PAGE_TXA, 0x00, 0x84}, /* Enable 4-lane MIPI */
-       {ADV748X_PAGE_TXA, 0x00, 0xa4}, /* Set Auto DPHY Timing */
-       {ADV748X_PAGE_TXA, 0xdb, 0x10}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0xd6, 0x07}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0xc4, 0x0a}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0x71, 0x33}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0x72, 0x11}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0xf0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
-
-       {ADV748X_PAGE_TXA, 0x31, 0x82}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0x1e, 0x40}, /* ADI Required Write */
-       {ADV748X_PAGE_TXA, 0xda, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
-       {ADV748X_PAGE_WAIT, 0x00, 0x02},/* delay 2 */
-       {ADV748X_PAGE_TXA, 0x00, 0x24 },/* Power-up CSI-TX */
-       {ADV748X_PAGE_WAIT, 0x00, 0x01},/* delay 1 */
-       {ADV748X_PAGE_TXA, 0xc1, 0x2b}, /* ADI Required Write */
-       {ADV748X_PAGE_WAIT, 0x00, 0x01},/* delay 1 */
-       {ADV748X_PAGE_TXA, 0x31, 0x80}, /* ADI Required Write */
-
        {ADV748X_PAGE_EOR, 0xff, 0xff}  /* End of register table */
 };
 
@@ -435,24 +427,6 @@ static const struct adv748x_reg_value adv748x_init_txb_1lane[] = {
        {ADV748X_PAGE_SDP, 0x31, 0x12}, /* ADI Required Write */
        {ADV748X_PAGE_SDP, 0xe6, 0x4f},  /* V bit end pos manually in NTSC */
 
-       {ADV748X_PAGE_TXB, 0x00, 0x81}, /* Enable 1-lane MIPI */
-       {ADV748X_PAGE_TXB, 0x00, 0xa1}, /* Set Auto DPHY Timing */
-       {ADV748X_PAGE_TXB, 0xd2, 0x40}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0xc4, 0x0a}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0x71, 0x33}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0x72, 0x11}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0xf0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
-       {ADV748X_PAGE_TXB, 0x31, 0x82}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0x1e, 0x40}, /* ADI Required Write */
-       {ADV748X_PAGE_TXB, 0xda, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
-
-       {ADV748X_PAGE_WAIT, 0x00, 0x02},/* delay 2 */
-       {ADV748X_PAGE_TXB, 0x00, 0x21 },/* Power-up CSI-TX */
-       {ADV748X_PAGE_WAIT, 0x00, 0x01},/* delay 1 */
-       {ADV748X_PAGE_TXB, 0xc1, 0x2b}, /* ADI Required Write */
-       {ADV748X_PAGE_WAIT, 0x00, 0x01},/* delay 1 */
-       {ADV748X_PAGE_TXB, 0x31, 0x80}, /* ADI Required Write */
-
        {ADV748X_PAGE_EOR, 0xff, 0xff}  /* End of register table */
 };
 
@@ -474,6 +448,7 @@ static int adv748x_reset(struct adv748x_state *state)
        if (ret)
                return ret;
 
+       adv748x_tx_power(&state->txa, 1);
        adv748x_tx_power(&state->txa, 0);
 
        /* Init and power down TXB */
@@ -481,6 +456,7 @@ static int adv748x_reset(struct adv748x_state *state)
        if (ret)
                return ret;
 
+       adv748x_tx_power(&state->txb, 1);
        adv748x_tx_power(&state->txb, 0);
 
        /* Disable chip powerdown & Enable HDMI Rx block */