Skip to content

Commit fe95d2e

Browse files
committed
Merge tag 'clk-v5.8-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk into clk-samsung
Pull Samsung clk driver updates from Sylwester Nawrocki: - Regression fixes for exynos542x and exynos5433 SoCs - use of fallthrough; attribute for s3c24xx * tag 'clk-v5.8-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk: clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 ARM/SAMSUNG EXYNOS ARM ARCHITECTURES: Use fallthrough; clk: samsung: Fix CLK_SMMU_FIMCL3 clock name on Exynos542x clk: samsung: Mark top ISP and CAM clocks on Exynos542x as critical
2 parents 8f3d9f3 + 25bdae0 commit fe95d2e

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

drivers/clk/samsung/clk-exynos5420.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ static const struct samsung_div_clock exynos5800_div_clks[] __initconst = {
540540

541541
static const struct samsung_gate_clock exynos5800_gate_clks[] __initconst = {
542542
GATE(CLK_ACLK550_CAM, "aclk550_cam", "mout_user_aclk550_cam",
543-
GATE_BUS_TOP, 24, 0, 0),
543+
GATE_BUS_TOP, 24, CLK_IS_CRITICAL, 0),
544544
GATE(CLK_ACLK432_SCALER, "aclk432_scaler", "mout_user_aclk432_scaler",
545545
GATE_BUS_TOP, 27, CLK_IS_CRITICAL, 0),
546546
};
@@ -943,25 +943,25 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {
943943
GATE(0, "aclk300_jpeg", "mout_user_aclk300_jpeg",
944944
GATE_BUS_TOP, 4, CLK_IGNORE_UNUSED, 0),
945945
GATE(0, "aclk333_432_isp0", "mout_user_aclk333_432_isp0",
946-
GATE_BUS_TOP, 5, 0, 0),
946+
GATE_BUS_TOP, 5, CLK_IS_CRITICAL, 0),
947947
GATE(0, "aclk300_gscl", "mout_user_aclk300_gscl",
948948
GATE_BUS_TOP, 6, CLK_IS_CRITICAL, 0),
949949
GATE(0, "aclk333_432_gscl", "mout_user_aclk333_432_gscl",
950950
GATE_BUS_TOP, 7, CLK_IGNORE_UNUSED, 0),
951951
GATE(0, "aclk333_432_isp", "mout_user_aclk333_432_isp",
952-
GATE_BUS_TOP, 8, 0, 0),
952+
GATE_BUS_TOP, 8, CLK_IS_CRITICAL, 0),
953953
GATE(CLK_PCLK66_GPIO, "pclk66_gpio", "mout_user_pclk66_gpio",
954954
GATE_BUS_TOP, 9, CLK_IGNORE_UNUSED, 0),
955955
GATE(0, "aclk66_psgen", "mout_user_aclk66_psgen",
956956
GATE_BUS_TOP, 10, CLK_IGNORE_UNUSED, 0),
957957
GATE(0, "aclk266_isp", "mout_user_aclk266_isp",
958-
GATE_BUS_TOP, 13, 0, 0),
958+
GATE_BUS_TOP, 13, CLK_IS_CRITICAL, 0),
959959
GATE(0, "aclk166", "mout_user_aclk166",
960960
GATE_BUS_TOP, 14, CLK_IGNORE_UNUSED, 0),
961961
GATE(CLK_ACLK333, "aclk333", "mout_user_aclk333",
962962
GATE_BUS_TOP, 15, CLK_IS_CRITICAL, 0),
963963
GATE(0, "aclk400_isp", "mout_user_aclk400_isp",
964-
GATE_BUS_TOP, 16, 0, 0),
964+
GATE_BUS_TOP, 16, CLK_IS_CRITICAL, 0),
965965
GATE(0, "aclk400_mscl", "mout_user_aclk400_mscl",
966966
GATE_BUS_TOP, 17, CLK_IS_CRITICAL, 0),
967967
GATE(0, "aclk200_disp1", "mout_user_aclk200_disp1",
@@ -1161,9 +1161,11 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {
11611161
GATE_IP_GSCL1, 3, 0, 0),
11621162
GATE(CLK_SMMU_FIMCL1, "smmu_fimcl1", "dout_gscl_blk_333",
11631163
GATE_IP_GSCL1, 4, 0, 0),
1164-
GATE(CLK_GSCL_WA, "gscl_wa", "sclk_gscl_wa", GATE_IP_GSCL1, 12, 0, 0),
1165-
GATE(CLK_GSCL_WB, "gscl_wb", "sclk_gscl_wb", GATE_IP_GSCL1, 13, 0, 0),
1166-
GATE(CLK_SMMU_FIMCL3, "smmu_fimcl3,", "dout_gscl_blk_333",
1164+
GATE(CLK_GSCL_WA, "gscl_wa", "sclk_gscl_wa", GATE_IP_GSCL1, 12,
1165+
CLK_IS_CRITICAL, 0),
1166+
GATE(CLK_GSCL_WB, "gscl_wb", "sclk_gscl_wb", GATE_IP_GSCL1, 13,
1167+
CLK_IS_CRITICAL, 0),
1168+
GATE(CLK_SMMU_FIMCL3, "smmu_fimcl3", "dout_gscl_blk_333",
11671169
GATE_IP_GSCL1, 16, 0, 0),
11681170
GATE(CLK_FIMC_LITE3, "fimc_lite3", "aclk333_432_gscl",
11691171
GATE_IP_GSCL1, 17, 0, 0),

drivers/clk/samsung/clk-exynos5433.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,8 @@ static const struct samsung_gate_clock peric_gate_clks[] __initconst = {
17061706
GATE(CLK_SCLK_PCM1, "sclk_pcm1", "sclk_pcm1_peric",
17071707
ENABLE_SCLK_PERIC, 7, CLK_SET_RATE_PARENT, 0),
17081708
GATE(CLK_SCLK_I2S1, "sclk_i2s1", "sclk_i2s1_peric",
1709-
ENABLE_SCLK_PERIC, 6, CLK_SET_RATE_PARENT, 0),
1709+
ENABLE_SCLK_PERIC, 6,
1710+
CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),
17101711
GATE(CLK_SCLK_SPI2, "sclk_spi2", "sclk_spi2_peric", ENABLE_SCLK_PERIC,
17111712
5, CLK_SET_RATE_PARENT, 0),
17121713
GATE(CLK_SCLK_SPI1, "sclk_spi1", "sclk_spi1_peric", ENABLE_SCLK_PERIC,

drivers/clk/samsung/clk-s3c2443.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,
387387
ARRAY_SIZE(s3c2450_gates));
388388
samsung_clk_register_alias(ctx, s3c2450_aliases,
389389
ARRAY_SIZE(s3c2450_aliases));
390-
/* fall through - as s3c2450 extends the s3c2416 clocks */
390+
fallthrough; /* as s3c2450 extends the s3c2416 clocks */
391391
case S3C2416:
392392
samsung_clk_register_div(ctx, s3c2416_dividers,
393393
ARRAY_SIZE(s3c2416_dividers));

drivers/i2c/busses/i2c-s3c2410.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,7 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
435435
* fall through to the write state, as we will need to
436436
* send a byte as well
437437
*/
438-
/* Fall through */
439-
438+
fallthrough;
440439
case STATE_WRITE:
441440
/*
442441
* we are writing data to the device... check for the

0 commit comments

Comments
 (0)