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

Commit b08d4841 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.7-fixes-for-rc2' of... 

Merge tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes

From Stephen Warren: ARM: tegra: fixes for 3.7-rc2

This branch contains a couple small fixes for Tegra for 3.7.

* A fix for another clock rate calculation overflow
* A revert of a change that removed the "timer" clock on Tegra, coupled
  with a fix for the confusing symbol name clash that triggered it.

* tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: add tegra_timer clock
  ARM: tegra: rename tegra system timer
  ARM: tegra30: clk: Fix output_rate overflow

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 69648ae8 bf88ef88

arch/arm/mach-tegra/board-dt-tegra20.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") 
	.init_early	= tegra20_init_early,

	.init_early	= tegra20_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_irq	= tegra_dt_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.timer		= &tegra_sys_timer,

	.init_machine	= tegra_dt_init,

	.init_machine	= tegra_dt_init,

	.init_late	= tegra_dt_init_late,

	.init_late	= tegra_dt_init_late,

	.restart	= tegra_assert_system_reset,

	.restart	= tegra_assert_system_reset,

arch/arm/mach-tegra/board-dt-tegra30.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") 
	.init_early	= tegra30_init_early,

	.init_early	= tegra30_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_irq	= tegra_dt_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.timer		= &tegra_sys_timer,

	.init_machine	= tegra30_dt_init,

	.init_machine	= tegra30_dt_init,

	.init_late	= tegra_init_late,

	.init_late	= tegra_init_late,

	.restart	= tegra_assert_system_reset,

	.restart	= tegra_assert_system_reset,

arch/arm/mach-tegra/board.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,5 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; } 




void __init tegra_paz00_wifikill_init(void);

void __init tegra_paz00_wifikill_init(void);





extern struct sys_timer tegra_timer;

extern struct sys_timer tegra_sys_timer;

#endif
 
#endif

arch/arm/mach-tegra/tegra20_clocks_data.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -953,6 +953,7 @@ PERIPH_CLK(pcie_xclk, NULL, "pcie_xclk", 74, 0, 26000000, mux_clk_m, 
static struct clk *tegra_list_clks[] = {

static struct clk *tegra_list_clks[] = {

	&tegra_apbdma,

	&tegra_apbdma,

	&tegra_rtc,

	&tegra_rtc,

	&tegra_timer,

	&tegra_i2s1,

	&tegra_i2s1,

	&tegra_i2s2,

	&tegra_i2s2,

	&tegra_spdif_out,

	&tegra_spdif_out,

arch/arm/mach-tegra/tegra30_clocks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1199,7 +1199,7 @@ static long tegra30_pll_round_rate(struct clk_hw *hw, unsigned long rate, 
{

{

	struct clk_tegra *c = to_clk_tegra(hw);

	struct clk_tegra *c = to_clk_tegra(hw);

	unsigned long input_rate = *prate;

	unsigned long input_rate = *prate;

	unsigned long output_rate = *prate;

	u64 output_rate = *prate;

	const struct clk_pll_freq_table *sel;

	const struct clk_pll_freq_table *sel;

	struct clk_pll_freq_table cfg;

	struct clk_pll_freq_table cfg;

	int mul;

	int mul;