Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad149724 authored by Fabio Estevam's avatar Fabio Estevam Committed by Stephen Boyd
Browse files

clk: imx7d: Fix the powerdown bit location of PLL DDR 



According to the MX7D Reference Manual the powerdown bit of
CCM_ANALOG_PLL_DDRn register is bit 20, so fix it accordingly.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 9593f4f5

drivers/clk/imx/clk-imx7d.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) 
	clks[IMX7D_PLL_VIDEO_MAIN_SRC] = imx_clk_mux("pll_video_main_src", base + 0x130, 14, 2, pll_bypass_src_sel, ARRAY_SIZE(pll_bypass_src_sel));



	clks[IMX7D_PLL_ARM_MAIN]  = imx_clk_pllv3(IMX_PLLV3_SYS, "pll_arm_main", "osc", base + 0x60, 0x7f);

	clks[IMX7D_PLL_DRAM_MAIN] = imx_clk_pllv3(IMX_PLLV3_AV, "pll_dram_main", "osc", base + 0x70, 0x7f);

	clks[IMX7D_PLL_DRAM_MAIN] = imx_clk_pllv3(IMX_PLLV3_DDR_IMX7, "pll_dram_main", "osc", base + 0x70, 0x7f);

	clks[IMX7D_PLL_SYS_MAIN]  = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll_sys_main", "osc", base + 0xb0, 0x1);

	clks[IMX7D_PLL_ENET_MAIN] = imx_clk_pllv3(IMX_PLLV3_ENET_IMX7, "pll_enet_main", "osc", base + 0xe0, 0x0);

	clks[IMX7D_PLL_AUDIO_MAIN] = imx_clk_pllv3(IMX_PLLV3_AV, "pll_audio_main", "osc", base + 0xf0, 0x7f);

drivers/clk/imx/clk-pllv3.c

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define BM_PLL_POWER		(0x1 << 12)

#define BM_PLL_LOCK		(0x1 << 31)

#define IMX7_ENET_PLL_POWER	(0x1 << 5)

#define IMX7_DDR_PLL_POWER	(0x1 << 20)



/**

 * struct clk_pllv3 - IMX PLL clock version 3
@@ -451,6 +452,10 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, 
		pll->ref_clock = 500000000;

		ops = &clk_pllv3_enet_ops;

		break;

	case IMX_PLLV3_DDR_IMX7:

		pll->power_bit = IMX7_ENET_PLL_POWER;

		ops = &clk_pllv3_av_ops;

		break;

	default:

		ops = &clk_pllv3_ops;

	}

drivers/clk/imx/clk.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ enum imx_pllv3_type { 
	IMX_PLLV3_ENET,

	IMX_PLLV3_ENET_IMX7,

	IMX_PLLV3_SYS_VF610,

	IMX_PLLV3_DDR_IMX7,

};



struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,