From 3bf1be3c0cfb1129b68cc1474119e5f323536488 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Tue, 14 Oct 2008 22:58:53 +0400
Subject: [PATCH] mpc83xx: add support for switching between USB Host/Function
for MPC837XEMDS
With this patch u-boot can fixup the dr_mode and phy_type properties
for the Dual-Role USB controller.
While at it, also remove #ifdefs around includes, they are not needed.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---
board/freescale/mpc837xemds/mpc837xemds.c | 6 ++----
include/configs/MPC837XEMDS.h | 2 ++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 49afa7cf84..acf8ada7b2 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -16,12 +16,9 @@
#include <asm/fsl_serdes.h>
#include <spd_sdram.h>
#include <tsec.h>
-#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
-#endif
-#if defined(CONFIG_PQ_MDS_PIB)
+#include <fdt_support.h>
#include "../common/pq-mds-pib.h"
-#endif
int board_early_init_f(void)
{
@@ -314,6 +311,7 @@ void ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
ft_tsec_fixup(blob, bd);
+ fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
if (board_pci_host_broken())
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 1e46ce23c7..d49155fce0 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -361,6 +361,8 @@ extern int board_pci_host_broken(void);
#define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */
#define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */
+#define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */
+
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
--
2.39.5