clk: tegra: SOR clock rework
cover clk: tegra: SOR clock rework
From: Thierry Reding <[email protected]>
Hi Mike, Stephen,
this is a small series that I've been carrying around for a while now. The goal is to rework the SOR clock implementation on older chips to make it compatible with the implementation on Tegra186 and later. The reason is that Tegra186 and later implement this as part of the BPMP (a coprocessor used for boot and power management). BPMP's SOR clock implementation is slightly different from the implementation that we currently have in the CCF driver for earlier SoCs.
The SOR clock is used to drive HDMI and DP outputs on Tegra boards and the differences in the clock handling make it very cumbersome to deal with the clock in a unified way in the display driver. After these patches, however, they work similarly enough to allow the same code path to be used in the display driver.
Given that this set of patches needs to go in at the same time as the Tegra display driver changes, it'd be great if you could provide an Acked-by so that I can take these through the Tegra tree (or the Tegra DRM tree). There aren't any build-time dependencies between this and the display driver changes, but HDMI/DP won't be functional if this is merged at a different time than the display driver changes. The display driver changes themselves are fairly large and it isn't exactly clear when they will get merged, so things will have to be carefully coordinated, which will be easier if I do that myself.
Thanks,
Thierry
Thierry Reding (5):
clk: tegra: Remove last remains of TEGRA210_CLK_SOR1_SRC
clk: tegra: Move SOR0 implementation to Tegra124
clk: tegra: Rename sor0_lvds to sor0_out
clk: tegra: Reimplement SOR clock on Tegra124
clk: tegra: Reimplement SOR clocks on Tegra210
drivers/clk/tegra/clk-id.h | 4 +- drivers/clk/tegra/clk-tegra-periph.c | 8 -- drivers/clk/tegra/clk-tegra124.c | 55 +++++++++++++- drivers/clk/tegra/clk-tegra210.c | 75 ++++++++++++++----- .../dt-bindings/clock/tegra124-car-common.h | 2 +- include/dt-bindings/clock/tegra210-car.h | 5 +- 6 files changed, 116 insertions(+), 33 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/5 clk: tegra: Remove last remains of TEGRA210_CLK_SOR1_SRC
From: Thierry Reding <[email protected]>
Later SoC generations implement this clock as SOR1_OUT. For consistency, the Tegra210 implementation was adapted to match the same name in commit 4d1dc4018573 ("dt-bindings: clock: tegra: Add sor1_out clock").
Clean up the remaining pieces by adopting the new name for the internal identifiers and remove the old alias. Note that since both SOR1_SRC and SOR1_OUT were referring to the same device tree clock ID, this does not break device tree ABI.
--- drivers/clk/tegra/clk-id.h | 2 +- drivers/clk/tegra/clk-tegra210.c | 2 +- include/dt-bindings/clock/tegra210-car.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
drivers/clk/tegra/clk-id.h +1 -1
@@ -238,7 +238,7 @@ enum clk_id { tegra_clk_sor0, tegra_clk_sor0_lvds, tegra_clk_sor1, - tegra_clk_sor1_src, + tegra_clk_sor1_out, tegra_clk_spdif, tegra_clk_spdif_2x, tegra_clk_spdif_in,
drivers/clk/tegra/clk-tegra210.c +1 -1
@@ -2353,7 +2353,7 @@ static struct tegra_clk tegra210_clks[tegra_clk_max] __initdata = { [tegra_clk_sor0] = { .dt_id = TEGRA210_CLK_SOR0, .present = true }, [tegra_clk_sor0_lvds] = { .dt_id = TEGRA210_CLK_SOR0_LVDS, .present = true }, [tegra_clk_sor1] = { .dt_id = TEGRA210_CLK_SOR1, .present = true }, - [tegra_clk_sor1_src] = { .dt_id = TEGRA210_CLK_SOR1_SRC, .present = true }, + [tegra_clk_sor1_out] = { .dt_id = TEGRA210_CLK_SOR1_OUT, .present = true }, [tegra_clk_gpu] = { .dt_id = TEGRA210_CLK_GPU, .present = true }, [tegra_clk_pll_g_ref] = { .dt_id = TEGRA210_CLK_PLL_G_REF, .present = true, }, [tegra_clk_uartb_8] = { .dt_id = TEGRA210_CLK_UARTB, .present = true },
include/dt-bindings/clock/tegra210-car.h +0 -1
@@ -309,7 +309,6 @@#define TEGRA210_CLK_CLK_OUT_3 279#define TEGRA210_CLK_BLINK 280/* 281 */ -#define TEGRA210_CLK_SOR1_SRC 282#define TEGRA210_CLK_SOR1_OUT 282/* 283 */ #define TEGRA210_CLK_XUSB_HOST_SRC 284
Signature · 1 line
2.23.0
Re: [PATCH 1/5] clk: tegra: Remove last remains of TEGRA210_CLK_SOR1_SRC
Quoting Thierry Reding (2019-10-16 05:59:15)
Quoted 6 lines
From: Thierry Reding <[email protected]>
Later SoC generations implement this clock as
SOR1_OUT. For consistency, the Tegra210 implementation was adapted to match the same name in commit4d1dc4018573("dt-bindings: clock: tegra: Addsor1_outclock").
Quoted 7 lines
Clean up the remaining pieces by adopting the new name for the internal identifiers and remove the old alias. Note that since both
SOR1_SRCandSOR1_OUTwere referring to the same device tree clock ID, this does not break device tree ABI.Signed-off-by Thierry Reding <[email protected]>---
PATCH 2/5 clk: tegra: Move SOR0 implementation to Tegra124
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The SOR0 clock on Tegra210 is very different from the SOR0 clock found on Tegra124. Move the Tegra124 implementation to the Tegra124 driver so that a custom implementation can be provided on Tegra210 without clashing with the existing clock.
--- drivers/clk/tegra/clk-tegra-periph.c | 8 ----- drivers/clk/tegra/clk-tegra124.c | 49 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-)
drivers/clk/tegra/clk-tegra-periph.c +0 -8
@@ -262,7 +262,6 @@static DEFINE_SPINLOCK (PLLP_OUTA_lock);static DEFINE_SPINLOCK (PLLP_OUTB_lock);static DEFINE_SPINLOCK (PLLP_OUTC_lock); -static DEFINE_SPINLOCK (sor0_lock);#define MUX_I2S_SPDIF (_id) \ static const char *mux_pllaout0_##_id##_2x_pllp_clkm[] = { "pll_a_out0", \
@@ -587,11 +586,6 @@ static u32 mux_pllp_pllre_clkm_idx[] = { [0] = 0, [1] = 2, [2] = 3, }; -static const char *mux_clkm_plldp_sor0lvds[] = { -"clk_m" ,"pll_dp" ,"sor0_lvds" , -}; -#define mux_clkm_plldp_sor0lvds_idx NULL -static const char *const mux_dmic1[] = {"pll_a_out0" ,"dmic1_sync_clk" ,"pll_p" ,"clk_m" };
@@ -731,14 +725,12 @@ static struct tegra_periph_init_data periph_clks[] = {MUX8 ("hdmi_audio" , mux_pllp3_pllc_clkm,CLK_SOURCE_HDMI_AUDIO ,176 ,TEGRA_PERIPH_NO_RESET , tegra_clk_hdmi_audio),MUX8 ("clk72mhz" , mux_pllp3_pllc_clkm,CLK_SOURCE_CLK72MHZ ,177 ,TEGRA_PERIPH_NO_RESET , tegra_clk_clk72Mhz),MUX8 ("clk72mhz" , mux_pllp_out3_pllp_pllc_clkm,CLK_SOURCE_CLK72MHZ ,177 ,TEGRA_PERIPH_NO_RESET , tegra_clk_clk72Mhz_8), -MUX8_NOGATE_LOCK ("sor0_lvds" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_SOR0 , tegra_clk_sor0_lvds, &sor0_lock),MUX_FLAGS ("csite" , mux_pllp_pllc_pllm_clkm,CLK_SOURCE_CSITE ,73 ,TEGRA_PERIPH_ON_APB , tegra_clk_csite,CLK_IGNORE_UNUSED ),MUX_FLAGS ("csite" , mux_pllp_pllre_clkm,CLK_SOURCE_CSITE ,73 ,TEGRA_PERIPH_ON_APB , tegra_clk_csite_8,CLK_IGNORE_UNUSED ),NODIV ("disp1" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_DISP1 ,29 ,7 ,27 ,0 , tegra_clk_disp1,NULL ),NODIV ("disp1" , mux_pllp_plld_plld2_clkm,CLK_SOURCE_DISP1 ,29 ,7 ,27 ,0 , tegra_clk_disp1_8,NULL ),NODIV ("disp2" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_DISP2 ,29 ,7 ,26 ,0 , tegra_clk_disp2,NULL ),NODIV ("disp2" , mux_pllp_plld_plld2_clkm,CLK_SOURCE_DISP2 ,29 ,7 ,26 ,0 , tegra_clk_disp2_8,NULL ), -NODIV ("sor0" , mux_clkm_plldp_sor0lvds,CLK_SOURCE_SOR0 ,14 ,3 ,182 ,0 , tegra_clk_sor0, &sor0_lock),UART ("uarta" , mux_pllp_pllc_pllm_clkm,CLK_SOURCE_UARTA ,6 , tegra_clk_uarta),UART ("uartb" , mux_pllp_pllc_pllm_clkm,CLK_SOURCE_UARTB ,7 , tegra_clk_uartb), UART("uartc", mux_pllp_pllc_pllm_clkm, CLK_SOURCE_UARTC, 55, tegra_clk_uartc),
drivers/clk/tegra/clk-tegra124.c +49 -0
85 lines not on this page · raw message
Signature · 1 line
2.23.0
Re: [PATCH 2/5] clk: tegra: Move SOR0 implementation to Tegra124
Quoting Thierry Reding (2019-10-16 05:59:16)
Quoted 9 lines
From: Thierry Reding <[email protected]>
The SOR0 clock on Tegra210 is very different from the SOR0 clock found on Tegra124. Move the Tegra124 implementation to the Tegra124 driver so that a custom implementation can be provided on Tegra210 without clashing with the existing clock.
Signed-off-by Thierry Reding <[email protected]>---
PATCH 3/5 clk: tegra: Rename sor0_lvds to sor0_out
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
This makes Tegra124 and Tegra210 consistent with subsequent Tegra generations.
--- drivers/clk/tegra/clk-id.h | 2 +- drivers/clk/tegra/clk-tegra124.c | 12 ++++++------ drivers/clk/tegra/clk-tegra210.c | 2 +- include/dt-bindings/clock/tegra124-car-common.h | 2 +- include/dt-bindings/clock/tegra210-car.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/clk/tegra/clk-id.h +1 -1
@@ -236,7 +236,7 @@ enum clk_id { tegra_clk_soc_therm, tegra_clk_soc_therm_8, tegra_clk_sor0, - tegra_clk_sor0_lvds, + tegra_clk_sor0_out, tegra_clk_sor1, tegra_clk_sor1_out, tegra_clk_spdif,
drivers/clk/tegra/clk-tegra124.c +6 -6
@@ -847,7 +847,7 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_adx1] = { .dt_id = TEGRA124_CLK_ADX1, .present = true }, [tegra_clk_dpaux] = { .dt_id = TEGRA124_CLK_DPAUX, .present = true }, [tegra_clk_sor0] = { .dt_id = TEGRA124_CLK_SOR0, .present = true }, - [tegra_clk_sor0_lvds] = { .dt_id = TEGRA124_CLK_SOR0_LVDS, .present = true }, + [tegra_clk_sor0_out] = { .dt_id = TEGRA124_CLK_SOR0_OUT, .present = true }, [tegra_clk_gpu] = { .dt_id = TEGRA124_CLK_GPU, .present = true }, [tegra_clk_amx1] = { .dt_id = TEGRA124_CLK_AMX1, .present = true }, [tegra_clk_uartb] = { .dt_id = TEGRA124_CLK_UARTB, .present = true },
@@ -1011,14 +1011,14 @@ static const char *mux_pllp_pllm_plld_plla_pllc_plld2_clkm[] = { };#define mux_pllp_pllm_plld_plla_pllc_plld2_clkm_idx NULL -static const char *mux_clkm_plldp_sor0lvds[] = { -"clk_m" ,"pll_dp" ,"sor0_lvds" , +static const char *mux_clkm_plldp_sor0out[] = { +"clk_m" ,"pll_dp" ,"sor0_out" , }; -#define mux_clkm_plldp_sor0lvds_idx NULL +#define mux_clkm_plldp_sor0out_idx NULLstatic struct tegra_periph_init_data tegra124_periph[] = { -MUX8_NOGATE_LOCK ("sor0_lvds" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_SOR0 , tegra_clk_sor0_lvds, &sor0_lock), -NODIV ("sor0" , mux_clkm_plldp_sor0lvds,CLK_SOURCE_SOR0 ,14 ,3 ,182 ,0 , tegra_clk_sor0, &sor0_lock), +MUX8_NOGATE_LOCK ("sor0_out" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_SOR0 , tegra_clk_sor0_out, &sor0_lock), +NODIV ("sor0" , mux_clkm_plldp_sor0out,CLK_SOURCE_SOR0 ,14 ,3 ,182 ,0 , tegra_clk_sor0, &sor0_lock), };static struct clk **clks;
drivers/clk/tegra/clk-tegra210.c +1 -1
@@ -2351,7 +2351,7 @@ static struct tegra_clk tegra210_clks[tegra_clk_max] __initdata = { [tegra_clk_dpaux] = { .dt_id = TEGRA210_CLK_DPAUX, .present = true }, [tegra_clk_dpaux1] = { .dt_id = TEGRA210_CLK_DPAUX1, .present = true }, [tegra_clk_sor0] = { .dt_id = TEGRA210_CLK_SOR0, .present = true }, - [tegra_clk_sor0_lvds] = { .dt_id = TEGRA210_CLK_SOR0_LVDS, .present = true }, + [tegra_clk_sor0_out] = { .dt_id = TEGRA210_CLK_SOR0_OUT, .present = true }, [tegra_clk_sor1] = { .dt_id = TEGRA210_CLK_SOR1, .present = true }, [tegra_clk_sor1_out] = { .dt_id = TEGRA210_CLK_SOR1_OUT, .present = true }, [tegra_clk_gpu] = { .dt_id = TEGRA210_CLK_GPU, .present = true },
include/dt-bindings/clock/tegra124-car-common.h +1 -1
@@ -337,7 +337,7 @@#define TEGRA124_CLK_CLK_OUT_3_MUX 308/* 309 */ /* 310 */ -#define TEGRA124_CLK_SOR0_LVDS 311 +#define TEGRA124_CLK_SOR0_OUT 311#define TEGRA124_CLK_XUSB_SS_DIV2 312#define TEGRA124_CLK_PLL_M_UD 313
include/dt-bindings/clock/tegra210-car.h +1 -1
@@ -390,7 +390,7 @@#define TEGRA210_CLK_CLK_OUT_3_MUX 358#define TEGRA210_CLK_DSIA_MUX 359#define TEGRA210_CLK_DSIB_MUX 360 -#define TEGRA210_CLK_SOR0_LVDS 361 +#define TEGRA210_CLK_SOR0_OUT 361#define TEGRA210_CLK_XUSB_SS_DIV2 362#define TEGRA210_CLK_PLL_M_UD 363
Signature · 1 line
2.23.0
Re: [PATCH 3/5] clk: tegra: Rename sor0_lvds to sor0_out
Quoting Thierry Reding (2019-10-16 05:59:17)
Quoted 7 lines
From: Thierry Reding <[email protected]>
This makes Tegra124 and Tegra210 consistent with subsequent Tegra generations.
Signed-off-by Thierry Reding <[email protected]>---
PATCH 4/5 clk: tegra: Reimplement SOR clock on Tegra124
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
In order to allow the display driver to deal uniformly with all SOR generations, implement the SOR clocks in a way that is compatible with Tegra186 and later.
--- drivers/clk/tegra/clk-tegra124.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/clk/tegra/clk-tegra124.c +13 -9
@@ -1005,20 +1005,24 @@ static struct tegra_devclk devclks[] __initdata = { { .con_id = "hda2hdmi", .dt_id = TEGRA124_CLK_HDA2HDMI }, }; -static const char *mux_pllp_pllm_plld_plla_pllc_plld2_clkm[] = { -"pll_p" ,"pll_m" ,"pll_d_out0" ,"pll_a_out0" ,"pll_c" , -"pll_d2_out0" ,"clk_m" +static const char *const sor0_parents[] = { +"pll_p_out0" ,"pll_m_out0" ,"pll_d_out0" ,"pll_a_out0" ,"pll_c_out0" , +"pll_d2_out0" ,"clk_m" , }; -#define mux_pllp_pllm_plld_plla_pllc_plld2_clkm_idx NULL -static const char *mux_clkm_plldp_sor0out[] = { -"clk_m" ,"pll_dp" ,"sor0_out" , +static const char *const sor0_out_parents[] = { +"clk_m" ,"sor0_pad_clkout" , }; -#define mux_clkm_plldp_sor0out_idx NULLstatic struct tegra_periph_init_data tegra124_periph[] = { -MUX8_NOGATE_LOCK ("sor0_out" , mux_pllp_pllm_plld_plla_pllc_plld2_clkm,CLK_SOURCE_SOR0 , tegra_clk_sor0_out, &sor0_lock), -NODIV ("sor0" , mux_clkm_plldp_sor0out,CLK_SOURCE_SOR0 ,14 ,3 ,182 ,0 , tegra_clk_sor0, &sor0_lock), +TEGRA_INIT_DATA_TABLE ("sor0" ,NULL ,NULL , sor0_parents, +CLK_SOURCE_SOR0 ,29 ,0x7 ,0 ,0 ,0 ,0 , +0 ,182 ,0 , tegra_clk_sor0,NULL ,0 , + &sor0_lock), +TEGRA_INIT_DATA_TABLE ("sor0_out" ,NULL ,NULL , sor0_out_parents, +CLK_SOURCE_SOR0 ,14 ,0x1 ,0 ,0 ,0 ,0 , +0 ,0 ,TEGRA_PERIPH_NO_GATE , tegra_clk_sor0_out, +NULL ,0 , &sor0_lock), };static struct clk **clks;
Signature · 1 line
2.23.0
Re: [PATCH 4/5] clk: tegra: Reimplement SOR clock on Tegra124
Quoting Thierry Reding (2019-10-16 05:59:18)
Quoted 8 lines
From: Thierry Reding <[email protected]>
In order to allow the display driver to deal uniformly with all SOR generations, implement the SOR clocks in a way that is compatible with Tegra186 and later.
Signed-off-by Thierry Reding <[email protected]>---
PATCH 5/5 clk: tegra: Reimplement SOR clocks on Tegra210
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
In order to allow the display driver to deal uniformly with all SOR generations, implement the SOR clocks in a way that is compatible with Tegra186 and later.
--- drivers/clk/tegra/clk-tegra210.c | 71 ++++++++++++++++++------ include/dt-bindings/clock/tegra210-car.h | 4 +- 2 files changed, 57 insertions(+), 18 deletions(-)
drivers/clk/tegra/clk-tegra210.c +55 -16
@@ -33,6 +33,7 @@#define CLK_SOURCE_CSITE 0x1d4#define CLK_SOURCE_EMC 0x19c#define CLK_SOURCE_SOR1 0x410 +#define CLK_SOURCE_SOR0 0x414#define CLK_SOURCE_LA 0x1f8#define CLK_SOURCE_SDMMC2 0x154#define CLK_SOURCE_SDMMC4 0x164
@@ -298,6 +299,7 @@ static DEFINE_SPINLOCK(pll_d_lock);static DEFINE_SPINLOCK (pll_e_lock);static DEFINE_SPINLOCK (pll_re_lock);static DEFINE_SPINLOCK (pll_u_lock); +static DEFINE_SPINLOCK (sor0_lock);static DEFINE_SPINLOCK (sor1_lock);static DEFINE_SPINLOCK (emc_lock);static DEFINE_MUTEX (lvl2_ovr_lock);
@@ -2551,7 +2553,6 @@ static struct tegra_devclk devclks[] __initdata = { { .con_id = "pll_c4_out2", .dt_id = TEGRA210_CLK_PLL_C4_OUT2 }, { .con_id = "pll_c4_out3", .dt_id = TEGRA210_CLK_PLL_C4_OUT3 }, { .con_id = "dpaux", .dt_id = TEGRA210_CLK_DPAUX }, - { .con_id = "sor0", .dt_id = TEGRA210_CLK_SOR0 }, }; static struct tegra_audio_clk_info tegra210_audio_plls[] = {
@@ -2915,6 +2916,39 @@ static int tegra210_init_pllu(void)return 0 ; } +/* +* The SOR hardware blocks are driven by two clocks: a module clock that is +* used to access registers and a pixel clock that is sourced from the same +* pixel clock that also drives the head attached to the SOR. The module +* clock is typically called sorX (with X being the SOR instance) and the +* pixel clock is called sorX_out. The source for the SOR pixel clock is +* referred to as the "parent" clock. +* +* On Tegra186 and newer, clocks are provided by the BPMP. Unfortunately the +* BPMP implementation for the SOR clocks doesn't exactly match the above in +* some aspects. For example, the SOR module is really clocked by the pad or +* sor_safe clocks, but BPMP models the sorX clock as being sourced by the +* pixel clocks. Conversely the sorX_out clock is sourced by the sor_safe or +* pad clocks on BPMP. +* +* In order to allow the display driver to deal with all SoC generations in +* a unified way, implement the BPMP semantics in this driver. +*/ + +static const char *const sor0_parents[] = { +"pll_d_out0" , +}; + +static const char *const sor0_out_parents[] = { +"sor_safe" ,"sor0_pad_clkout" , +}; + +static const char *const sor1_parents[] = { +"pll_p" ,"pll_d_out0" ,"pll_d2_out0" ,"clk_m" , +}; + +static u32 sor1_parents_idx[] = {0 ,2 ,5 ,6 }; +static const char *const sor1_out_parents[] = {/* * Bit 0 of the mux selects sor1_pad_clkout, irrespective of bit 1, so
@@ -2923,20 +2957,31 @@ static const char * const sor1_out_parents[] = {* these bits to 0b11. While not an invalid setting, code should * always set the bits to 0b01 to select sor1_pad_clkout. */ - "sor_safe", "sor1_pad_clkout", "sor1", "sor1_pad_clkout", -}; - -static const char *const sor1_parents[] = { -"pll_p" ,"pll_d_out0" ,"pll_d2_out0" ,"clk_m" , + "sor_safe", "sor1_pad_clkout", "sor1_out", "sor1_pad_clkout", }; -static u32 sor1_parents_idx[] = {0 ,2 ,5 ,6 }; -static struct tegra_periph_init_data tegra210_periph[] = { +/* +* On Tegra210, the sor0 clock doesn't have a mux it bitfield 31:29, +* but it is hardwired to the pll_d_out0 clock. +*/ +TEGRA_INIT_DATA_TABLE ("sor0" ,NULL ,NULL , sor0_parents, +CLK_SOURCE_SOR0 ,29 ,0x0 ,0 ,0 ,0 ,0 , +0 ,182 ,0 , tegra_clk_sor0,NULL ,0 , + &sor0_lock), +TEGRA_INIT_DATA_TABLE ("sor0_out" ,NULL ,NULL , sor0_out_parents, +CLK_SOURCE_SOR0 ,14 ,0x1 ,0 ,0 ,0 ,0 , +0 ,0 ,TEGRA_PERIPH_NO_GATE , tegra_clk_sor0_out, +NULL ,0 , &sor0_lock),TEGRA_INIT_DATA_TABLE ("sor1" ,NULL ,NULL , sor1_parents,CLK_SOURCE_SOR1 ,29 ,0x7 ,0 ,0 ,8 ,1 , -TEGRA_DIVIDER_ROUND_UP ,183 ,0 , tegra_clk_sor1, - sor1_parents_idx,0 , &sor1_lock), +TEGRA_DIVIDER_ROUND_UP ,183 ,0 , + tegra_clk_sor1, sor1_parents_idx,0 , + &sor1_lock), +TEGRA_INIT_DATA_TABLE ("sor1_out" ,NULL ,NULL , sor1_out_parents, +CLK_SOURCE_SOR1 ,14 ,0x3 ,0 ,0 ,0 ,0 , +0 ,0 ,TEGRA_PERIPH_NO_GATE , + tegra_clk_sor1_out,NULL ,0 , &sor1_lock), };static const char *const la_parents[] = {
@@ -2969,12 +3014,6 @@ static __init void tegra210_periph_clk_init(void __iomem *clk_base, 1, 17, 207); clks[TEGRA210_CLK_DPAUX1 ] = clk; - clk =clk_register_mux_table (NULL ,"sor1_out" , sor1_out_parents, -ARRAY_SIZE (sor1_out_parents),0 , - clk_base +CLK_SOURCE_SOR1 ,14 ,0x3 , -0 ,NULL , &sor1_lock); - clks[TEGRA210_CLK_SOR1_OUT ] = clk; -/* pll_d_dsi_out */ clk =clk_register_gate (NULL ,"pll_d_dsi_out" ,"pll_d_out0" ,0 , clk_base +PLLD_MISC0 ,21 ,0 , &pll_d_lock);
include/dt-bindings/clock/tegra210-car.h +2 -2
@@ -308,7 +308,7 @@#define TEGRA210_CLK_CLK_OUT_2 278#define TEGRA210_CLK_CLK_OUT_3 279#define TEGRA210_CLK_BLINK 280 -/* 281 */ +#define TEGRA210_CLK_SOR0_OUT 281#define TEGRA210_CLK_SOR1_OUT 282/* 283 */ #define TEGRA210_CLK_XUSB_HOST_SRC 284
@@ -390,7 +390,7 @@#define TEGRA210_CLK_CLK_OUT_3_MUX 358#define TEGRA210_CLK_DSIA_MUX 359#define TEGRA210_CLK_DSIB_MUX 360 -#define TEGRA210_CLK_SOR0_OUT 361 +/* 361 */ #define TEGRA210_CLK_XUSB_SS_DIV2 362#define TEGRA210_CLK_PLL_M_UD 363
Signature · 1 line
2.23.0
Re: [PATCH 5/5] clk: tegra: Reimplement SOR clocks on Tegra210
Quoting Thierry Reding (2019-10-16 05:59:19)
Quoted 8 lines
From: Thierry Reding <[email protected]>
In order to allow the display driver to deal uniformly with all SOR generations, implement the SOR clocks in a way that is compatible with Tegra186 and later.
Signed-off-by Thierry Reding <[email protected]>---