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

Commit 3f27d8d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: mdm9607: Add support for 125MHz emac clock"

parents 37919ef8 2bdfabd7

drivers/clk/msm/clock-gcc-mdm9607.c

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.
@@ -206,6 +206,7 @@ static struct rcg_clk apss_ahb_clk_src = { 


static struct clk_freq_tbl ftbl_emac_0_125m_clk_src[] = {

	F(      19200000,                   xo,    1,    0,     0),

	F_EXT(  25000000,      emac_0_125m_clk,    5,    0,     0),

	F_EXT( 125000000,      emac_0_125m_clk,    1,    0,     0),

	F_END

};
@@ -246,7 +247,7 @@ static struct rcg_clk emac_0_sys_25m_clk_src = { 


static struct clk_freq_tbl ftbl_emac_0_tx_clk_src[] = {

	F(      19200000,                   xo,    1,    0,     0),

	F_EXT( 125000000,      emac_0_125m_clk,    1,    0,     0),

	F_EXT( 125000000,        emac_0_tx_clk,    1,    0,     0),

	F_END

};

static struct rcg_clk emac_0_tx_clk_src = {

include/dt-bindings/clock/mdm-clocks-hwio-9607.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.
@@ -133,6 +133,7 @@ 
#define gpll0_source_val			1

#define gpll2_source_val			1

#define emac_0_125m_clk_source_val		1

#define emac_0_tx_clk_source_val		2



#define F(f, s, div, m, n) \

	{ \