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

Commit 3cdaeb7d authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'imx-clk-4.7-2' of... 

Merge tag 'imx-clk-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next

Pull i.MX clk updates from Shawn Guo:

 - Update clk-pllv3 driver to get it return correct frequency for
   Ethernet PLL on i.MX7D.
 - Correct ahb clock mux settings for i.MX7D per latest hardware
   document.

* tag 'imx-clk-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx7d: fix ahb clock mux 1
  clk: imx: return correct frequency for Ethernet PLL
parents a4447235 92a847e3

drivers/clk/imx/clk-imx7d.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static const char *nand_usdhc_bus_sel[] = { "osc", "pll_sys_pfd2_270m_clk", 
	"pll_sys_pfd2_135m_clk", "pll_sys_pfd6_clk", "pll_enet_250m_clk",

	"pll_audio_main_clk", };



static const char *ahb_channel_sel[] = { "osc", "pll_sys_pfd2_135m_clk",

static const char *ahb_channel_sel[] = { "osc", "pll_sys_pfd2_270m_clk",

	"pll_dram_533m_clk", "pll_sys_pfd0_392m_clk",

	"pll_enet_125m_clk", "pll_usb_main_clk", "pll_audio_main_clk",

	"pll_video_main_clk", };

drivers/clk/imx/clk-pllv3.c

+8 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct clk_pllv3 { 
	u32		powerdown;

	u32		div_mask;

	u32		div_shift;

	unsigned long	ref_clock;

};



#define to_clk_pllv3(_hw) container_of(_hw, struct clk_pllv3, hw)
@@ -286,7 +287,9 @@ static const struct clk_ops clk_pllv3_av_ops = { 
static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw,

						unsigned long parent_rate)

{

	return 500000000;

	struct clk_pllv3 *pll = to_clk_pllv3(hw);



	return pll->ref_clock;

}



static const struct clk_ops clk_pllv3_enet_ops = {
@@ -326,7 +329,11 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, 
		break;

	case IMX_PLLV3_ENET_IMX7:

		pll->powerdown = IMX7_ENET_PLL_POWER;

		pll->ref_clock = 1000000000;

		ops = &clk_pllv3_enet_ops;

		break;

	case IMX_PLLV3_ENET:

		pll->ref_clock = 500000000;

		ops = &clk_pllv3_enet_ops;

		break;

	default: