On Tuesday, February 01, 2011 4:41 PM, Alexander Sverdlin wrote:
From: Alexander Sverdlin subaparts@yandex.ru
Add support for CS4271 SPI-connected CODEC on EDB93xx boards. Major rework based on code provided by H Hartley Sweeten hsweeten@visionengravers.com. Tested on EDB9302, others (EDB9301, EDB9302A, EDB9307A, EDB0315A) should work.
Signed-off-by: Alexander Sverdlin subaparts@yandex.ru
arch/arm/mach-ep93xx/edb93xx.c | 117 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 4b04316..f20be96 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -30,12 +30,22 @@ #include <linux/gpio.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> +#include <linux/spi/spi.h> +#include <linux/delay.h> +#include <mach/ep93xx_spi.h>
#include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach/arch.h>
+#include <sound/cs4271.h>
+#define edb93xx_has_audio() (machine_is_edb9301() || \
machine_is_edb9302() || \machine_is_edb9302a() || \machine_is_edb9307a() || \machine_is_edb9315a())static void __init edb93xx_register_flash(void) { @@ -93,6 +103,111 @@ static void __init edb93xx_register_i2c(void)
/*************************************************************************
- EDB93xx SPI peripheral handling
- *************************************************************************/
+static int edb93xx_cs4271_hw_setup(struct spi_device *spi) +{
- int gpio_nreset;
- int err;
- if (machine_is_edb9301() || machine_is_edb9302()) {
gpio_nreset = EP93XX_GPIO_LINE_EGPIO1;
Are you planning on removing gpio_nreset and gpio_disable from struct cs4271_platform_data? If not, you should just setup the gpio mapping in edb93xx_register_spi before you actually register the spi_board_info. Then this function and the following two can just do something like the following and not worry about the if ... else if ... etc.
struct cs4271_platform_data *cs4271 = spi->dev.platform_data; int err;
err = gpio_request(cs4271->gpio_disable, spi->modalias); ...
- } else if (machine_is_edb9302a() || machine_is_edb9307a()) {
ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_HONIDE);
You shouldn't need this. The ep93xx gpio core will now defaults all the ports to gpio mode. See commit fd015480c29deb52ae3bfaf41e888c450765edd8.
gpio_nreset = EP93XX_GPIO_LINE_DD2;
Please use EP93XX_GPIO_LINE_H(2) instead. None of the datasheets reference the "DD2" gpio.
- } else if (machine_is_edb9315a()) {
gpio_nreset = EP93XX_GPIO_LINE_EGPIO14;- } else {
return -EINVAL;- }
- err = gpio_request(gpio_nreset, spi->modalias);
- if (err)
return err;- err = gpio_request(EP93XX_GPIO_LINE_EGPIO6, spi->modalias);
- if (err)
return err;- gpio_direction_output(EP93XX_GPIO_LINE_EGPIO6, 1);
- /* Reset codec */
- gpio_direction_output(gpio_nreset, 0);
- udelay(1);
- gpio_set_value(gpio_nreset, 1);
- /* Give the codec time to wake up */
- udelay(1);
- return 0;
+}
+static void edb93xx_cs4271_hw_cleanup(struct spi_device *spi) +{
- int gpio_nreset;
- if (machine_is_edb9301() || machine_is_edb9302())
gpio_nreset = EP93XX_GPIO_LINE_EGPIO1;- else if (machine_is_edb9302a() || machine_is_edb9307a())
gpio_nreset = EP93XX_GPIO_LINE_DD2;- else if (machine_is_edb9315a())
gpio_nreset = EP93XX_GPIO_LINE_EGPIO14;- else
return;- gpio_set_value(gpio_nreset, 0);
- gpio_free(gpio_nreset);
- gpio_set_value(EP93XX_GPIO_LINE_EGPIO6, 1);
- gpio_free(EP93XX_GPIO_LINE_EGPIO6);
+}
+static void edb93xx_cs4271_hw_cs_control(struct spi_device *spi, int value) +{
- gpio_set_value(EP93XX_GPIO_LINE_EGPIO6, value);
+}
+static struct ep93xx_spi_chip_ops edb93xx_cs4271_hw = {
- .setup = edb93xx_cs4271_hw_setup,
- .cleanup = edb93xx_cs4271_hw_cleanup,
- .cs_control = edb93xx_cs4271_hw_cs_control,
+};
+static struct spi_board_info edb93xx_spi_board_info[] __initdata = {
- {
.modalias = "cs4271",.controller_data = &edb93xx_cs4271_hw,.max_speed_hz = 6000000,.bus_num = 0,.chip_select = 0,.mode = SPI_MODE_3,- },
+};
+static struct ep93xx_spi_info edb93xx_spi_info = {
- .num_chipselect = ARRAY_SIZE(edb93xx_spi_board_info),
+};
+static void __init edb93xx_register_spi(void) +{
- if (edb93xx_has_audio()) {
ep93xx_register_spi(&edb93xx_spi_info,edb93xx_spi_board_info,ARRAY_SIZE(edb93xx_spi_board_info));- }
+}
+/*************************************************************************
- EDB93xx I2S
- *************************************************************************/
+static void __init edb93xx_register_i2s(void) +{
- if (edb93xx_has_audio()) {
ep93xx_register_i2s();- }
+}
+/*************************************************************************
- EDB93xx pwm
*************************************************************************/ static void __init edb93xx_register_pwm(void) @@ -117,6 +232,8 @@ static void __init edb93xx_init_machine(void) edb93xx_register_flash(); ep93xx_register_eth(&edb93xx_eth_data, 1); edb93xx_register_i2c();
- edb93xx_register_spi();
- edb93xx_register_i2s(); edb93xx_register_pwm();
}
Other than using struct cs4271_platform_data to hold the gpio information, this looks better. Now other spi devices can live on bus.
Hartley