[U-Boot] [PATCH 1/3] powerpc/85xx: Replace memctl_intlv_ctl with hwconfig on MPC8572DS
From: Zhao Chenhui b35336@freescale.com
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org --- include/configs/MPC8572DS.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 4224229..2b0e58b 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -741,7 +741,7 @@ #define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \ - "memctl_intlv_ctl=2\0" \ + "hwconfig=fsl_ddr:ctlr_intlv=bank\0" \ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \
From: Zhao Chenhui b35336@freescale.com
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org --- include/configs/MPC8572DS.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2b0e58b..0f419c5 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -741,7 +741,7 @@ #define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:ctlr_intlv=bank\0" \ + "hwconfig=fsl_ddr:ctlr_intlv=bank,ecc=off\0" \ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \
From: Zhao Chenhui b35336@freescale.com
MPC8572DS provides 2 USB ports with ULI1575. We enable USB storage device support using PCI EHCI module.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org --- drivers/usb/host/ehci-pci.c | 3 +++ include/configs/MPC8572DS.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index cff3438..a038b6c 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -1,4 +1,6 @@ /*- + * Copyright 2011 Freescale Semiconductor, Inc. + * * Copyright (c) 2007-2008, Juniper Networks, Inc. * All rights reserved. * @@ -29,6 +31,7 @@ static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ {0x1033, 0x00E0}, + {0x10b9, 0x5239}, /* ULI1575 PCI EHCI module ids */ {0, 0} }; #endif diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 0f419c5..62ce3c4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -672,6 +672,20 @@ #define CONFIG_CMD_EXT2 #endif
+/* + * USB + */ +#define CONFIG_USB_EHCI + +#ifdef CONFIG_USB_EHCI +#define CONFIG_CMD_USB +#define CONFIG_USB_EHCI_PCI +#define ONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_USB_STORAGE +#define CONFIG_PCI_EHCI_DEVICE 0 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#endif + #undef CONFIG_WATCHDOG /* watchdog disabled */
/*
Hi,
2011/3/7 Kumar Gala galak@kernel.crashing.org:
From: Zhao Chenhui b35336@freescale.com
MPC8572DS provides 2 USB ports with ULI1575. We enable USB storage device support using PCI EHCI module.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org
drivers/usb/host/ehci-pci.c | 3 +++ include/configs/MPC8572DS.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index cff3438..a038b6c 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -1,4 +1,6 @@ /*-
- Copyright 2011 Freescale Semiconductor, Inc.
Please only add your own copyright line if you make a significant change to a file.
* Copyright (c) 2007-2008, Juniper Networks, Inc. * All rights reserved. * @@ -29,6 +31,7 @@ static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ {0x1033, 0x00E0},
- {0x10b9, 0x5239}, /* ULI1575 PCI EHCI module ids */
{0, 0} }; #endif diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 0f419c5..62ce3c4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h
This patch needs to be split up. The board change is unrelated to the USB vendor/device addition.
Kind regards,
Remy
From: Zhao Chenhui b35336@freescale.com
Add ULI1575 EHCI controller to the list of the supported devices.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org --- * replaces previous patch for 8572ds * adds feedback from Remy
drivers/usb/host/ehci-pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index cff3438..bf490b0 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -29,6 +29,7 @@ static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ {0x1033, 0x00E0}, + {0x10b9, 0x5239}, /* ULI1575 PCI EHCI module ids */ {0, 0} }; #endif
On Mar 13, 2011, at 10:07 AM, Kumar Gala wrote:
From: Zhao Chenhui b35336@freescale.com
Add ULI1575 EHCI controller to the list of the supported devices.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org
- replaces previous patch for 8572ds
- adds feedback from Remy
drivers/usb/host/ehci-pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index cff3438..bf490b0 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -29,6 +29,7 @@ static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ {0x1033, 0x00E0},
- {0x10b9, 0x5239}, /* ULI1575 PCI EHCI module ids */ {0, 0}
};
#endif
1.7.2.3
Remy, do you mind Ack and if are you ok if this goes via u-boot-85xx tree to keep it in sync with the board patch?
- k
Hi,
2011/3/15 Kumar Gala galak@kernel.crashing.org:
On Mar 13, 2011, at 10:07 AM, Kumar Gala wrote:
From: Zhao Chenhui b35336@freescale.com
Add ULI1575 EHCI controller to the list of the supported devices.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org
- replaces previous patch for 8572ds
- adds feedback from Remy
drivers/usb/host/ehci-pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index cff3438..bf490b0 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -29,6 +29,7 @@ static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ {0x1033, 0x00E0},
- {0x10b9, 0x5239}, /* ULI1575 PCI EHCI module ids */
{0, 0} };
#endif
1.7.2.3
Remy, do you mind Ack and if are you ok if this goes via u-boot-85xx tree to keep it in sync with the board patch?
You can push it forward via the u-boot-85xx tree. Acked-by: Remy Bohmer linux@bohmer.net
Remy
On Mar 13, 2011, at 10:07 AM, Kumar Gala wrote:
From: Zhao Chenhui b35336@freescale.com
Add ULI1575 EHCI controller to the list of the supported devices.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org
- replaces previous patch for 8572ds
- adds feedback from Remy
drivers/usb/host/ehci-pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
applied to 85xx-next
- k
From: Zhao Chenhui b35336@freescale.com
MPC8572DS provides 2 USB ports with ULI1575. We enable USB storage device support using PCI EHCI module.
Signed-off-by: Zhao Chenhui b35336@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org --- include/configs/MPC8572DS.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 0f419c5..62ce3c4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -672,6 +672,20 @@ #define CONFIG_CMD_EXT2 #endif
+/* + * USB + */ +#define CONFIG_USB_EHCI + +#ifdef CONFIG_USB_EHCI +#define CONFIG_CMD_USB +#define CONFIG_USB_EHCI_PCI +#define ONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_USB_STORAGE +#define CONFIG_PCI_EHCI_DEVICE 0 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#endif + #undef CONFIG_WATCHDOG /* watchdog disabled */
/*
participants (2)
-
Kumar Gala -
Remy Bohmer