sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/mxs'

This commit is contained in:
Sascha Hauer 2013-10-07 08:00:28 +02:00
parent d9870d782a c002de40aa
commit 71fbdfbb13
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/boards/freescale-mx28-evk/mx28-evk.c
View File

@ -32,6 +32,8 @@
#include <mach/iomux.h>
#include <mach/ocotp.h>
#include <mach/devices.h>
#include <mach/usb.h>
#include <usb/fsl_usb2.h>
#include <spi/spi.h>
#include <asm/armlinux.h>
@ -135,6 +137,11 @@ static const uint32_t mx28evk_pads[] = {
SSP2_D3 | VE_3_3V | PULLUP(1) | STRENGTH(S8MA), /* SS0 !CS */
SSP2_CMD | VE_3_3V | PULLUP(1) | STRENGTH(S8MA), /* MOSI DIO */
SSP2_SCK | VE_3_3V | PULLUP(1) | STRENGTH(S8MA), /* CLK */
/* USB VBUS1 ENABLE - default to ON */
AUART2_RX_GPIO | VE_3_3V | PULLUP(0) | GPIO_OUT | GPIO_VALUE(1),
/* USB VBUS0 ENABLE - default to OFF */
AUART2_TX_GPIO | VE_3_3V | PULLUP(0) | GPIO_OUT | GPIO_VALUE(0),
};
static struct mxs_mci_platform_data mci_pdata = {
@ -247,6 +254,12 @@ static const struct spi_board_info mx28evk_spi_board_info[] = {
}
};
#ifdef CONFIG_USB_GADGET_DRIVER_ARC
static struct fsl_usb2_platform_data usb_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI,
};
#endif
static int mx28_evk_devices_init(void)
{
int i;
@ -280,6 +293,14 @@ static int mx28_evk_devices_init(void)
add_generic_device("mxs_spi", 2, NULL, IMX_SSP2_BASE, 0x2000,
IORESOURCE_MEM, NULL);
#ifdef CONFIG_USB_GADGET_DRIVER_ARC
imx28_usb_phy0_enable();
imx28_usb_phy1_enable();
add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, IMX_USB1_BASE, NULL);
add_generic_device("fsl-udc", DEVICE_ID_DYNAMIC, NULL, IMX_USB0_BASE,
0x200, IORESOURCE_MEM, &usb_pdata);
#endif
return 0;
}
device_initcall(mx28_evk_devices_init);

5
arch/arm/configs/imx28evk_defconfig
View File

@ -26,8 +26,6 @@ CONFIG_CMD_ECHO_E=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
@ -36,8 +34,9 @@ CONFIG_NET=y
CONFIG_NET_DHCP=y
CONFIG_NET_PING=y
CONFIG_NET_RESOLV=y
CONFIG_DRIVER_SERIAL_AUART=y
CONFIG_DRIVER_NET_FEC_IMX=y
# CONFIG_SPI is not set
CONFIG_DRIVER_SPI_MXS=y
CONFIG_MTD=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y

3
arch/arm/mach-mxs/include/mach/imx28-regs.h
View File

@ -41,7 +41,8 @@
#define IMX_DBGUART_BASE 0x80074000
#define IMX_USBPHY0_BASE 0x8007c000
#define IMX_USBPHY1_BASE 0x8007e000
#define IMX_USB_BASE 0x80080000
#define IMX_USB0_BASE 0x80080000
#define IMX_USB1_BASE 0x80090000
#define IMX_FEC0_BASE 0x800F0000
#define IMX_FEC1_BASE 0x800F4000