diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
| commit | 552a031ba12a4236be107a5b082a399237758a5d (patch) | |
| tree | a2bcdeb651b360013dbb654bbcd61dbaf51e0331 /drivers/clk/socfpga/clk-s10.c | |
| parent | Merge branch 'x86/cpu' into perf/core, to pick up revert (diff) | |
| parent | Linux 5.2 (diff) | |
| download | linux-552a031ba12a4236be107a5b082a399237758a5d.tar.xz linux-552a031ba12a4236be107a5b082a399237758a5d.zip | |
Merge tag 'v5.2' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/socfpga/clk-s10.c')
| -rw-r--r-- | drivers/clk/socfpga/clk-s10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c index 8281dfbf38c2..5bed36e12951 100644 --- a/drivers/clk/socfpga/clk-s10.c +++ b/drivers/clk/socfpga/clk-s10.c @@ -103,9 +103,9 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { { STRATIX10_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0, 0, 0x3C, 1}, { STRATIX10_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), - 0, 0, 4, 0xB0, 0}, + 0, 0, 2, 0xB0, 0}, { STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), - 0, 0, 4, 0xB0, 1}, + 0, 0, 2, 0xB0, 1}, { STRATIX10_EMAC_PTP_FREE_CLK, "emac_ptp_free_clk", NULL, emac_ptp_free_mux, ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 4, 0xB0, 2}, { STRATIX10_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux, |