mirror of
https://xff.cz/git/u-boot/
synced 2025-09-30 06:51:28 +02:00
board: ge: mx53ppd: use DM for uart
Drop PPD_UART_PAD_CTRL since it matches defaults. Enable DM serial and MXC uart. Signed-off-by: Ian Ray <ian.ray@ge.com> Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
This commit is contained in:
@@ -85,9 +85,6 @@ u32 get_board_rev(void)
|
|||||||
return get_cpu_rev() & ~(0xF << 8);
|
return get_cpu_rev() & ~(0xF << 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \
|
|
||||||
PAD_CTL_PUS_100K_UP | PAD_CTL_ODE)
|
|
||||||
|
|
||||||
#ifdef CONFIG_USB_EHCI_MX5
|
#ifdef CONFIG_USB_EHCI_MX5
|
||||||
int board_ehci_hcd_init(int port)
|
int board_ehci_hcd_init(int port)
|
||||||
{
|
{
|
||||||
|
@@ -9,15 +9,9 @@
|
|||||||
#include <asm/arch/iomux-mx53.h>
|
#include <asm/arch/iomux-mx53.h>
|
||||||
#include <asm/gpio.h>
|
#include <asm/gpio.h>
|
||||||
|
|
||||||
#define PPD_UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \
|
|
||||||
PAD_CTL_PUS_100K_UP)
|
|
||||||
|
|
||||||
static const iomux_v3_cfg_t ppd_pads[] = {
|
static const iomux_v3_cfg_t ppd_pads[] = {
|
||||||
/* FEC */
|
/* FEC */
|
||||||
MX53_PAD_EIM_A22__GPIO2_16,
|
MX53_PAD_EIM_A22__GPIO2_16,
|
||||||
/* UART */
|
|
||||||
NEW_PAD_CTRL(MX53_PAD_PATA_DMACK__UART1_RXD_MUX, PPD_UART_PAD_CTRL),
|
|
||||||
NEW_PAD_CTRL(MX53_PAD_PATA_DIOW__UART1_TXD_MUX, PPD_UART_PAD_CTRL),
|
|
||||||
/* Video */
|
/* Video */
|
||||||
MX53_PAD_CSI0_DATA_EN__GPIO5_20, /* LR_SCAN_CTRL */
|
MX53_PAD_CSI0_DATA_EN__GPIO5_20, /* LR_SCAN_CTRL */
|
||||||
MX53_PAD_CSI0_VSYNC__GPIO5_21, /* UD_SCAN_CTRL */
|
MX53_PAD_CSI0_VSYNC__GPIO5_21, /* UD_SCAN_CTRL */
|
||||||
|
@@ -60,6 +60,9 @@ CONFIG_DM_REGULATOR_FIXED=y
|
|||||||
CONFIG_PWM_IMX=y
|
CONFIG_PWM_IMX=y
|
||||||
CONFIG_DM_RTC=y
|
CONFIG_DM_RTC=y
|
||||||
CONFIG_RTC_S35392A=y
|
CONFIG_RTC_S35392A=y
|
||||||
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
||||||
|
CONFIG_DM_SERIAL=y
|
||||||
|
CONFIG_MXC_UART=y
|
||||||
CONFIG_SYSRESET=y
|
CONFIG_SYSRESET=y
|
||||||
CONFIG_SYSRESET_WATCHDOG=y
|
CONFIG_SYSRESET_WATCHDOG=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
@@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
|
|
||||||
#define CONSOLE_DEV "ttymxc0"
|
|
||||||
|
|
||||||
#define CONFIG_CMDLINE_TAG
|
#define CONFIG_CMDLINE_TAG
|
||||||
#define CONFIG_SETUP_MEMORY_TAGS
|
#define CONFIG_SETUP_MEMORY_TAGS
|
||||||
#define CONFIG_INITRD_TAG
|
#define CONFIG_INITRD_TAG
|
||||||
@@ -25,9 +23,6 @@
|
|||||||
#define CONFIG_BOARD_LATE_INIT
|
#define CONFIG_BOARD_LATE_INIT
|
||||||
#define CONFIG_REVISION_TAG
|
#define CONFIG_REVISION_TAG
|
||||||
|
|
||||||
#define CONFIG_MXC_UART
|
|
||||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
|
||||||
|
|
||||||
/* USB Configs */
|
/* USB Configs */
|
||||||
#define CONFIG_USB_HOST_ETHER
|
#define CONFIG_USB_HOST_ETHER
|
||||||
#define CONFIG_USB_ETHER_ASIX
|
#define CONFIG_USB_ETHER_ASIX
|
||||||
@@ -70,11 +65,9 @@
|
|||||||
"devnum=2\0" \
|
"devnum=2\0" \
|
||||||
"rootdev=mmcblk0p\0" \
|
"rootdev=mmcblk0p\0" \
|
||||||
"quiet=quiet loglevel=0\0" \
|
"quiet=quiet loglevel=0\0" \
|
||||||
"console=" CONSOLE_DEV "\0" \
|
|
||||||
"lvds=ldb\0" \
|
"lvds=ldb\0" \
|
||||||
"setargs=setenv bootargs ${lvds} jtag=on mem=2G " \
|
"setargs=setenv bootargs ${lvds} jtag=on mem=2G " \
|
||||||
"vt.global_cursor_default=0 bootcause=${bootcause} ${quiet} " \
|
"vt.global_cursor_default=0 bootcause=${bootcause} ${quiet}\0" \
|
||||||
"console=${console}\0" \
|
|
||||||
"bootargs_emmc=setenv bootargs root=/dev/${rootdev}${partnum} ro " \
|
"bootargs_emmc=setenv bootargs root=/dev/${rootdev}${partnum} ro " \
|
||||||
"rootwait ${bootargs}\0" \
|
"rootwait ${bootargs}\0" \
|
||||||
"doquiet=if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
|
"doquiet=if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
|
||||||
|
Reference in New Issue
Block a user