diff options
-rw-r--r-- | firmware/SOURCES | 6 | ||||
-rw-r--r-- | firmware/target/arm/i2c-pp.c (renamed from firmware/target/arm/i2c-pp5020.c) | 12 | ||||
-rw-r--r-- | firmware/target/arm/i2c-pp5002.c | 157 |
3 files changed, 13 insertions, 162 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 00fbc74b67..4a1aa3f244 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -254,10 +254,8 @@ common/strlen.c | |||
254 | #ifndef SIMULATOR | 254 | #ifndef SIMULATOR |
255 | target/arm/memset-arm.S | 255 | target/arm/memset-arm.S |
256 | target/arm/memset16-arm.S | 256 | target/arm/memset16-arm.S |
257 | #if CONFIG_I2C == I2C_PP5020 | 257 | #if CONFIG_I2C == I2C_PP5020 || CONFIG_I2C == I2C_PP5002 |
258 | target/arm/i2c-pp5020.c | 258 | target/arm/i2c-pp.c |
259 | #elif CONFIG_I2C == I2C_PP5002 | ||
260 | target/arm/i2c-pp5002.c | ||
261 | #elif CONFIG_I2C == I2C_PNX0101 | 259 | #elif CONFIG_I2C == I2C_PNX0101 |
262 | drivers/i2c-pnx0101.c | 260 | drivers/i2c-pnx0101.c |
263 | #elif CONFIG_I2C == I2C_S3C2440 | 261 | #elif CONFIG_I2C == I2C_S3C2440 |
diff --git a/firmware/target/arm/i2c-pp5020.c b/firmware/target/arm/i2c-pp.c index ebd0318f0b..0c8aec8f4b 100644 --- a/firmware/target/arm/i2c-pp5020.c +++ b/firmware/target/arm/i2c-pp.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * PP5020 I2C driver | 10 | * PP502X and PP5002 I2C driver |
11 | * | 11 | * |
12 | * Based on code from the ipodlinux project - http://ipodlinux.org/ | 12 | * Based on code from the ipodlinux project - http://ipodlinux.org/ |
13 | * Adapted for Rockbox in November 2005 | 13 | * Adapted for Rockbox in November 2005 |
@@ -28,7 +28,11 @@ | |||
28 | #include "kernel.h" | 28 | #include "kernel.h" |
29 | #include "logf.h" | 29 | #include "logf.h" |
30 | #include "system.h" | 30 | #include "system.h" |
31 | #if CONFIG_I2C == I2C_PP5002 | ||
32 | #include "i2c-pp5002.h" | ||
33 | #else | ||
31 | #include "i2c-pp5020.h" | 34 | #include "i2c-pp5020.h" |
35 | #endif | ||
32 | 36 | ||
33 | /* Local functions definitions */ | 37 | /* Local functions definitions */ |
34 | 38 | ||
@@ -185,12 +189,18 @@ void i2c_init(void) | |||
185 | GPIOC_ENABLE &= ~0x20; | 189 | GPIOC_ENABLE &= ~0x20; |
186 | #endif | 190 | #endif |
187 | 191 | ||
192 | #if CONFIG_I2C == I2C_PP5002 | ||
193 | DEV_EN |= 0x2; | ||
194 | #else | ||
188 | DEV_EN |= DEV_I2C; /* Enable I2C */ | 195 | DEV_EN |= DEV_I2C; /* Enable I2C */ |
196 | #endif | ||
189 | DEV_RS |= DEV_I2C; /* Start I2C Reset */ | 197 | DEV_RS |= DEV_I2C; /* Start I2C Reset */ |
190 | DEV_RS &=~DEV_I2C; /* End I2C Reset */ | 198 | DEV_RS &=~DEV_I2C; /* End I2C Reset */ |
191 | 199 | ||
200 | #if CONFIG_I2C == I2C_PP5020 | ||
192 | outl(0x0, 0x600060a4); | 201 | outl(0x0, 0x600060a4); |
193 | outl(0x80 | (0 << 8), 0x600060a4); | 202 | outl(0x80 | (0 << 8), 0x600060a4); |
203 | #endif | ||
194 | 204 | ||
195 | mutex_init(&i2c_mutex); | 205 | mutex_init(&i2c_mutex); |
196 | 206 | ||
diff --git a/firmware/target/arm/i2c-pp5002.c b/firmware/target/arm/i2c-pp5002.c deleted file mode 100644 index ad6d50721d..0000000000 --- a/firmware/target/arm/i2c-pp5002.c +++ /dev/null | |||
@@ -1,157 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * PP5002 I2C driver | ||
11 | * | ||
12 | * Based on code from the ipodlinux project - http://ipodlinux.org/ | ||
13 | * Adapted for Rockbox in January 2006 | ||
14 | * | ||
15 | * Original file: linux/arch/armnommu/mach-ipod/hardware.c | ||
16 | * | ||
17 | * Copyright (c) 2003-2005 Bernard Leach (leachbj@bouncycastle.org) | ||
18 | * | ||
19 | * All files in this archive are subject to the GNU General Public License. | ||
20 | * See the file COPYING in the source tree root for full license agreement. | ||
21 | * | ||
22 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
23 | * KIND, either express or implied. | ||
24 | * | ||
25 | ****************************************************************************/ | ||
26 | |||
27 | #include "cpu.h" | ||
28 | #include "kernel.h" | ||
29 | #include "logf.h" | ||
30 | #include "system.h" | ||
31 | #include "i2c-pp5002.h" | ||
32 | |||
33 | /* Local functions definitions */ | ||
34 | |||
35 | #define POLL_TIMEOUT (HZ) | ||
36 | |||
37 | static int pp_i2c_wait_not_busy(void) | ||
38 | { | ||
39 | unsigned long timeout; | ||
40 | timeout = current_tick + POLL_TIMEOUT; | ||
41 | while (TIME_BEFORE(current_tick, timeout)) { | ||
42 | if (!(I2C_STATUS & I2C_BUSY)) { | ||
43 | return 0; | ||
44 | } | ||
45 | yield(); | ||
46 | } | ||
47 | |||
48 | return -1; | ||
49 | } | ||
50 | |||
51 | |||
52 | /* Public functions */ | ||
53 | |||
54 | int pp_i2c_read_byte(unsigned int addr, unsigned int *data) | ||
55 | { | ||
56 | if (pp_i2c_wait_not_busy() < 0) | ||
57 | { | ||
58 | return -1; | ||
59 | } | ||
60 | |||
61 | /* clear top 15 bits, left shift 1, or in 0x1 for a read */ | ||
62 | I2C_ADDR = ((addr << 17) >> 16) | 0x1 ; | ||
63 | |||
64 | I2C_CTRL |= 0x20; | ||
65 | |||
66 | I2C_CTRL |= I2C_SEND; | ||
67 | |||
68 | if (pp_i2c_wait_not_busy() < 0) | ||
69 | { | ||
70 | return -1; | ||
71 | } | ||
72 | |||
73 | if (data) | ||
74 | { | ||
75 | *data = I2C_DATA(0); | ||
76 | } | ||
77 | |||
78 | return 0; | ||
79 | } | ||
80 | |||
81 | int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) | ||
82 | { | ||
83 | unsigned int i; | ||
84 | |||
85 | if (len < 1 || len > 4) | ||
86 | { | ||
87 | return -1; | ||
88 | } | ||
89 | |||
90 | if (pp_i2c_wait_not_busy() < 0) | ||
91 | { | ||
92 | return -2; | ||
93 | } | ||
94 | |||
95 | /* clear top 15 bits, left shift 1 */ | ||
96 | I2C_ADDR = (addr << 17) >> 16; | ||
97 | |||
98 | I2C_CTRL &= ~0x20; | ||
99 | |||
100 | for ( i = 0; i < len; i++ ) | ||
101 | { | ||
102 | I2C_DATA(i) = *data++; | ||
103 | } | ||
104 | |||
105 | I2C_CTRL = (I2C_CTRL & ~0x26) | ((len-1) << 1); | ||
106 | |||
107 | I2C_CTRL |= I2C_SEND; | ||
108 | |||
109 | return 0x0; | ||
110 | } | ||
111 | |||
112 | int pp_i2c_send_byte(unsigned int addr, int data0) | ||
113 | { | ||
114 | unsigned char data[1]; | ||
115 | |||
116 | data[0] = data0; | ||
117 | |||
118 | return pp_i2c_send_bytes(addr, 1, data); | ||
119 | } | ||
120 | |||
121 | int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { | ||
122 | unsigned int temp; | ||
123 | int i; | ||
124 | pp_i2c_send_byte(dev_addr, addr); | ||
125 | for (i = 0; i < len; i++) { | ||
126 | pp_i2c_read_byte(dev_addr, &temp); | ||
127 | data[i] = temp; | ||
128 | } | ||
129 | return i; | ||
130 | } | ||
131 | |||
132 | int i2c_readbyte(unsigned int dev_addr, int addr) | ||
133 | { | ||
134 | int data; | ||
135 | |||
136 | pp_i2c_send_byte(dev_addr, addr); | ||
137 | pp_i2c_read_byte(dev_addr, &data); | ||
138 | |||
139 | return data; | ||
140 | } | ||
141 | |||
142 | int pp_i2c_send(unsigned int addr, int data0, int data1) | ||
143 | { | ||
144 | unsigned char data[2]; | ||
145 | |||
146 | data[0] = data0; | ||
147 | data[1] = data1; | ||
148 | |||
149 | return pp_i2c_send_bytes(addr, 2, data); | ||
150 | } | ||
151 | |||
152 | void i2c_init(void) | ||
153 | { | ||
154 | DEV_EN |= 0x2; /* Enable I2C-should this be DEV_I2C rather than 0x2? */ | ||
155 | DEV_RS |= DEV_I2C; /* Start I2C Reset */ | ||
156 | DEV_RS &=~DEV_I2C; /* End I2C Reset */ | ||
157 | } | ||