Commit 8db5d1a6 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

MXC: pass base/irq to mxc_timer_init

parent 4be3bd78
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ int __init mx1_clocks_init(unsigned long fref)
	clk_enable(&hclk);
	clk_enable(&fclk);

	mxc_timer_init(&gpt_clk);
	mxc_timer_init(&gpt_clk, IO_ADDRESS(TIM1_BASE_ADDR), TIM1_INT);

	return 0;
}
+1 −1
Original line number Diff line number Diff line
@@ -1004,6 +1004,6 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href)
	clk_enable(&uart_clk[0]);
#endif

	mxc_timer_init(&gpt_clk[0]);
	mxc_timer_init(&gpt_clk[0], IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT1);
	return 0;
}
+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ int __init mx27_clocks_init(unsigned long fref)
	clk_enable(&uart1_clk);
#endif

	mxc_timer_init(&gpt1_clk);
	mxc_timer_init(&gpt1_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT1);

	return 0;
}
+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ int __init mx35_clocks_init()
	__raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2);
	__raw_writel(0, CCM_BASE + CCM_CGR3);

	mxc_timer_init(&gpt_clk);
	mxc_timer_init(&ipg_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT);

	return 0;
}
+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@

#include <mach/clock.h>
#include <mach/hardware.h>
#include <mach/mx31.h>
#include <mach/common.h>

#include "crm_regs.h"
@@ -609,7 +610,7 @@ int __init mx31_clocks_init(unsigned long fref)
		__raw_writel(reg, MXC_CCM_PMCR1);
	}

	mxc_timer_init(&ipg_clk);
	mxc_timer_init(&ipg_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT);

	return 0;
}
Loading