summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2009-11-12 14:25:13 +0800
committerTerry Lv <r65388@freescale.com>2009-11-12 14:25:13 +0800
commita5c3bc03d12c2ed6b2627ea99f20d05b184d00d6 (patch)
tree1cc7847230b51e7b7aac795be48e5eb8a52a16bd /drivers
parent20710100e480543d36b76845c52cdec382f2b43a (diff)
downloadu-boot-imx-a5c3bc03d12c2ed6b2627ea99f20d05b184d00d6.zip
u-boot-imx-a5c3bc03d12c2ed6b2627ea99f20d05b184d00d6.tar.gz
u-boot-imx-a5c3bc03d12c2ed6b2627ea99f20d05b184d00d6.tar.bz2
ENGR00118362: Correct recovery NAND cmd
This patch will fix three issues: 1. Add boot device detection. 2. Use right nand command in anroid for recovery mode. 3. Recovery mode code clean. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mxc_keyb.c6
-rw-r--r--drivers/spi/imx_spi_pmic.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mxc_keyb.c b/drivers/input/mxc_keyb.c
index 8682b79..ec65ab5 100644
--- a/drivers/input/mxc_keyb.c
+++ b/drivers/input/mxc_keyb.c
@@ -122,7 +122,7 @@ extern void setup_mxc_kpd(void);
*
* @result Number of key pressed/released.
*/
-static int mxc_kpp_scan_matrix()
+static int mxc_kpp_scan_matrix(void)
{
unsigned short reg_val;
int col, row;
@@ -289,7 +289,7 @@ static int mxc_kpp_scan_matrix()
return keycnt;
}
-static int mxc_kpp_reset()
+static int mxc_kpp_reset(void)
{
unsigned short reg_val;
int i;
@@ -485,7 +485,7 @@ static void mxc_kpp_free_allocated(void)
* @return The function returns 0 on successful registration. Otherwise returns
* specific error code.
*/
-int mxc_kpp_init()
+int mxc_kpp_init(void)
{
int i;
int retval;
diff --git a/drivers/spi/imx_spi_pmic.c b/drivers/spi/imx_spi_pmic.c
index 2ed795f..678f0b4 100644
--- a/drivers/spi/imx_spi_pmic.c
+++ b/drivers/spi/imx_spi_pmic.c
@@ -119,7 +119,7 @@ void show_pmic_info(struct spi_slave *slave)
printf("]\n");
}
-struct spi_slave *spi_pmic_probe()
+struct spi_slave *spi_pmic_probe(void)
{
return spi_setup_slave(0, CONFIG_IMX_SPI_PMIC_CS, 2500000, 0);
}