Commit 252d0d2b authored by Peter De Schrijver's avatar Peter De Schrijver
Browse files

clk: tegra: add TEGRA_DIVIDER_ROUND_UP for periph clks 



Perform upwards rounding when calculating dividers for periph clks on Tegra30
and Tegra114.

Signed-off-by: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
parent fc20eeff

drivers/clk/tegra/clk-tegra114.c

+29 −24
Original line number Diff line number Diff line
@@ -791,50 +791,53 @@ static unsigned long tegra114_input_freq[] = { 
#define TEGRA_INIT_DATA_MUX(_name, _con_id, _dev_id, _parents, _offset,	\

			    _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			30, MASK(2), 0, 0, 8, 1, 0, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, 0)

			30, MASK(2), 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP, \

			_regs, _clk_num, periph_clk_enb_refcnt, _gate_flags,\

			_clk_id, _parents##_idx, 0)



#define TEGRA_INIT_DATA_MUX_FLAGS(_name, _con_id, _dev_id, _parents, _offset,\

			    _clk_num, _regs, _gate_flags, _clk_id, flags)\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			30, MASK(2), 0, 0, 8, 1, 0, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, flags)

			30, MASK(2), 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP,\

			_regs, _clk_num, periph_clk_enb_refcnt, _gate_flags,\

			_clk_id, _parents##_idx, flags)



#define TEGRA_INIT_DATA_MUX8(_name, _con_id, _dev_id, _parents, _offset, \

			     _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			29, MASK(3), 0, 0, 8, 1, 0, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, 0)

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP,\

			_regs, _clk_num, periph_clk_enb_refcnt, _gate_flags,\

			_clk_id, _parents##_idx, 0)



#define TEGRA_INIT_DATA_INT_FLAGS(_name, _con_id, _dev_id, _parents, _offset,\

			    _clk_num, _regs, _gate_flags, _clk_id, flags)\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			30, MASK(2), 0, 0, 8, 1, TEGRA_DIVIDER_INT, _regs,\

			_clk_num, periph_clk_enb_refcnt, _gate_flags,	\

			_clk_id, _parents##_idx, flags)

			30, MASK(2), 0, 0, 8, 1, TEGRA_DIVIDER_INT |	\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, flags)



#define TEGRA_INIT_DATA_INT8(_name, _con_id, _dev_id, _parents, _offset,\

			    _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_INT, _regs,\

			_clk_num, periph_clk_enb_refcnt, _gate_flags,	\

			_clk_id, _parents##_idx, 0)

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_INT |	\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, 0)



#define TEGRA_INIT_DATA_UART(_name, _con_id, _dev_id, _parents, _offset,\

			     _clk_num, _regs, _clk_id)			\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			30, MASK(2), 0, 0, 16, 1, TEGRA_DIVIDER_UART, _regs,\

			_clk_num, periph_clk_enb_refcnt, 0, _clk_id,	\

			_parents##_idx, 0)

			30, MASK(2), 0, 0, 16, 1, TEGRA_DIVIDER_UART |	\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, 0, _clk_id, _parents##_idx, 0)



#define TEGRA_INIT_DATA_I2C(_name, _con_id, _dev_id, _parents, _offset,\

			     _clk_num, _regs, _clk_id)			\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset,\

			30, MASK(2), 0, 0, 16, 0, 0, _regs, _clk_num,	\

			periph_clk_enb_refcnt, 0, _clk_id, _parents##_idx, 0)

			30, MASK(2), 0, 0, 16, 0, TEGRA_DIVIDER_ROUND_UP,\

			_regs, _clk_num, periph_clk_enb_refcnt, 0, _clk_id,\

			_parents##_idx, 0)



#define TEGRA_INIT_DATA_NODIV(_name, _con_id, _dev_id, _parents, _offset, \

			      _mux_shift, _mux_mask, _clk_num, _regs,	\
