lkml.org 
[lkml]   [2007]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 60/90] ARM: OMAP: Merge gpmc changes from N800 tree
    * Tony Lindgren <tony@atomide.com> [070404 14:11]:
    > From: Kai Svahn <kai.svahn@nokia.com>
    >
    > This patch merges gpmc changes from N800 tree.
    >
    > Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
    > Signed-off-by: Tony Lindgren <tony@atomide.com>
    > ---
    > arch/arm/mach-omap2/gpmc.c | 7 +++++++
    > include/asm-arm/arch-omap/gpmc.h | 1 +
    > 2 files changed, 8 insertions(+), 0 deletions(-)
    >
    > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
    > index a3f31f0..b6b47f2 100644
    > --- a/arch/arm/mach-omap2/gpmc.c
    > +++ b/arch/arm/mach-omap2/gpmc.c
    > @@ -111,6 +111,13 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns)
    > return (time_ns * 1000 + tick_ps - 1) / tick_ps;
    > }
    >
    > +unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns)
    > +{
    > + unsigned long ticks = gpmc_ns_to_ticks(time_ns);
    > +
    > + return ticks * gpmc_get_fclk_period() / 1000;
    > +}
    > +
    > #ifdef DEBUG
    > static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
    > int time, const char *name)
    > diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
    > index 434672d..0fe920a 100644
    > --- a/include/asm-arm/arch-omap/gpmc.h
    > +++ b/include/asm-arm/arch-omap/gpmc.h
    > @@ -81,6 +81,7 @@ struct gpmc_timings {
    > };
    >
    > extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns);
    > +extern unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns);
    >
    > extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
    > extern u32 gpmc_cs_read_reg(int cs, int idx);

    Here's an updated version for gpmc_get_fclk_period() needed in
    patch 43/90.

    Regards,

    Tony
    From 2e3b88049f84dc172eb34ddfab4065ce374760b0 Mon Sep 17 00:00:00 2001
    From: Kai Svahn <kai.svahn@nokia.com>
    Date: Fri, 26 Jan 2007 12:29:40 -0800
    Subject: [PATCH 60/90] ARM: OMAP: Merge gpmc changes from N800 tree

    This patch merges gpmc changes from N800 tree
    and adds gpmc_get_fclk_period() to gpmc.h.

    Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/mach-omap2/gpmc.c | 7 +++++++
    include/asm-arm/arch-omap/gpmc.h | 1 +
    2 files changed, 8 insertions(+), 0 deletions(-)

    diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
    index a3f31f0..b6b47f2 100644
    --- a/arch/arm/mach-omap2/gpmc.c
    +++ b/arch/arm/mach-omap2/gpmc.c
    @@ -111,6 +111,13 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns)
    return (time_ns * 1000 + tick_ps - 1) / tick_ps;
    }

    +unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns)
    +{
    + unsigned long ticks = gpmc_ns_to_ticks(time_ns);
    +
    + return ticks * gpmc_get_fclk_period() / 1000;
    +}
    +
    #ifdef DEBUG
    static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
    int time, const char *name)
    diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
    index 434672d..0fe920a 100644
    --- a/include/asm-arm/arch-omap/gpmc.h
    +++ b/include/asm-arm/arch-omap/gpmc.h
    @@ -81,6 +81,8 @@ struct gpmc_timings {
    };

    extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns);
    +extern unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns);
    +extern unsigned long gpmc_get_fclk_period(void);

    extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
    extern u32 gpmc_cs_read_reg(int cs, int idx);
    --
    1.4.4.2
    \
     
     \ /
      Last update: 2007-04-05 16:47    [W:4.053 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site