* [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for various platforms
@ 2012-03-26 14:15 Ramneek Mehresh
2012-04-18 20:47 ` Andy Fleming
0 siblings, 1 reply; 3+ messages in thread
From: Ramneek Mehresh @ 2012-03-26 14:15 UTC (permalink / raw)
To: u-boot
Add USB device-tree fixup for following platforms:
MPC8536DS, P1022DS, P1023RDS, P2020COME, P2020DS, P2041RDB, P3060QDS
Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
---
board/freescale/mpc8536ds/mpc8536ds.c | 7 ++++++-
board/freescale/p1022ds/p1022ds.c | 6 +++++-
board/freescale/p1023rds/p1023rds.c | 6 +++++-
board/freescale/p2020come/p2020come.c | 6 +++++-
board/freescale/p2020ds/p2020ds.c | 6 +++++-
board/freescale/p2041rdb/p2041rdb.c | 6 +++++-
board/freescale/p3060qds/p3060qds.c | 6 +++++-
include/configs/MPC8536DS.h | 5 ++++-
include/configs/P1022DS.h | 5 ++++-
include/configs/P1023RDS.h | 5 ++++-
include/configs/P2020COME.h | 6 ++++--
include/configs/P2020DS.h | 5 ++++-
include/configs/P2041RDB.h | 8 +++++++-
include/configs/corenet_ds.h | 8 ++++++--
14 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c
index c9f85c8..fb20192 100644
--- a/board/freescale/mpc8536ds/mpc8536ds.c
+++ b/board/freescale/mpc8536ds/mpc8536ds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2010, 2011 Freescale Semiconductor, Inc.
+ * Copyright 2008-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -295,5 +295,10 @@ void ft_board_setup(void *blob, bd_t *bd)
#ifdef CONFIG_FSL_SGMII_RISER
fsl_sgmii_riser_fdt_fixup(blob);
#endif
+
+#ifdef CONFIG_HAS_FSL_MPH_USB
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
}
#endif
diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
index 456d9b0..f9ba1f8 100644
--- a/board/freescale/p1022ds/p1022ds.c
+++ b/board/freescale/p1022ds/p1022ds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2010-2012 Freescale Semiconductor, Inc.
* Authors: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
* Timur Tabi <timur@freescale.com>
*
@@ -341,6 +341,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#ifdef CONFIG_HAS_FSL_DR_USB
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
FT_FSL_PCI_SETUP;
#ifdef CONFIG_FSL_SGMII_RISER
diff --git a/board/freescale/p1023rds/p1023rds.c b/board/freescale/p1023rds/p1023rds.c
index 546819c..2f87583 100644
--- a/board/freescale/p1023rds/p1023rds.c
+++ b/board/freescale/p1023rds/p1023rds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2010-2012 Freescale Semiconductor, Inc.
*
* Authors: Roy Zang <tie-fei.zang@freescale.com>
* Chunhe Lan <b25806@freescale.com>
@@ -197,6 +197,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#ifdef CONFIG_HAS_FSL_DR_USB
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
fdt_fixup_fman_ethernet(blob);
}
#endif
diff --git a/board/freescale/p2020come/p2020come.c b/board/freescale/p2020come/p2020come.c
index 8cf7bee..ce78016 100644
--- a/board/freescale/p2020come/p2020come.c
+++ b/board/freescale/p2020come/p2020come.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Freescale Semiconductor, Inc.
+ * Copyright 2009,2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -282,6 +282,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#ifdef CONFIG_HAS_FSL_DR_USB
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
fdt_fixup_dr_usb(blob, bd);
}
#endif
diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c
index d3af6cf..d9465f9 100644
--- a/board/freescale/p2020ds/p2020ds.c
+++ b/board/freescale/p2020ds/p2020ds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2011 Freescale Semiconductor, Inc.
+ * Copyright 2007-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -261,6 +261,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#ifdef CONFIG_HAS_FSL_DR_USB
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
FT_FSL_PCI_SETUP;
#ifdef CONFIG_FSL_SGMII_RISER
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 1f6a34b..51c4310 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011,2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -215,6 +215,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
#ifdef CONFIG_PCI
pci_of_setup(blob, bd);
#endif
diff --git a/board/freescale/p3060qds/p3060qds.c b/board/freescale/p3060qds/p3060qds.c
index c6c74f2..a413b71 100644
--- a/board/freescale/p3060qds/p3060qds.c
+++ b/board/freescale/p3060qds/p3060qds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -326,6 +326,10 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
+ fdt_fixup_dr_usb(blob, bd);
+#endif
+
#ifdef CONFIG_PCI
pci_of_setup(blob, bd);
#endif
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index c26cb63..e152999 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2009,2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2007-2009,2010-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -714,6 +714,8 @@
/*
* USB
*/
+#define CONFIG_HAS_FSL_MPH_USB
+#ifdef CONFIG_HAS_FSL_MPH_USB
#define CONFIG_USB_EHCI
#ifdef CONFIG_USB_EHCI
@@ -722,6 +724,7 @@
#define CONFIG_USB_EHCI_FSL
#define CONFIG_USB_STORAGE
#endif
+#endif
#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
#define CONFIG_CMD_EXT2
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 70d751d..7096ac0 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2010-2012 Freescale Semiconductor, Inc.
* Authors: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
* Timur Tabi <timur@freescale.com>
*
@@ -434,6 +434,8 @@
/*
* USB
*/
+#define CONFIG_HAS_FSL_DR_USB
+#ifdef CONFIG_HAS_FSL_DR_USB
#define CONFIG_USB_EHCI
#ifdef CONFIG_USB_EHCI
@@ -443,6 +445,7 @@
#define CONFIG_USB_STORAGE
#define CONFIG_CMD_FAT
#endif
+#endif
/*
* Miscellaneous configurable options
diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index e057b1f..be55da4 100644
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2010-2012 Freescale Semiconductor, Inc.
*
* Authors: Roy Zang <tie-fei.zang@freescale.com>
* Chunhe Lan <b25806@freescale.com>
@@ -447,6 +447,8 @@ extern unsigned long get_clock_freq(void);
/*
* USB
*/
+#define CONFIG_HAS_FSL_DR_USB
+#ifdef CONFIG_HAS_FSL_DR_USB
#define CONFIG_USB_EHCI
#ifdef CONFIG_USB_EHCI
@@ -459,6 +461,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_FAT
#define CONFIG_DOS_PARTITION
#endif
+#endif
/*
* Miscellaneous configurable options
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index 365322c..5d50a55 100644
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2010,2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -399,6 +399,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
#endif /* CONFIG_MMC */
+#define CONFIG_HAS_FSL_DR_USB
+#ifdef CONFIG_HAS_FSL_DR_USB
#define CONFIG_USB_EHCI
#ifdef CONFIG_USB_EHCI
@@ -406,7 +408,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_USB_EHCI_FSL
#define CONFIG_USB_STORAGE
-#define CONFIG_HAS_FSL_DR_USB
+#endif
#endif
#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index f0eb029..76a9d17 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2011 Freescale Semiconductor, Inc.
+ * Copyright 2007-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -646,6 +646,8 @@
/*
* USB
*/
+#define CONFIG_HAS_FSL_DR_USB
+#ifdef CONFIG_HAS_FSL_DR_USB
#define CONFIG_USB_EHCI
#ifdef CONFIG_USB_EHCI
@@ -654,6 +656,7 @@
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
+#endif
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index da98f8f..4c18daa 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -518,11 +518,17 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/*
* USB
*/
+#define CONFIG_HAS_FSL_DR_USB
+#define CONFIG_HAS_FSL_MPH_USB
+
+#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
#define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#endif
+
#define CONFIG_CMD_EXT2
#define CONFIG_MMC
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 77dd0a2..38cf5d1 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2011 Freescale Semiconductor, Inc.
+ * Copyright 2009-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -582,13 +582,17 @@
/*
* USB
*/
+#define CONFIG_HAS_FSL_DR_USB
+#define CONFIG_HAS_FSL_MPH_USB
+
+#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
#define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_CMD_EXT2
-#define CONFIG_HAS_FSL_DR_USB
+#endif
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for various platforms
2012-03-26 14:15 [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for various platforms Ramneek Mehresh
@ 2012-04-18 20:47 ` Andy Fleming
2012-04-19 5:36 ` Mehresh Ramneek-B31383
0 siblings, 1 reply; 3+ messages in thread
From: Andy Fleming @ 2012-04-18 20:47 UTC (permalink / raw)
To: u-boot
On Mon, Mar 26, 2012 at 9:15 AM, Ramneek Mehresh
<ramneek.mehresh@freescale.com> wrote:
> Add USB device-tree fixup for following platforms:
> MPC8536DS, P1022DS, P1023RDS, P2020COME, P2020DS, P2041RDB, P3060QDS
>
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> ---
> diff --git a/board/freescale/p2020come/p2020come.c b/board/freescale/p2020come/p2020come.c
> index 8cf7bee..ce78016 100644
> --- a/board/freescale/p2020come/p2020come.c
> +++ b/board/freescale/p2020come/p2020come.c
> @@ -1,5 +1,5 @@
> ?/*
> - * Copyright 2009 Freescale Semiconductor, Inc.
> + * Copyright 2009,2012 Freescale Semiconductor, Inc.
> ?*
> ?* See file CREDITS for list of people who contributed to this
> ?* project.
> @@ -282,6 +282,10 @@ void ft_board_setup(void *blob, bd_t *bd)
>
> ? ? ? ?fdt_fixup_memory(blob, (u64)base, (u64)size);
>
> +#ifdef CONFIG_HAS_FSL_DR_USB
> + ? ? ? fdt_fixup_dr_usb(blob, bd);
> +#endif
> +
> ? ? ? ?fdt_fixup_dr_usb(blob, bd);
Umm.... I don't think this is right. :)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for various platforms
2012-04-18 20:47 ` Andy Fleming
@ 2012-04-19 5:36 ` Mehresh Ramneek-B31383
0 siblings, 0 replies; 3+ messages in thread
From: Mehresh Ramneek-B31383 @ 2012-04-19 5:36 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Andy Fleming [mailto:afleming at gmail.com]
> Sent: Thursday, April 19, 2012 2:17 AM
> To: Mehresh Ramneek-B31383
> Cc: u-boot at lists.denx.de; Fleming Andy-AFLEMING
> Subject: Re: [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for
> various platforms
>
> On Mon, Mar 26, 2012 at 9:15 AM, Ramneek Mehresh <ramneek.mehresh@freescale.com>
> wrote:
> > Add USB device-tree fixup for following platforms:
> > MPC8536DS, P1022DS, P1023RDS, P2020COME, P2020DS, P2041RDB, P3060QDS
> >
> > Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> > ---
> > diff --git a/board/freescale/p2020come/p2020come.c
> > b/board/freescale/p2020come/p2020come.c
> > index 8cf7bee..ce78016 100644
> > --- a/board/freescale/p2020come/p2020come.c
> > +++ b/board/freescale/p2020come/p2020come.c
> > @@ -1,5 +1,5 @@
> > ?/*
> > - * Copyright 2009 Freescale Semiconductor, Inc.
> > + * Copyright 2009,2012 Freescale Semiconductor, Inc.
> > ?*
> > ?* See file CREDITS for list of people who contributed to this
> > ?* project.
> > @@ -282,6 +282,10 @@ void ft_board_setup(void *blob, bd_t *bd)
> >
> > ? ? ? ?fdt_fixup_memory(blob, (u64)base, (u64)size);
> >
> > +#ifdef CONFIG_HAS_FSL_DR_USB
> > + ? ? ? fdt_fixup_dr_usb(blob, bd);
> > +#endif
> > +
> > ? ? ? ?fdt_fixup_dr_usb(blob, bd);
>
>
> Umm....
I don't think this is right. :)
Thanks for pointing out ... will correct ...
- Ramneek
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-19 5:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-26 14:15 [U-Boot] [PATCH] powerpc/85xx: Add USB device-tree fixup for various platforms Ramneek Mehresh
2012-04-18 20:47 ` Andy Fleming
2012-04-19 5:36 ` Mehresh Ramneek-B31383
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.