summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/kindle3/kindle3.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/kindle3/kindle3.c')
-rw-r--r--arch/arm/boards/kindle3/kindle3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boards/kindle3/kindle3.c b/arch/arm/boards/kindle3/kindle3.c
index e06b3d70ce..1d966ff55a 100644
--- a/arch/arm/boards/kindle3/kindle3.c
+++ b/arch/arm/boards/kindle3/kindle3.c
@@ -86,7 +86,7 @@ BAREBOX_MAGICVAR_NAMED(global_atags_revision16, global.board.revision16,
/* The Kindle3 Kernel expects two custom ATAGs, ATAG_REVISION16 describing
* the board and ATAG_SERIAL16 to identify the individual device.
*/
-struct tag *kindle3_append_atags(struct tag *params)
+static struct tag *kindle3_append_atags(struct tag *params)
{
params = setup_16char_tag(params, ATAG_SERIAL16,
get_env_16char_tag("global.board.serial16"));
@@ -152,6 +152,7 @@ static int kindle3_devices_init(void)
}
device_initcall(kindle3_devices_init);
+#define FIVEWAY_PAD_CTL (PAD_CTL_PUS_100K_UP | PAD_CTL_HYS | PAD_CTL_DVS)
static iomux_v3_cfg_t kindle3_pads[] = {
/* UART1 */
MX35_PAD_RXD1__UART1_RXD_MUX,
@@ -183,12 +184,11 @@ static iomux_v3_cfg_t kindle3_pads[] = {
MX35_PAD_CSPI1_SPI_RDY__CSPI1_RDY,
/* fiveway device: up, down, left, right, select */
- MX35_PAD_ATA_DATA14__GPIO2_27,
- MX35_PAD_ATA_DATA15__GPIO2_28,
- MX35_PAD_TX5_RX0__GPIO1_10,
- MX35_PAD_ATA_BUFF_EN__GPIO2_30,
- IOMUX_PAD(0x728, 0x2c4, 5, 0x8c8, 1,
- PAD_CTL_PUS_100K_UP | PAD_CTL_HYS | PAD_CTL_DVS),
+ IOMUX_PAD(0x718, 0x2b4, 5, 0x8b4, 1, FIVEWAY_PAD_CTL),
+ IOMUX_PAD(0x71c, 0x2b8, 5, 0x8b8, 1, FIVEWAY_PAD_CTL),
+ IOMUX_PAD(0x59c, 0x158, 5, 0x830, 0, FIVEWAY_PAD_CTL),
+ IOMUX_PAD(0x724, 0x2c0, 5, 0x8c4, 1, FIVEWAY_PAD_CTL),
+ IOMUX_PAD(0x728, 0x2c4, 5, 0x8c8, 1, FIVEWAY_PAD_CTL),
/* Volume keys: up, down */
MX35_PAD_SCKR__GPIO1_4,