From 5a2681161b3ed72a29f64733f84c033f23715866 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sat, 9 Jul 2011 17:14:05 +0000 Subject: imx233/fuze+: make SOURCES more correct, implement i2c for fmradio git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30135 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/imx233.c | 1 + firmware/SOURCES | 5 +- firmware/export/config/sansafuzeplus.h | 2 + .../imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c | 114 +++++++++++++++++++++ firmware/target/arm/imx233/system-imx233.c | 2 - 5 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c diff --git a/bootloader/imx233.c b/bootloader/imx233.c index 66de9cd0db..bec8ceec5b 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c @@ -36,6 +36,7 @@ #include "panic.h" #include "power.h" #include "system-target.h" +#include "fmradio_i2c.h" #include "usb.h" diff --git a/firmware/SOURCES b/firmware/SOURCES index a4be2a5f25..4aef86f002 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -479,6 +479,8 @@ target/arm/s5l8700/i2c-s5l8700.c target/arm/s5l8702/i2c-s5l8702.c #elif CONFIG_I2C == I2C_RK27XX target/arm/rk27xx/i2c-rk27xx.c +#elif CONFIG_I2C == I2C_IMX233 +target/arm/imx233/i2c-imx233.c #endif #if CONFIG_CPU == PNX0101 @@ -488,7 +490,6 @@ target/arm/pnx0101/timer-pnx0101.c #endif #if CONFIG_CPU == IMX233 -target/arm/imx233/i2c-imx233.c target/arm/imx233/lcdif-imx233.c target/arm/imx233/clkctrl-imx233.c target/arm/imx233/system-imx233.c @@ -1451,6 +1452,8 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S #ifndef SIMULATOR #ifndef BOOTLOADER drivers/synaptics-rmi.c +drivers/generic_i2c.c +target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c #endif target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index 491867ec63..e0dc76a766 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h @@ -69,6 +69,8 @@ /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_IMX233 +#define CONFIG_TUNER SI4700 + /* There is no hardware tone control */ #define HAVE_SW_TONE_CONTROLS diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c new file mode 100644 index 0000000000..5882a7da9f --- /dev/null +++ b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c @@ -0,0 +1,114 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2011 by Amaury Pouly + * + * 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 software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" +#include "system.h" +#include "fmradio_i2c.h" +#include "pinctrl-imx233.h" +#include "generic_i2c.h" + +/** + * Sansa Fuze+ fmradio uses the following pins: + * - B0P29 as CE apparently (active high) + * - B1P24 as SDA + * - B1P22 as SCL + */ +static int fmradio_i2c_bus = -1; + +static void i2c_scl_dir(bool out) +{ + imx233_enable_gpio_output(1, 22, out); +} + +static void i2c_sda_dir(bool out) +{ + imx233_enable_gpio_output(1, 24, out); +} + +static void i2c_scl_out(bool high) +{ + imx233_set_gpio_output(1, 22, high); +} + +static void i2c_sda_out(bool high) +{ + imx233_set_gpio_output(1, 24, high); +} + +static bool i2c_scl_in(void) +{ + return imx233_get_gpio_input_mask(1, 1 << 22); +} + +static bool i2c_sda_in(void) +{ + return imx233_get_gpio_input_mask(1, 1 << 24); +} + +static void i2c_delay(int d) +{ + udelay(d); +} + +struct i2c_interface fmradio_i2c = +{ + .scl_dir = i2c_scl_dir, + .sda_dir = i2c_sda_dir, + .scl_out = i2c_scl_out, + .sda_out = i2c_sda_out, + .scl_in = i2c_scl_in, + .sda_in = i2c_sda_in, + .delay = i2c_delay, + .delay_hd_sta = 4, + .delay_hd_dat = 5, + .delay_su_dat = 1, + .delay_su_sto = 4, + .delay_su_sta = 5, + .delay_thigh = 4 +}; + +void fmradio_i2c_init(void) +{ + imx233_set_pin_function(0, 29, PINCTRL_FUNCTION_GPIO); + imx233_set_pin_function(1, 24, PINCTRL_FUNCTION_GPIO); + imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); + imx233_enable_gpio_output(1, 22, true); + imx233_enable_gpio_output(1, 24, true); + imx233_set_gpio_output(1, 22, true); + imx233_set_gpio_output(1, 24, true); + fmradio_i2c_bus = i2c_add_node(&fmradio_i2c); +} + +void fmradio_i2c_enable(bool enable) +{ + imx233_enable_gpio_output(0, 29, enable); + imx233_set_gpio_output(0, 29, enable); +} + +int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) +{ + return i2c_write_data(fmradio_i2c_bus, address, -1, buf, count); +} + +int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) +{ + return i2c_read_data(fmradio_i2c_bus, address, -1, buf, count); +} diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c index ab95c453da..4a8e948019 100644 --- a/firmware/target/arm/imx233/system-imx233.c +++ b/firmware/target/arm/imx233/system-imx233.c @@ -152,9 +152,7 @@ void system_init(void) imx233_timrot_init(); imx233_dma_init(); imx233_ssp_init(); - #ifndef BOOTLOADER imx233_i2c_init(); - #endif } void power_off(void) -- cgit v1.2.3