From e03a63b44a0e1de82d9864b22e95d8242d41ca88 Mon Sep 17 00:00:00 2001 From: Prashant Gaikwad Date: Fri, 4 Jan 2013 12:30:54 +0530 Subject: [PATCH] --- yaml --- r: 350737 b: refs/heads/master c: 85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76 h: refs/heads/master i: 350735: 4db73c3bfa78af928614072b70896b9c3ebc880a v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-sunxi.c | 30 ------------------------- trunk/drivers/clocksource/sunxi_timer.c | 4 ++-- trunk/include/linux/clk/sunxi.h | 22 ------------------ 4 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 trunk/drivers/clk/clk-sunxi.c delete mode 100644 trunk/include/linux/clk/sunxi.h diff --git a/[refs] b/[refs] index 8e9a70e28abd..7f8be642bee9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2f6c2556dcc432e50003bc8fa4d62d95906f149 +refs/heads/master: 85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76 diff --git a/trunk/drivers/clk/clk-sunxi.c b/trunk/drivers/clk/clk-sunxi.c deleted file mode 100644 index 0e831b584ba7..000000000000 --- a/trunk/drivers/clk/clk-sunxi.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -static const __initconst struct of_device_id clk_match[] = { - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, - {} -}; - -void __init sunxi_init_clocks(void) -{ - of_clk_init(clk_match); -} diff --git a/trunk/drivers/clocksource/sunxi_timer.c b/trunk/drivers/clocksource/sunxi_timer.c index 3cd1bd3d7aee..93d09d0e009f 100644 --- a/trunk/drivers/clocksource/sunxi_timer.c +++ b/trunk/drivers/clocksource/sunxi_timer.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define TIMER_CTL_REG 0x00 #define TIMER_CTL_ENABLE (1 << 0) @@ -124,7 +124,7 @@ static void __init sunxi_timer_init(void) if (irq <= 0) panic("Can't parse IRQ"); - sunxi_init_clocks(); + of_clk_init(NULL); clk = of_clk_get(node, 0); if (IS_ERR(clk)) diff --git a/trunk/include/linux/clk/sunxi.h b/trunk/include/linux/clk/sunxi.h deleted file mode 100644 index e074fdd5a236..000000000000 --- a/trunk/include/linux/clk/sunxi.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __LINUX_CLK_SUNXI_H_ -#define __LINUX_CLK_SUNXI_H_ - -void __init sunxi_init_clocks(void); - -#endif