Commit f4aec227 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Philipp Zabel
Browse files

reset: uniphier: Add SCSSI reset control for each channel 



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: 6b39fd59 ("reset: uniphier: add reset control support for SPI")
Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent a9457ed2

drivers/reset/reset-uniphier.c

+8 −5
Original line number Diff line number Diff line
@@ -193,8 +193,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)
@@ -209,7 +209,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,

};
@@ -225,8 +225,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,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE