imx233: factor fmradio i2c and tuner power code

Choices are limited for those: i2c is either generic software or imx233
hardware and power is either none or with a gpio. So factor ever possible
combination in a single common file and use fmradio-target.h to supply the
required parameters. This will remove a bunch of duplicate code.

Change-Id: If12faeb2e371631cd39cc18a4c1d859812007934
This commit is contained in:
Amaury Pouly 2013-11-19 20:39:10 +00:00
parent c2c2274e0a
commit 446f352abd
13 changed files with 274 additions and 347 deletions

View file

@ -21,91 +21,17 @@
#include "config.h"
#include "system.h"
#include "fmradio_i2c.h"
#include "pinctrl-imx233.h"
#include "generic_i2c.h"
#include "rds.h"
#include "si4700.h"
/**
* Sansa Fuze+ fmradio uses the following pins:
* - B0P29 as CE apparently (active high)
* - B0P29 as CE (active high)
* - B1P24 as SDA
* - B1P22 as SCL
* - B2P27 as STC/RDS
*/
static int fmradio_i2c_bus = -1;
static void i2c_scl_dir(bool out)
{
imx233_pinctrl_enable_gpio(1, 22, out);
}
static void i2c_sda_dir(bool out)
{
imx233_pinctrl_enable_gpio(1, 24, out);
}
static void i2c_scl_out(bool high)
{
imx233_pinctrl_set_gpio(1, 22, high);
}
static void i2c_sda_out(bool high)
{
imx233_pinctrl_set_gpio(1, 24, high);
}
static bool i2c_scl_in(void)
{
return imx233_pinctrl_get_gpio(1, 22);
}
static bool i2c_sda_in(void)
{
return imx233_pinctrl_get_gpio(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_pinctrl_acquire(1, 24, "fmradio i2c");
imx233_pinctrl_acquire(1, 22, "fmradio i2c");
imx233_pinctrl_set_function(1, 24, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_set_function(1, 22, PINCTRL_FUNCTION_GPIO);
fmradio_i2c_bus = i2c_add_node(&fmradio_i2c);
}
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);
}
#ifdef HAVE_RDS_CAP
/* Low-level RDS Support */

View file

@ -0,0 +1,35 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2013 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.
*
****************************************************************************/
#ifndef _FMRADIO_TARGET_H_
#define _FMRADIO_TARGET_H_
#define IMX233_FMRADIO_I2C FMI_SW
#define FMI_SW_SDA_BANK 1
#define FMI_SW_SDA_PIN 24
#define FMI_SW_SCL_BANK 1
#define FMI_SW_SCL_PIN 22
#define IMX233_FMRADIO_POWER FMP_GPIO
#define FMP_GPIO_BANK 0
#define FMP_GPIO_PIN 29
#define FMP_GPIO_DELAY (HZ / 10)
#endif /* _FMRADIO_TARGET_H_ */

View file

@ -1,53 +0,0 @@
/***************************************************************************
* __________ __ ___.
* 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 "system.h"
#include "power.h"
#include "tuner.h"
#include "fmradio_i2c.h"
#include "pinctrl-imx233.h"
#include "power-imx233.h"
static bool tuner_enable = false;
bool tuner_power(bool enable)
{
if(enable != tuner_enable)
{
/* CE is B0P29 (active high) */
imx233_pinctrl_acquire(0, 29, "tuner power");
imx233_pinctrl_set_function(0, 29, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_set_drive(0, 29, PINCTRL_DRIVE_4mA);
imx233_pinctrl_enable_gpio(0, 29, enable);
imx233_pinctrl_set_gpio(0, 29, enable);
tuner_enable = enable;
/* give time to power up, datasheet states than minimum timing time is
* around 100µs so 1 tick should do */
sleep(1);
//imx233_power_set_dcdc_freq(enable, HW_POWER_MISC__FREQSEL__24MHz);
}
return tuner_enable;
}
bool tuner_powered(void)
{
return tuner_enable;
}