diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2011-07-09 17:14:05 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2011-07-09 17:14:05 +0000 |
commit | 5a2681161b3ed72a29f64733f84c033f23715866 (patch) | |
tree | 97c381dd7ee74a44f908606e3c3f44bc6e7b7d8e /firmware | |
parent | 9e8d7dc07cf580418bd70597be535177604fffd0 (diff) | |
download | rockbox-5a2681161b3ed72a29f64733f84c033f23715866.tar.gz rockbox-5a2681161b3ed72a29f64733f84c033f23715866.zip |
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
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 5 | ||||
-rw-r--r-- | firmware/export/config/sansafuzeplus.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c | 114 | ||||
-rw-r--r-- | firmware/target/arm/imx233/system-imx233.c | 2 |
4 files changed, 120 insertions, 3 deletions
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 | |||
479 | target/arm/s5l8702/i2c-s5l8702.c | 479 | target/arm/s5l8702/i2c-s5l8702.c |
480 | #elif CONFIG_I2C == I2C_RK27XX | 480 | #elif CONFIG_I2C == I2C_RK27XX |
481 | target/arm/rk27xx/i2c-rk27xx.c | 481 | target/arm/rk27xx/i2c-rk27xx.c |
482 | #elif CONFIG_I2C == I2C_IMX233 | ||
483 | target/arm/imx233/i2c-imx233.c | ||
482 | #endif | 484 | #endif |
483 | 485 | ||
484 | #if CONFIG_CPU == PNX0101 | 486 | #if CONFIG_CPU == PNX0101 |
@@ -488,7 +490,6 @@ target/arm/pnx0101/timer-pnx0101.c | |||
488 | #endif | 490 | #endif |
489 | 491 | ||
490 | #if CONFIG_CPU == IMX233 | 492 | #if CONFIG_CPU == IMX233 |
491 | target/arm/imx233/i2c-imx233.c | ||
492 | target/arm/imx233/lcdif-imx233.c | 493 | target/arm/imx233/lcdif-imx233.c |
493 | target/arm/imx233/clkctrl-imx233.c | 494 | target/arm/imx233/clkctrl-imx233.c |
494 | target/arm/imx233/system-imx233.c | 495 | target/arm/imx233/system-imx233.c |
@@ -1451,6 +1452,8 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S | |||
1451 | #ifndef SIMULATOR | 1452 | #ifndef SIMULATOR |
1452 | #ifndef BOOTLOADER | 1453 | #ifndef BOOTLOADER |
1453 | drivers/synaptics-rmi.c | 1454 | drivers/synaptics-rmi.c |
1455 | drivers/generic_i2c.c | ||
1456 | target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c | ||
1454 | #endif | 1457 | #endif |
1455 | target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c | 1458 | target/arm/imx233/sansa-fuzeplus/backlight-fuzeplus.c |
1456 | target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c | 1459 | 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 @@ | |||
69 | /* define this if you have a real-time clock */ | 69 | /* define this if you have a real-time clock */ |
70 | #define CONFIG_RTC RTC_IMX233 | 70 | #define CONFIG_RTC RTC_IMX233 |
71 | 71 | ||
72 | #define CONFIG_TUNER SI4700 | ||
73 | |||
72 | /* There is no hardware tone control */ | 74 | /* There is no hardware tone control */ |
73 | #define HAVE_SW_TONE_CONTROLS | 75 | #define HAVE_SW_TONE_CONTROLS |
74 | 76 | ||
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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2011 by Amaury Pouly | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "config.h" | ||
23 | #include "system.h" | ||
24 | #include "fmradio_i2c.h" | ||
25 | #include "pinctrl-imx233.h" | ||
26 | #include "generic_i2c.h" | ||
27 | |||
28 | /** | ||
29 | * Sansa Fuze+ fmradio uses the following pins: | ||
30 | * - B0P29 as CE apparently (active high) | ||
31 | * - B1P24 as SDA | ||
32 | * - B1P22 as SCL | ||
33 | */ | ||
34 | static int fmradio_i2c_bus = -1; | ||
35 | |||
36 | static void i2c_scl_dir(bool out) | ||
37 | { | ||
38 | imx233_enable_gpio_output(1, 22, out); | ||
39 | } | ||
40 | |||
41 | static void i2c_sda_dir(bool out) | ||
42 | { | ||
43 | imx233_enable_gpio_output(1, 24, out); | ||
44 | } | ||
45 | |||
46 | static void i2c_scl_out(bool high) | ||
47 | { | ||
48 | imx233_set_gpio_output(1, 22, high); | ||
49 | } | ||
50 | |||
51 | static void i2c_sda_out(bool high) | ||
52 | { | ||
53 | imx233_set_gpio_output(1, 24, high); | ||
54 | } | ||
55 | |||
56 | static bool i2c_scl_in(void) | ||
57 | { | ||
58 | return imx233_get_gpio_input_mask(1, 1 << 22); | ||
59 | } | ||
60 | |||
61 | static bool i2c_sda_in(void) | ||
62 | { | ||
63 | return imx233_get_gpio_input_mask(1, 1 << 24); | ||
64 | } | ||
65 | |||
66 | static void i2c_delay(int d) | ||
67 | { | ||
68 | udelay(d); | ||
69 | } | ||
70 | |||
71 | struct i2c_interface fmradio_i2c = | ||
72 | { | ||
73 | .scl_dir = i2c_scl_dir, | ||
74 | .sda_dir = i2c_sda_dir, | ||
75 | .scl_out = i2c_scl_out, | ||
76 | .sda_out = i2c_sda_out, | ||
77 | .scl_in = i2c_scl_in, | ||
78 | .sda_in = i2c_sda_in, | ||
79 | .delay = i2c_delay, | ||
80 | .delay_hd_sta = 4, | ||
81 | .delay_hd_dat = 5, | ||
82 | .delay_su_dat = 1, | ||
83 | .delay_su_sto = 4, | ||
84 | .delay_su_sta = 5, | ||
85 | .delay_thigh = 4 | ||
86 | }; | ||
87 | |||
88 | void fmradio_i2c_init(void) | ||
89 | { | ||
90 | imx233_set_pin_function(0, 29, PINCTRL_FUNCTION_GPIO); | ||
91 | imx233_set_pin_function(1, 24, PINCTRL_FUNCTION_GPIO); | ||
92 | imx233_set_pin_function(1, 22, PINCTRL_FUNCTION_GPIO); | ||
93 | imx233_enable_gpio_output(1, 22, true); | ||
94 | imx233_enable_gpio_output(1, 24, true); | ||
95 | imx233_set_gpio_output(1, 22, true); | ||
96 | imx233_set_gpio_output(1, 24, true); | ||
97 | fmradio_i2c_bus = i2c_add_node(&fmradio_i2c); | ||
98 | } | ||
99 | |||
100 | void fmradio_i2c_enable(bool enable) | ||
101 | { | ||
102 | imx233_enable_gpio_output(0, 29, enable); | ||
103 | imx233_set_gpio_output(0, 29, enable); | ||
104 | } | ||
105 | |||
106 | int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) | ||
107 | { | ||
108 | return i2c_write_data(fmradio_i2c_bus, address, -1, buf, count); | ||
109 | } | ||
110 | |||
111 | int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) | ||
112 | { | ||
113 | return i2c_read_data(fmradio_i2c_bus, address, -1, buf, count); | ||
114 | } | ||
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) | |||
152 | imx233_timrot_init(); | 152 | imx233_timrot_init(); |
153 | imx233_dma_init(); | 153 | imx233_dma_init(); |
154 | imx233_ssp_init(); | 154 | imx233_ssp_init(); |
155 | #ifndef BOOTLOADER | ||
156 | imx233_i2c_init(); | 155 | imx233_i2c_init(); |
157 | #endif | ||
158 | } | 156 | } |
159 | 157 | ||
160 | void power_off(void) | 158 | void power_off(void) |