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

clk: uniphier: Add SCSSI clock gate for each channel

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

Fixes: ff388ee36516 ("clk: uniphier: add clock frequency support for SPI")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Link: https://lkml.kernel.org/r/1577410925-22021-1-git-send-email-hayashi.kunihiko@socionext.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Kunihiko Hayashi and committed by
Stephen Boyd
1ec09a2e e42617b8

+8 -5
+8 -5
drivers/clk/uniphier/clk-uniphier-peri.c
··· 18 18 #define UNIPHIER_PERI_CLK_FI2C(idx, ch) \ 19 19 UNIPHIER_CLK_GATE("i2c" #ch, (idx), "i2c", 0x24, 24 + (ch)) 20 20 21 - #define UNIPHIER_PERI_CLK_SCSSI(idx) \ 22 - UNIPHIER_CLK_GATE("scssi", (idx), "spi", 0x20, 17) 21 + #define UNIPHIER_PERI_CLK_SCSSI(idx, ch) \ 22 + UNIPHIER_CLK_GATE("scssi" #ch, (idx), "spi", 0x20, 17 + (ch)) 23 23 24 24 #define UNIPHIER_PERI_CLK_MCSSI(idx) \ 25 25 UNIPHIER_CLK_GATE("mcssi", (idx), "spi", 0x24, 14) ··· 35 35 UNIPHIER_PERI_CLK_I2C(6, 2), 36 36 UNIPHIER_PERI_CLK_I2C(7, 3), 37 37 UNIPHIER_PERI_CLK_I2C(8, 4), 38 - UNIPHIER_PERI_CLK_SCSSI(11), 38 + UNIPHIER_PERI_CLK_SCSSI(11, 0), 39 39 { /* sentinel */ } 40 40 }; 41 41 ··· 51 51 UNIPHIER_PERI_CLK_FI2C(8, 4), 52 52 UNIPHIER_PERI_CLK_FI2C(9, 5), 53 53 UNIPHIER_PERI_CLK_FI2C(10, 6), 54 - UNIPHIER_PERI_CLK_SCSSI(11), 55 - UNIPHIER_PERI_CLK_MCSSI(12), 54 + UNIPHIER_PERI_CLK_SCSSI(11, 0), 55 + UNIPHIER_PERI_CLK_SCSSI(12, 1), 56 + UNIPHIER_PERI_CLK_SCSSI(13, 2), 57 + UNIPHIER_PERI_CLK_SCSSI(14, 3), 58 + UNIPHIER_PERI_CLK_MCSSI(15), 56 59 { /* sentinel */ } 57 60 };