diff options
| -rw-r--r-- | src/target/firmware/board/compal_e86/init.c | 8 | ||||
| -rw-r--r-- | src/target/firmware/board/compal_e88/init.c | 8 | ||||
| -rw-r--r-- | src/target/firmware/board/compal_e99/init.c | 6 | ||||
| -rw-r--r-- | src/target/firmware/board/gta0x/init.c | 8 | ||||
| -rw-r--r-- | src/target/firmware/board/pirelli_dpl10/init.c | 3 |
5 files changed, 16 insertions, 17 deletions
diff --git a/src/target/firmware/board/compal_e86/init.c b/src/target/firmware/board/compal_e86/init.c index 92f0e3ba..537702c2 100644 --- a/src/target/firmware/board/compal_e86/init.c +++ b/src/target/firmware/board/compal_e86/init.c @@ -47,7 +47,7 @@ #include <display.h> #define ARMIO_LATCH_OUT 0xfffe4802 -#define ARMIO_CNTL_REG 0xfffe4804 +#define IO_CNTL_REG 0xfffe4804 #define ASIC_CONF_REG 0xfffef008 static void board_io_init(void) @@ -64,9 +64,9 @@ static void board_io_init(void) /* LCD Set I/O(3) to output mode and enable C140 backlight (IO1) */ /* FIXME: Put the display backlight control to backlight.c */ - reg = readw(ARMIO_CNTL_REG); - reg &= ~( (1 << 3) | (1 << 1)); - writew(reg, ARMIO_CNTL_REG); + reg = readw(IO_CNTL_REG); + reg &= ~((1 << 3) | (1 << 1)); + writew(reg, IO_CNTL_REG); /* LCD Set I/O(3) output low */ reg = readw(ARMIO_LATCH_OUT); diff --git a/src/target/firmware/board/compal_e88/init.c b/src/target/firmware/board/compal_e88/init.c index 5a4f882f..54deb6a2 100644 --- a/src/target/firmware/board/compal_e88/init.c +++ b/src/target/firmware/board/compal_e88/init.c @@ -47,7 +47,7 @@ #include <display.h> #define ARMIO_LATCH_OUT 0xfffe4802 -#define ARMIO_CNTL_REG 0xfffe4804 +#define IO_CNTL_REG 0xfffe4804 #define ASIC_CONF_REG 0xfffef008 static void board_io_init(void) @@ -58,15 +58,15 @@ static void board_io_init(void) /* LCD Set I/O(3) / SA0 to I/O(3) mode */ reg &= ~(1 << 10); /* Set function pins to I2C Mode */ - reg |= 0x1080; /* SCL / SDA */ + reg |= ((1 << 12) | (1 << 7)); /* SCL / SDA */ /* TWL3025: Set SPI+RIF RX clock to rising edge */ reg |= (1 << 13) | (1 << 14); writew(reg, ASIC_CONF_REG); /* LCD Set I/O(3) to output mode */ - reg = readw(ARMIO_CNTL_REG); + reg = readw(IO_CNTL_REG); reg &= ~(1 << 3); - writew(reg, ARMIO_CNTL_REG); + writew(reg, IO_CNTL_REG); /* LCD Set I/O(3) output low */ reg = readw(ARMIO_LATCH_OUT); diff --git a/src/target/firmware/board/compal_e99/init.c b/src/target/firmware/board/compal_e99/init.c index 47725a99..ed45c39c 100644 --- a/src/target/firmware/board/compal_e99/init.c +++ b/src/target/firmware/board/compal_e99/init.c @@ -47,7 +47,7 @@ #include <display.h> #define ARMIO_LATCH_OUT 0xfffe4802 -#define ARMIO_CNTL_REG 0xfffe4804 +#define IO_CNTL_REG 0xfffe4804 #define ASIC_CONF_REG 0xfffef008 static void board_io_init(void) @@ -64,9 +64,9 @@ static void board_io_init(void) /* LCD Set I/O(3) to output mode and enable C155 backlight (IO1) */ /* FIXME: Put the display backlight control to backlight.c */ - reg = readw(ARMIO_CNTL_REG); + reg = readw(IO_CNTL_REG); reg &= ~( (1 << 3) | (1 << 1)); - writew(reg, ARMIO_CNTL_REG); + writew(reg, IO_CNTL_REG); /* LCD Set I/O(3) output low */ reg = readw(ARMIO_LATCH_OUT); diff --git a/src/target/firmware/board/gta0x/init.c b/src/target/firmware/board/gta0x/init.c index 573b763d..545250d3 100644 --- a/src/target/firmware/board/gta0x/init.c +++ b/src/target/firmware/board/gta0x/init.c @@ -47,7 +47,7 @@ #include <display.h> #define ARMIO_LATCH_OUT 0xfffe4802 -#define ARMIO_CNTL_REG 0xfffe4804 +#define IO_CNTL_REG 0xfffe4804 #define ASIC_CONF_REG 0xfffef008 static void board_io_init(void) @@ -58,15 +58,15 @@ static void board_io_init(void) /* LCD Set I/O(3) / SA0 to I/O(3) mode */ reg &= ~(1 << 10); /* Set function pins to I2C Mode */ - reg |= 0x1080; /* SCL / SDA */ + reg |= ((1 << 12) | (1 << 7)); /* SCL / SDA */ /* TWL3025: Set SPI+RIF RX clock to rising edge */ reg |= (1 << 13) | (1 << 14); writew(reg, ASIC_CONF_REG); /* LCD Set I/O(3) to output mode */ - reg = readw(ARMIO_CNTL_REG); + reg = readw(IO_CNTL_REG); reg &= ~(1 << 3); - writew(reg, ARMIO_CNTL_REG); + writew(reg, IO_CNTL_REG); /* LCD Set I/O(3) output low */ reg = readw(ARMIO_LATCH_OUT); diff --git a/src/target/firmware/board/pirelli_dpl10/init.c b/src/target/firmware/board/pirelli_dpl10/init.c index 0ec11a1f..cd388393 100644 --- a/src/target/firmware/board/pirelli_dpl10/init.c +++ b/src/target/firmware/board/pirelli_dpl10/init.c @@ -48,7 +48,6 @@ #include <display.h> #define ARMIO_LATCH_OUT 0xfffe4802 -#define ARMIO_CNTL_REG 0xfffe4804 #define ASIC_CONF_REG 0xfffef008 static void board_io_init(void) @@ -57,7 +56,7 @@ static void board_io_init(void) reg = readw(ASIC_CONF_REG); /* Set function pins to I2C Mode */ - reg |= 0x1080; /* SCL / SDA */ + reg |= ((1 << 12) | (1 << 7)); /* SCL / SDA */ /* TWL3025: Set SPI+RIF RX clock to rising edge */ reg |= (1 << 13) | (1 << 14); writew(reg, ASIC_CONF_REG); |