lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 112/175] clk: tegra: Fix duplicated SE clock entry
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 5bf5861d6ea6c3f4b38fc8fda2062b2dc44ac63d ]

    The periph_clks[] array contains duplicated entry for Security Engine
    clock which was meant to be defined for T210, but it wasn't added
    properly. This patch corrects the T210 SE entry and fixes the following
    error message on T114/T124: "Tegra clk 127: register failed with -17".

    Fixes: dc37fec48314 ("clk: tegra: periph: Add new periph clks and muxes for Tegra210")
    Tested-by Nicolas Chauvet <kwizart@gmail.com>
    Reported-by Nicolas Chauvet <kwizart@gmail.com>
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20201025224212.7790-1-digetx@gmail.com
    Acked-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/tegra/clk-id.h | 1 +
    drivers/clk/tegra/clk-tegra-periph.c | 2 +-
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/tegra/clk-id.h b/drivers/clk/tegra/clk-id.h
    index 5738635c52741..9f8397c696e6c 100644
    --- a/drivers/clk/tegra/clk-id.h
    +++ b/drivers/clk/tegra/clk-id.h
    @@ -233,6 +233,7 @@ enum clk_id {
    tegra_clk_sdmmc4_8,
    tegra_clk_sdmmc4_9,
    tegra_clk_se,
    + tegra_clk_se_10,
    tegra_clk_soc_therm,
    tegra_clk_soc_therm_8,
    tegra_clk_sor0,
    diff --git a/drivers/clk/tegra/clk-tegra-periph.c b/drivers/clk/tegra/clk-tegra-periph.c
    index d9c1f229c644b..bf88f90e6c438 100644
    --- a/drivers/clk/tegra/clk-tegra-periph.c
    +++ b/drivers/clk/tegra/clk-tegra-periph.c
    @@ -648,7 +648,7 @@ static struct tegra_periph_init_data periph_clks[] = {
    INT8("host1x", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_HOST1X, 28, 0, tegra_clk_host1x_8),
    INT8("host1x", mux_pllc4_out1_pllc_pllc4_out2_pllp_clkm_plla_pllc4_out0, CLK_SOURCE_HOST1X, 28, 0, tegra_clk_host1x_9),
    INT8("se", mux_pllp_pllc2_c_c3_pllm_clkm, CLK_SOURCE_SE, 127, TEGRA_PERIPH_ON_APB, tegra_clk_se),
    - INT8("se", mux_pllp_pllc2_c_c3_clkm, CLK_SOURCE_SE, 127, TEGRA_PERIPH_ON_APB, tegra_clk_se),
    + INT8("se", mux_pllp_pllc2_c_c3_clkm, CLK_SOURCE_SE, 127, TEGRA_PERIPH_ON_APB, tegra_clk_se_10),
    INT8("2d", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_2D, 21, 0, tegra_clk_gr2d_8),
    INT8("3d", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_3D, 24, 0, tegra_clk_gr3d_8),
    INT8("vic03", mux_pllm_pllc_pllp_plla_pllc2_c3_clkm, CLK_SOURCE_VIC03, 178, 0, tegra_clk_vic03),
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 17:34    [W:4.064 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site