lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 092/191] reset: uniphier: Add SCSSI reset control for each channel
    Date
    From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

    [ Upstream commit f4aec227e985e31d2fdc5608daf48e3de19157b7 ]

    SCSSI has reset controls for each channel in the SoCs newer than Pro4,
    so this adds missing reset controls for channel 1, 2 and 3. And more, this
    moves MCSSI reset ID after SCSSI.

    Fixes: 6b39fd590aeb ("reset: uniphier: add reset control support for SPI")
    Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
    Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/reset/reset-uniphier.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
    index 5605745663ae0..adbecb2c7cd3a 100644
    --- a/drivers/reset/reset-uniphier.c
    +++ b/drivers/reset/reset-uniphier.c
    @@ -202,8 +202,8 @@ static const struct uniphier_reset_data uniphier_pro5_sd_reset_data[] = {
    #define UNIPHIER_PERI_RESET_FI2C(id, ch) \
    UNIPHIER_RESETX((id), 0x114, 24 + (ch))

    -#define UNIPHIER_PERI_RESET_SCSSI(id) \
    - UNIPHIER_RESETX((id), 0x110, 17)
    +#define UNIPHIER_PERI_RESET_SCSSI(id, ch) \
    + UNIPHIER_RESETX((id), 0x110, 17 + (ch))

    #define UNIPHIER_PERI_RESET_MCSSI(id) \
    UNIPHIER_RESETX((id), 0x114, 14)
    @@ -218,7 +218,7 @@ static const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = {
    UNIPHIER_PERI_RESET_I2C(6, 2),
    UNIPHIER_PERI_RESET_I2C(7, 3),
    UNIPHIER_PERI_RESET_I2C(8, 4),
    - UNIPHIER_PERI_RESET_SCSSI(11),
    + UNIPHIER_PERI_RESET_SCSSI(11, 0),
    UNIPHIER_RESET_END,
    };

    @@ -234,8 +234,11 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
    UNIPHIER_PERI_RESET_FI2C(8, 4),
    UNIPHIER_PERI_RESET_FI2C(9, 5),
    UNIPHIER_PERI_RESET_FI2C(10, 6),
    - UNIPHIER_PERI_RESET_SCSSI(11),
    - UNIPHIER_PERI_RESET_MCSSI(12),
    + UNIPHIER_PERI_RESET_SCSSI(11, 0),
    + UNIPHIER_PERI_RESET_SCSSI(12, 1),
    + UNIPHIER_PERI_RESET_SCSSI(13, 2),
    + UNIPHIER_PERI_RESET_SCSSI(14, 3),
    + UNIPHIER_PERI_RESET_MCSSI(15),
    UNIPHIER_RESET_END,
    };

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-21 09:27    [W:4.155 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site