Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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>

authored by

Kunihiko Hayashi and committed by
Philipp Zabel
f4aec227 a9457ed2

+8 -5
+8 -5
drivers/reset/reset-uniphier.c
··· 193 193 #define UNIPHIER_PERI_RESET_FI2C(id, ch) \ 194 194 UNIPHIER_RESETX((id), 0x114, 24 + (ch)) 195 195 196 - #define UNIPHIER_PERI_RESET_SCSSI(id) \ 197 - UNIPHIER_RESETX((id), 0x110, 17) 196 + #define UNIPHIER_PERI_RESET_SCSSI(id, ch) \ 197 + UNIPHIER_RESETX((id), 0x110, 17 + (ch)) 198 198 199 199 #define UNIPHIER_PERI_RESET_MCSSI(id) \ 200 200 UNIPHIER_RESETX((id), 0x114, 14) ··· 209 209 UNIPHIER_PERI_RESET_I2C(6, 2), 210 210 UNIPHIER_PERI_RESET_I2C(7, 3), 211 211 UNIPHIER_PERI_RESET_I2C(8, 4), 212 - UNIPHIER_PERI_RESET_SCSSI(11), 212 + UNIPHIER_PERI_RESET_SCSSI(11, 0), 213 213 UNIPHIER_RESET_END, 214 214 }; 215 215 ··· 225 225 UNIPHIER_PERI_RESET_FI2C(8, 4), 226 226 UNIPHIER_PERI_RESET_FI2C(9, 5), 227 227 UNIPHIER_PERI_RESET_FI2C(10, 6), 228 - UNIPHIER_PERI_RESET_SCSSI(11), 229 - UNIPHIER_PERI_RESET_MCSSI(12), 228 + UNIPHIER_PERI_RESET_SCSSI(11, 0), 229 + UNIPHIER_PERI_RESET_SCSSI(12, 1), 230 + UNIPHIER_PERI_RESET_SCSSI(13, 2), 231 + UNIPHIER_PERI_RESET_SCSSI(14, 3), 232 + UNIPHIER_PERI_RESET_MCSSI(15), 230 233 UNIPHIER_RESET_END, 231 234 }; 232 235