lkml.org 
[lkml]   [2007]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 48/90] ARM: OMAP: I2C-1 init fix for 2430
    Date
    From: Syed Mohammed Khasim <x0khasim@ti.com>

    I2C-1 for 2430 was commented previously, enabled in this patch.

    Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/plat-omap/devices.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
    index 2fac7d3..3e84a03 100644
    --- a/arch/arm/plat-omap/devices.c
    +++ b/arch/arm/plat-omap/devices.c
    @@ -136,8 +136,10 @@ static void omap_init_i2c(void)
    * it can include clocking and address info, maybe more.
    */
    if (cpu_is_omap24xx()) {
    - omap_cfg_reg(M19_24XX_I2C1_SCL);
    - omap_cfg_reg(L15_24XX_I2C1_SDA);
    + if (machine_is_omap_h4()) {
    + omap_cfg_reg(M19_24XX_I2C1_SCL);
    + omap_cfg_reg(L15_24XX_I2C1_SDA);
    + }
    } else {
    omap_cfg_reg(I2C_SCL);
    omap_cfg_reg(I2C_SDA);
    @@ -501,13 +503,13 @@ static int __init omap_init_devices(void)
    * in alphabetical order so they're easier to sort through.
    */
    omap_init_dsp();
    - omap_init_i2c();
    omap_init_kp();
    omap_init_mmc();
    omap_init_uwire();
    omap_init_wdt();
    omap_init_rng();
    #endif
    + omap_init_i2c();
    return 0;
    }
    arch_initcall(omap_init_devices);
    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-04 20:17    [W:4.211 / U:1.876 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site