lkml.org 
[lkml]   [2013]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/26] ARM: bcm2835: remove custom .init_time hook
    Date
    With arch/arm calling of_clk_init(NULL) from time_init(), we can now
    remove custom .init_time hooks. Also remove call to of_clk_init from
    clk-bcm2835 with core fixed_clock match, as this has already been
    registered now.

    Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    ---
    Cc: Olof Johansson <olof@lixom.net>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Stephen Warren <swarren@wwwdotorg.org>
    Cc: Russell King <linux@arm.linux.org.uk>
    Cc: Mike Turquette <mturquette@linaro.org>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-rpi-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/arm/mach-bcm2835/bcm2835.c | 2 --
    drivers/clk/clk-bcm2835.c | 8 --------
    2 files changed, 10 deletions(-)

    diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
    index 40686d7..d50135b 100644
    --- a/arch/arm/mach-bcm2835/bcm2835.c
    +++ b/arch/arm/mach-bcm2835/bcm2835.c
    @@ -18,7 +18,6 @@
    #include <linux/of_address.h>
    #include <linux/of_platform.h>
    #include <linux/clk/bcm2835.h>
    -#include <linux/clocksource.h>

    #include <asm/mach/arch.h>
    #include <asm/mach/map.h>
    @@ -134,7 +133,6 @@ DT_MACHINE_START(BCM2835, "BCM2835")
    .init_irq = bcm2835_init_irq,
    .handle_irq = bcm2835_handle_irq,
    .init_machine = bcm2835_init,
    - .init_time = clocksource_of_init,
    .restart = bcm2835_restart,
    .dt_compat = bcm2835_compat
    MACHINE_END
    diff --git a/drivers/clk/clk-bcm2835.c b/drivers/clk/clk-bcm2835.c
    index 5fb4ff5..6b950ca 100644
    --- a/drivers/clk/clk-bcm2835.c
    +++ b/drivers/clk/clk-bcm2835.c
    @@ -20,14 +20,8 @@
    #include <linux/clk-provider.h>
    #include <linux/clkdev.h>
    #include <linux/clk/bcm2835.h>
    -#include <linux/clk-provider.h>
    #include <linux/of.h>

    -static const struct of_device_id clk_match[] __initconst = {
    - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
    - { }
    -};
    -
    /*
    * These are fixed clocks. They're probably not all root clocks and it may
    * be possible to turn them on and off but until this is mapped out better
    @@ -63,6 +57,4 @@ void __init bcm2835_init_clocks(void)
    ret = clk_register_clkdev(clk, NULL, "20215000.uart");
    if (ret)
    pr_err("uart1_pclk alias not registered\n");
    -
    - of_clk_init(clk_match);
    }
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-09-18 20:21    [W:4.045 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site