ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210
Subsystems (3)
PATCH 1/2 ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210
From: Thierry Reding <[email protected]>
On Tegra210 the parents for the disp1 and disp2 clocks are slightly different from earlier chips. Only pll_p, pll_d_out0, pll_d2_out0 and clk_m are valid parents (technically pll_d_out is as well, but U-Boot doesn't know anything about it). Fix up the type name and the mux definition.
Signed-off-by Thierry Reding <[email protected]>
--- arch/arm/mach-tegra/tegra210/clock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-tegra/tegra210/clock.c +5 -5
@@ -40,7 +40,7 @@ enum clock_type_id {CLOCK_TYPE_PDCT ,CLOCK_TYPE_ACPT ,CLOCK_TYPE_ASPTE , -CLOCK_TYPE_PMDACD2T , +CLOCK_TYPE_PDD2T ,CLOCK_TYPE_PCST , CLOCK_TYPE_DP,
@@ -97,8 +97,8 @@ static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = { {CLK (AUDIO ),CLK (SFROM32KHZ ),CLK (PERIPH ),CLK (OSC ),CLK (EPCI ),CLK (NONE ),CLK (NONE ),CLK (NONE ), MASK_BITS_31_29}, - { CLK(PERIPH), CLK(MEMORY), CLK(DISPLAY), CLK(AUDIO), -CLK (CGENERAL ),CLK (DISPLAY2 ),CLK (OSC ),CLK (NONE ), + { CLK(PERIPH), CLK(NONE), CLK(DISPLAY), CLK(NONE), +CLK (NONE ),CLK (DISPLAY2 ),CLK (OSC ),CLK (NONE ), MASK_BITS_31_29}, { CLK(PERIPH), CLK(CGENERAL), CLK(SFROM32KHZ), CLK(OSC), CLK(NONE), CLK(NONE), CLK(NONE), CLK(NONE),
@@ -174,8 +174,8 @@ static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = {TYPE (PERIPHC_0bh,CLOCK_TYPE_NONE ),TYPE (PERIPHC_0ch,CLOCK_TYPE_NONE ),TYPE (PERIPHC_SBC1 ,CLOCK_TYPE_PC2CC3M_T ), -TYPE (PERIPHC_DISP1 ,CLOCK_TYPE_PMDACD2T ), -TYPE (PERIPHC_DISP2 ,CLOCK_TYPE_PMDACD2T ), +TYPE (PERIPHC_DISP1 ,CLOCK_TYPE_PDD2T ), +TYPE (PERIPHC_DISP2 ,CLOCK_TYPE_PDD2T ),/* 0x10 */ TYPE(PERIPHC_10h, CLOCK_TYPE_NONE),
Signature · 1 line
2.21.0
PATCH 2/2 ARM: tegra: Remove disp1 clock initialization on Tegra210
From: Thierry Reding <[email protected]>
pll_c is not a valid parent for the disp1 clock, so trying to set it will fail. Given that display is not used in U-Boot, remove the init table entry so that disp1 will keep its default parent (clk_m).
Signed-off-by Thierry Reding <[email protected]>
--- arch/arm/mach-tegra/tegra210/clock.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-tegra/tegra210/clock.c +0 -1
@@ -1265,7 +1265,6 @@ struct periph_clk_init periph_clk_init_table[] = { { PERIPH_ID_SBC5, CLOCK_ID_PERIPH }, { PERIPH_ID_SBC6, CLOCK_ID_PERIPH }, { PERIPH_ID_HOST1X, CLOCK_ID_PERIPH }, - { PERIPH_ID_DISP1, CLOCK_ID_CGENERAL }, { PERIPH_ID_SDMMC1, CLOCK_ID_PERIPH }, { PERIPH_ID_SDMMC2, CLOCK_ID_PERIPH }, { PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH },
Signature · 1 line
2.21.0