summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-04 13:38:00 +0200
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-09-29 21:09:41 +0200
commitdc8105817f634d50a91cea9464bbc73ebb36182e (patch)
tree6a3f7ca57b43f58c8951c5027d7aa3f2be89c762
parent2ab38d9343416f0de93bfeafbd2470fcc994f8ab (diff)
ARM: socfpga: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now remove custom .init_time hooks. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Dinh Nguyen <dinguyen@altera.com>
-rw-r--r--arch/arm/mach-socfpga/socfpga.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index 6df7bb9fe64..dd0d49cdbe0 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -14,8 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <linux/clk-provider.h>
-#include <linux/clocksource.h>
#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
@@ -91,12 +89,6 @@ static void __init socfpga_init_irq(void)
socfpga_sysmgr_init();
}
-static void __init socfpga_init_time(void)
-{
- of_clk_init(NULL);
- clocksource_of_init();
-}
-
static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
{
u32 temp;
@@ -126,7 +118,6 @@ DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")
.smp = smp_ops(socfpga_smp_ops),
.map_io = socfpga_map_io,
.init_irq = socfpga_init_irq,
- .init_time = socfpga_init_time,
.init_machine = socfpga_cyclone5_init,
.restart = socfpga_cyclone5_restart,
.dt_compat = altera_dt_match,