projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
board
/
trab
/
tsc2000.c
diff --git
a/board/trab/tsc2000.c
b/board/trab/tsc2000.c
index f13a5a9dc0251d4173472381a1315e5fd448a9fd..f757202dee53a5c2a21a16fff36e7c9f19f1ae8d 100644
(file)
--- a/
board/trab/tsc2000.c
+++ b/
board/trab/tsc2000.c
@@
-26,7
+26,8
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c2400.h>
+#include <asm/io.h>
#include <div64.h>
#include "tsc2000.h"
#include <div64.h>
#include "tsc2000.h"
@@
-42,10
+43,10
@@
*/
#define MAX_DEVIATION 18 /* unit: DIGITs of adc; 18 DIGIT = 0.5 °C */
*/
#define MAX_DEVIATION 18 /* unit: DIGITs of adc; 18 DIGIT = 0.5 °C */
-void spi_init(void)
+void
tsc2000_
spi_init(void)
{
{
-
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO
();
-
S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI
();
+
struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio
();
+
struct s3c24x0_spi * const spi = s3c24x0_get_base_spi
();
int i;
/* Configure I/O ports. */
int i;
/* Configure I/O ports. */
@@
-71,7
+72,7
@@
void spi_init(void)
void spi_wait_transmit_done(void)
{
void spi_wait_transmit_done(void)
{
-
S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI
();
+
struct s3c24x0_spi * const spi = s3c24x0_get_base_spi
();
while (!(spi->ch[0].SPSTA & 0x01)); /* wait until transfer is done */
}
while (!(spi->ch[0].SPSTA & 0x01)); /* wait until transfer is done */
}
@@
-79,7
+80,7
@@
void spi_wait_transmit_done(void)
void tsc2000_write(unsigned short reg, unsigned short data)
{
void tsc2000_write(unsigned short reg, unsigned short data)
{
-
S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI
();
+
struct s3c24x0_spi * const spi = s3c24x0_get_base_spi
();
unsigned int command;
SET_CS_TOUCH();
unsigned int command;
SET_CS_TOUCH();
@@
-100,7
+101,7
@@
void tsc2000_write(unsigned short reg, unsigned short data)
unsigned short tsc2000_read (unsigned short reg)
{
unsigned short command, data;
unsigned short tsc2000_read (unsigned short reg)
{
unsigned short command, data;
-
S3C24X0_SPI * const spi = S3C24X0_GetBase_SPI
();
+
struct s3c24x0_spi * const spi = s3c24x0_get_base_spi
();
SET_CS_TOUCH();
command = 0x8000 | reg;
SET_CS_TOUCH();
command = 0x8000 | reg;
@@
-123,7
+124,7
@@
unsigned short tsc2000_read (unsigned short reg)
void tsc2000_set_mux (unsigned int channel)
{
void tsc2000_set_mux (unsigned int channel)
{
-
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO
();
+
struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio
();
CLR_MUX1_ENABLE; CLR_MUX2_ENABLE;
CLR_MUX3_ENABLE; CLR_MUX4_ENABLE;
CLR_MUX1_ENABLE; CLR_MUX2_ENABLE;
CLR_MUX3_ENABLE; CLR_MUX4_ENABLE;
@@
-200,7
+201,7
@@
void tsc2000_set_mux (unsigned int channel)
void tsc2000_set_range (unsigned int range)
{
void tsc2000_set_range (unsigned int range)
{
-
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO
();
+
struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio
();
switch (range) {
case 1:
switch (range) {
case 1:
@@
-306,7
+307,7
@@
s32 tsc2000_contact_temp (void)
void tsc2000_reg_init (void)
{
void tsc2000_reg_init (void)
{
-
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO
();
+
struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio
();
tsc2000_write(TSC2000_REG_ADC, 0x2036);
tsc2000_write(TSC2000_REG_REF, 0x0011);
tsc2000_write(TSC2000_REG_ADC, 0x2036);
tsc2000_write(TSC2000_REG_REF, 0x0011);