lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 088/800] clk: agilex/stratix10: fix bypass representation
    Date
    From: Dinh Nguyen <dinguyen@kernel.org>

    commit 6855ee839699bdabb4b16cf942557fd763bcb1fa upstream.

    Each of these clocks(s2f_usr0/1, sdmmc_clk, gpio_db, emac_ptp,
    emac0/1/2) have a bypass setting that can use the boot_clk. The
    previous representation was not correct.

    Fix the representation.

    Fixes: 80c6b7a0894f ("clk: socfpga: agilex: add clock driver for the Agilex platform")
    Cc: stable@vger.kernel.org
    Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
    Link: https://lore.kernel.org/r/20210611025201.118799-2-dinguyen@kernel.org
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/clk/socfpga/clk-agilex.c | 57 +++++++++++++++++++++++++++++++--------
    drivers/clk/socfpga/clk-s10.c | 55 ++++++++++++++++++++++++++++++-------
    2 files changed, 91 insertions(+), 21 deletions(-)

    --- a/drivers/clk/socfpga/clk-agilex.c
    +++ b/drivers/clk/socfpga/clk-agilex.c
    @@ -186,6 +186,41 @@ static const struct clk_parent_data noc_
    .name = "boot_clk", },
    };

    +static const struct clk_parent_data sdmmc_mux[] = {
    + { .fw_name = "sdmmc_free_clk",
    + .name = "sdmmc_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data s2f_user1_mux[] = {
    + { .fw_name = "s2f_user1_free_clk",
    + .name = "s2f_user1_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data psi_mux[] = {
    + { .fw_name = "psi_ref_free_clk",
    + .name = "psi_ref_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data gpio_db_mux[] = {
    + { .fw_name = "gpio_db_free_clk",
    + .name = "gpio_db_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data emac_ptp_mux[] = {
    + { .fw_name = "emac_ptp_free_clk",
    + .name = "emac_ptp_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    /* clocks in AO (always on) controller */
    static const struct stratix10_pll_clock agilex_pll_clks[] = {
    { AGILEX_BOOT_CLK, "boot_clk", boot_mux, ARRAY_SIZE(boot_mux), 0,
    @@ -234,7 +269,7 @@ static const struct stratix10_perip_cnt_
    { AGILEX_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux,
    ARRAY_SIZE(gpio_db_free_mux), 0, 0xE0, 0, 0x88, 3},
    { AGILEX_SDMMC_FREE_CLK, "sdmmc_free_clk", NULL, sdmmc_free_mux,
    - ARRAY_SIZE(sdmmc_free_mux), 0, 0xE4, 0, 0x88, 4},
    + ARRAY_SIZE(sdmmc_free_mux), 0, 0xE4, 0, 0, 0},
    { AGILEX_S2F_USER0_FREE_CLK, "s2f_user0_free_clk", NULL, s2f_usr0_free_mux,
    ARRAY_SIZE(s2f_usr0_free_mux), 0, 0xE8, 0, 0, 0},
    { AGILEX_S2F_USER1_FREE_CLK, "s2f_user1_free_clk", NULL, s2f_usr1_free_mux,
    @@ -276,16 +311,16 @@ static const struct stratix10_gate_clock
    1, 0, 0, 0, 0x94, 27, 0},
    { AGILEX_EMAC2_CLK, "emac2_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C,
    2, 0, 0, 0, 0x94, 28, 0},
    - { AGILEX_EMAC_PTP_CLK, "emac_ptp_clk", "emac_ptp_free_clk", NULL, 1, 0, 0x7C,
    - 3, 0, 0, 0, 0, 0, 0},
    - { AGILEX_GPIO_DB_CLK, "gpio_db_clk", "gpio_db_free_clk", NULL, 1, 0, 0x7C,
    - 4, 0x98, 0, 16, 0, 0, 0},
    - { AGILEX_SDMMC_CLK, "sdmmc_clk", "sdmmc_free_clk", NULL, 1, 0, 0x7C,
    - 5, 0, 0, 0, 0, 0, 4},
    - { AGILEX_S2F_USER1_CLK, "s2f_user1_clk", "s2f_user1_free_clk", NULL, 1, 0, 0x7C,
    - 6, 0, 0, 0, 0, 0, 0},
    - { AGILEX_PSI_REF_CLK, "psi_ref_clk", "psi_ref_free_clk", NULL, 1, 0, 0x7C,
    - 7, 0, 0, 0, 0, 0, 0},
    + { AGILEX_EMAC_PTP_CLK, "emac_ptp_clk", NULL, emac_ptp_mux, ARRAY_SIZE(emac_ptp_mux), 0, 0x7C,
    + 3, 0, 0, 0, 0x88, 2, 0},
    + { AGILEX_GPIO_DB_CLK, "gpio_db_clk", NULL, gpio_db_mux, ARRAY_SIZE(gpio_db_mux), 0, 0x7C,
    + 4, 0x98, 0, 16, 0x88, 3, 0},
    + { AGILEX_SDMMC_CLK, "sdmmc_clk", NULL, sdmmc_mux, ARRAY_SIZE(sdmmc_mux), 0, 0x7C,
    + 5, 0, 0, 0, 0x88, 4, 4},
    + { AGILEX_S2F_USER1_CLK, "s2f_user1_clk", NULL, s2f_user1_mux, ARRAY_SIZE(s2f_user1_mux), 0, 0x7C,
    + 6, 0, 0, 0, 0x88, 5, 0},
    + { AGILEX_PSI_REF_CLK, "psi_ref_clk", NULL, psi_mux, ARRAY_SIZE(psi_mux), 0, 0x7C,
    + 7, 0, 0, 0, 0x88, 6, 0},
    { AGILEX_USB_CLK, "usb_clk", "l4_mp_clk", NULL, 1, 0, 0x7C,
    8, 0, 0, 0, 0, 0, 0},
    { AGILEX_SPI_M_CLK, "spi_m_clk", "l4_mp_clk", NULL, 1, 0, 0x7C,
    --- a/drivers/clk/socfpga/clk-s10.c
    +++ b/drivers/clk/socfpga/clk-s10.c
    @@ -144,6 +144,41 @@ static const struct clk_parent_data mpu_
    .name = "f2s-free-clk", },
    };

    +static const struct clk_parent_data sdmmc_mux[] = {
    + { .fw_name = "sdmmc_free_clk",
    + .name = "sdmmc_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data s2f_user1_mux[] = {
    + { .fw_name = "s2f_user1_free_clk",
    + .name = "s2f_user1_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data psi_mux[] = {
    + { .fw_name = "psi_ref_free_clk",
    + .name = "psi_ref_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data gpio_db_mux[] = {
    + { .fw_name = "gpio_db_free_clk",
    + .name = "gpio_db_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    +static const struct clk_parent_data emac_ptp_mux[] = {
    + { .fw_name = "emac_ptp_free_clk",
    + .name = "emac_ptp_free_clk", },
    + { .fw_name = "boot_clk",
    + .name = "boot_clk", },
    +};
    +
    /* clocks in AO (always on) controller */
    static const struct stratix10_pll_clock s10_pll_clks[] = {
    { STRATIX10_BOOT_CLK, "boot_clk", boot_mux, ARRAY_SIZE(boot_mux), 0,
    @@ -247,16 +282,16 @@ static const struct stratix10_gate_clock
    1, 0, 0, 0, 0xDC, 27, 0},
    { STRATIX10_EMAC2_CLK, "emac2_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0xA4,
    2, 0, 0, 0, 0xDC, 28, 0},
    - { STRATIX10_EMAC_PTP_CLK, "emac_ptp_clk", "emac_ptp_free_clk", NULL, 1, 0, 0xA4,
    - 3, 0, 0, 0, 0, 0, 0},
    - { STRATIX10_GPIO_DB_CLK, "gpio_db_clk", "gpio_db_free_clk", NULL, 1, 0, 0xA4,
    - 4, 0xE0, 0, 16, 0, 0, 0},
    - { STRATIX10_SDMMC_CLK, "sdmmc_clk", "sdmmc_free_clk", NULL, 1, 0, 0xA4,
    - 5, 0, 0, 0, 0, 0, 4},
    - { STRATIX10_S2F_USER1_CLK, "s2f_user1_clk", "s2f_user1_free_clk", NULL, 1, 0, 0xA4,
    - 6, 0, 0, 0, 0, 0, 0},
    - { STRATIX10_PSI_REF_CLK, "psi_ref_clk", "psi_ref_free_clk", NULL, 1, 0, 0xA4,
    - 7, 0, 0, 0, 0, 0, 0},
    + { STRATIX10_EMAC_PTP_CLK, "emac_ptp_clk", NULL, emac_ptp_mux, ARRAY_SIZE(emac_ptp_mux), 0, 0xA4,
    + 3, 0, 0, 0, 0xB0, 2, 0},
    + { STRATIX10_GPIO_DB_CLK, "gpio_db_clk", NULL, gpio_db_mux, ARRAY_SIZE(gpio_db_mux), 0, 0xA4,
    + 4, 0xE0, 0, 16, 0xB0, 3, 0},
    + { STRATIX10_SDMMC_CLK, "sdmmc_clk", NULL, sdmmc_mux, ARRAY_SIZE(sdmmc_mux), 0, 0xA4,
    + 5, 0, 0, 0, 0xB0, 4, 4},
    + { STRATIX10_S2F_USER1_CLK, "s2f_user1_clk", NULL, s2f_user1_mux, ARRAY_SIZE(s2f_user1_mux), 0, 0xA4,
    + 6, 0, 0, 0, 0xB0, 5, 0},
    + { STRATIX10_PSI_REF_CLK, "psi_ref_clk", NULL, psi_mux, ARRAY_SIZE(psi_mux), 0, 0xA4,
    + 7, 0, 0, 0, 0xB0, 6, 0},
    { STRATIX10_USB_CLK, "usb_clk", "l4_mp_clk", NULL, 1, 0, 0xA4,
    8, 0, 0, 0, 0, 0, 0},
    { STRATIX10_SPI_M_CLK, "spi_m_clk", "l4_mp_clk", NULL, 1, 0, 0xA4,

    \
     
     \ /
      Last update: 2021-07-12 10:19    [W:2.211 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site