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

Merge branch 'pu/efikasb' into for-next/imx

This commit is contained in:
Sascha Hauer 2012-12-19 21:24:58 +01:00
parent 885694f827 63aa5bd164
commit d1104e40a0
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/boards/efika-mx-smartbook/board.c
View File

@ -80,6 +80,21 @@ static iomux_v3_cfg_t efika_pads[] = {
MX51_PAD_SD1_DATA3__SD1_DATA3,
MX51_PAD_GPIO1_1__GPIO1_1,
/* USB HOST1 */
MX51_PAD_USBH1_CLK__USBH1_CLK,
MX51_PAD_USBH1_DIR__USBH1_DIR,
MX51_PAD_USBH1_NXT__USBH1_NXT,
MX51_PAD_USBH1_DATA0__USBH1_DATA0,
MX51_PAD_USBH1_DATA1__USBH1_DATA1,
MX51_PAD_USBH1_DATA2__USBH1_DATA2,
MX51_PAD_USBH1_DATA3__USBH1_DATA3,
MX51_PAD_USBH1_DATA4__USBH1_DATA4,
MX51_PAD_USBH1_DATA5__USBH1_DATA5,
MX51_PAD_USBH1_DATA6__USBH1_DATA6,
MX51_PAD_USBH1_DATA7__USBH1_DATA7,
MX51_PAD_USBH1_STP__GPIO1_27,
MX51_PAD_EIM_A16__GPIO2_10,
/* USB HOST2 */
MX51_PAD_EIM_D27__GPIO2_9,
MX51_PAD_GPIO1_5__GPIO1_5,
@ -96,21 +111,6 @@ static iomux_v3_cfg_t efika_pads[] = {
MX51_PAD_EIM_A26__GPIO2_20,
MX51_PAD_EIM_A27__USBH2_NXT,
/* USB HOST1 */
MX51_PAD_USBH1_CLK__USBH1_CLK,
MX51_PAD_USBH1_DIR__USBH1_DIR,
MX51_PAD_USBH1_NXT__USBH1_NXT,
MX51_PAD_USBH1_DATA0__USBH1_DATA0,
MX51_PAD_USBH1_DATA1__USBH1_DATA1,
MX51_PAD_USBH1_DATA2__USBH1_DATA2,
MX51_PAD_USBH1_DATA3__USBH1_DATA3,
MX51_PAD_USBH1_DATA4__USBH1_DATA4,
MX51_PAD_USBH1_DATA5__USBH1_DATA5,
MX51_PAD_USBH1_DATA6__USBH1_DATA6,
MX51_PAD_USBH1_DATA7__USBH1_DATA7,
MX51_PAD_USBH1_STP__GPIO1_27,
MX51_PAD_EIM_A16__GPIO2_10,
/* PATA */
MX51_PAD_NANDF_WE_B__PATA_DIOW,
MX51_PAD_NANDF_RE_B__PATA_DIOR,
@ -142,7 +142,6 @@ static iomux_v3_cfg_t efika_pads[] = {
MX51_PAD_NANDF_D1__PATA_DATA1,
MX51_PAD_NANDF_D0__PATA_DATA0,
/* USB U-Boot */
MX51_PAD_EIM_A22__GPIO2_16, /* WLAN enable (1 = on) */
MX51_PAD_EIM_A17__GPIO2_11,
@ -271,7 +270,7 @@ static void efikamx_power_init(void)
udelay(50);
/* Raise the core frequency to 800MHz */
console_flush();
console_flush();
imx51_init_lowlevel(800);
clock_notifier_call_chain();

7
arch/arm/boards/efika-mx-smartbook/config.h
View File

@ -1,7 +1,4 @@
/**
* @file
* @brief Global defintions for the ARM i.MX51 based babbage board
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
@ -12,10 +9,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __CONFIG_H