@@ -847,14 +850,16 @@ static unsigned long tegra114_input_freq[] = { 
#define TEGRA_INIT_DATA_XUSB(_name, _con_id, _dev_id, _parents, _offset, \

			     _clk_num, _regs, _gate_flags, _clk_id)	 \

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, _parents, _offset, \

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_INT, _regs, \

			_clk_num, periph_clk_enb_refcnt, _gate_flags,	 \

			_clk_id, _parents##_idx, 0)

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_INT |	\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id,	\

			_parents##_idx, 0)



#define TEGRA_INIT_DATA_AUDIO(_name, _con_id, _dev_id, _offset,  _clk_num,\

				 _regs, _gate_flags, _clk_id)		\

	TEGRA_INIT_DATA_TABLE(_name, _con_id, _dev_id, mux_d_audio_clk,	\

			_offset, 16, 0xE01F, 0, 0, 8, 1, 0, _regs, _clk_num, \

			_offset, 16, 0xE01F, 0, 0, 8, 1,		\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags , _clk_id,	\

			mux_d_audio_clk_idx, 0)

drivers/clk/tegra/clk-tegra30.c

+10 −9
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static DEFINE_SPINLOCK(sysrate_lock); 
#define TEGRA_INIT_DATA_MUX(_name, _con_id, _dev_id, _parents, _offset,	\

			    _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA(_name, _con_id, _dev_id, _parents, _offset,	\

			30, 2, 0, 0, 8, 1, 0, _regs, _clk_num,		\

			periph_clk_enb_refcnt, _gate_flags, _clk_id)

			30, 2, 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP, _regs, \

			_clk_num, periph_clk_enb_refcnt, _gate_flags, _clk_id)



#define TEGRA_INIT_DATA_DIV16(_name, _con_id, _dev_id, _parents, _offset, \

			    _clk_num, _regs, _gate_flags, _clk_id)	\
@@ -295,21 +295,22 @@ static DEFINE_SPINLOCK(sysrate_lock); 
#define TEGRA_INIT_DATA_MUX8(_name, _con_id, _dev_id, _parents, _offset, \

			     _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA(_name, _con_id, _dev_id, _parents, _offset,	\

			29, 3, 0, 0, 8, 1, 0, _regs, _clk_num,		\

			periph_clk_enb_refcnt, _gate_flags, _clk_id)

			29, 3, 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP, _regs,\

			_clk_num, periph_clk_enb_refcnt, _gate_flags, _clk_id)



#define TEGRA_INIT_DATA_INT(_name, _con_id, _dev_id, _parents, _offset,	\

			    _clk_num, _regs, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA(_name, _con_id, _dev_id, _parents, _offset,	\

			30, 2, 0, 0, 8, 1, TEGRA_DIVIDER_INT, _regs,	\

			_clk_num, periph_clk_enb_refcnt, _gate_flags,	\

			_clk_id)

			30, 2, 0, 0, 8, 1, TEGRA_DIVIDER_INT |		\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, _gate_flags, _clk_id)



#define TEGRA_INIT_DATA_UART(_name, _con_id, _dev_id, _parents, _offset,\

			     _clk_num, _regs, _clk_id)			\

	TEGRA_INIT_DATA(_name, _con_id, _dev_id, _parents, _offset,	\

			30, 2, 0, 0, 16, 1, TEGRA_DIVIDER_UART, _regs,	\

			_clk_num, periph_clk_enb_refcnt, 0, _clk_id)

			30, 2, 0, 0, 16, 1, TEGRA_DIVIDER_UART |	\

			TEGRA_DIVIDER_ROUND_UP, _regs, _clk_num,	\

			periph_clk_enb_refcnt, 0, _clk_id)



#define TEGRA_INIT_DATA_NODIV(_name, _con_id, _dev_id, _parents, _offset, \

			      _mux_shift, _mux_width, _clk_num, _regs,	\