summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2012-05-25 18:41:50 +0800
committerJustin Waters <justin.waters@timesys.com>2012-09-12 11:05:51 -0400
commit87fc1c3a0e6bac6e8a03703fe12437b1257b4bba (patch)
treed6a8a9f9bd60d92a654070f9f134c7a39ce1ff21 /drivers
parente3bee6ab1294cd56b333a65d57bed7c20ee6aae7 (diff)
ENGR00210918-1 android: add mx6sl android support
- add android build config for mx6sl_arm2 board. - add gpio support for mx6sl - add boot image support - add android recovery support - add fastboot support, but fastboot cannot transfer file. Signed-off-by Zhang Jiejing <jiejing.zhang@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/mxc_gpio.c3
-rw-r--r--drivers/usb/gadget/imx_udc.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index dde079ff2b6..9ad2df07e8c 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -40,7 +40,8 @@ static unsigned long gpio_ports[] = {
[0] = GPIO1_BASE_ADDR,
[1] = GPIO2_BASE_ADDR,
[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL)
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q) \
+ || defined(CONFIG_MX6DL) || defined(CONFIG_MX6SL)
[3] = GPIO4_BASE_ADDR,
#if !defined(CONFIG_MX51)
[4] = GPIO5_BASE_ADDR,
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 7745760941c..c3796d3ab82 100644
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -464,7 +464,7 @@ static void usb_set_mode_device(void)
;
DBG("DOORE RESET END\n");
-#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL)
+#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL) || defined(CONFIG_MX6SL)
reset_usb_phy1();
#endif
DBG("init core to device mode\n");
@@ -812,7 +812,7 @@ int mxc_udc_init(void)
set_usboh3_clk();
set_usb_phy1_clk();
enable_usboh3_clk(1);
-#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL)
+#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL) || defined(CONFIG_MX6SL)
udc_disable_over_current();
#endif
enable_usb_phy1_clk(1);