[U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID

Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada david.saada@ecitele.com
diff -purN usb_ohci.c.orig usb_ohci.c
--- usb_ohci.c.orig 2007-09-11 15:59:55.780415000 +0300 +++ usb_ohci.c 2007-09-16 09:52:06.146578000 +0200 @@ -93,6 +93,7 @@ #ifdef CONFIG_PCI_OHCI static struct pci_device_id ohci_pci_ids[] = { {0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */ + {0x1033, 0x0035}, /* NEC PCI OHCI module ids */ /* Please add supported PCI OHCI controller ids here */ {0, 0} };

Dear David,
David Saada David.Saada@ecitele.com writes:
Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada david.saada@ecitele.com
diff -purN usb_ohci.c.orig usb_ohci.c
I guess this is against drivers/usb_ohci.c, right?
Best regards
Markus Klotzbuecher
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de

In message 12697486.post@talk.nabble.com you wrote:
Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada david.saada@ecitele.com
diff -purN usb_ohci.c.orig usb_ohci.c
--- usb_ohci.c.orig 2007-09-11 15:59:55.780415000 +0300 +++ usb_ohci.c 2007-09-16 09:52:06.146578000 +0200 @@ -93,6 +93,7 @@ #ifdef CONFIG_PCI_OHCI static struct pci_device_id ohci_pci_ids[] = { {0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */
{0x1033, 0x0035}, /* NEC PCI OHCI module ids */ /* Please add supported PCI OHCI controller ids here */ {0, 0}
};
Please use TABs for indentation - please clean up and resubmit.

Patch resubmitted. I hope the tabs are ok now - please tell me if not (I post via the Nabble forum).
Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada david.saada@ecitele.com
diff -purN drivers/usb_ohci.c.orig drivers/usb_ohci.c
--- drivers/usb_ohci.c.orig 2007-09-11 15:59:55.780415000 +0300 +++ drivers/usb_ohci.c 2007-09-16 09:52:06.146578000 +0200 @@ -93,6 +93,7 @@ #ifdef CONFIG_PCI_OHCI static struct pci_device_id ohci_pci_ids[] = { {0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */ + {0x1033, 0x0035}, /* NEC PCI OHCI module ids */ /* Please add supported PCI OHCI controller ids here */ {0, 0} };

David Saada David.Saada@ecitele.com writes:
Patch resubmitted. I hope the tabs are ok now - please tell me if not (I post via the Nabble forum).
Thanks, patch added to USB Custodian repo.
Best regards
Markus Klotzbuecher
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de

In message 873axdtj9r.fsf@denx.de you wrote:
David Saada David.Saada@ecitele.com writes:
Patch resubmitted. I hope the tabs are ok now - please tell me if not (I post via the Nabble forum).
Thanks, patch added to USB Custodian repo.
Should that go into 1.3.0?
Best regards,
Wolfgang Denk

Hi Wolfgang,
Wolfgang Denk wd@denx.de writes:
In message 873axdtj9r.fsf@denx.de you wrote:
David Saada David.Saada@ecitele.com writes:
Patch resubmitted. I hope the tabs are ok now - please tell me if not (I post via the Nabble forum).
Thanks, patch added to USB Custodian repo.
Should that go into 1.3.0?
Yes please:
The following changes since commit 67c31036acaaaa992fc346cc89db0909a7e733c4: Wolfgang Denk (1): TQM8xx[LM]: Fix broken environment alignment.
are available in the git repository at:
git://www.denx.de/git/u-boot-usb.git master
David Saada (1): Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Markus Klotzbuecher (1): Merge with git://www.denx.de/git/u-boot.git
drivers/usb_ohci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Viele Grüße / Best regards
Markus Klotzbücher
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de

In message 87r6kvqbj5.fsf@denx.de you wrote:
The following changes since commit 67c31036acaaaa992fc346cc89db0909a7e733c4: Wolfgang Denk (1): TQM8xx[LM]: Fix broken environment alignment.
are available in the git repository at:
git://www.denx.de/git/u-boot-usb.git master
Merged. Thanks.
Best regards,
Wolfgang Denk

Please pull from git://denx.de/git/u-boot-microblaze.git merge
Thanks Michal Simek
The following changes since commit b90c045f035c3cc9b5d2edaed6048dfb74e40763: Michal Simek (1): synchronizition with mainline
are found in the git repository at:
git://www.denx.de/git/u-boot.git
Michal Simek (8): [FIX] repair MFSL commands [FIX] repair email address [FIX] resolve problem with cpu without barrel shifter Add support for design without interrupt controller Change macro name for UartLite [FIX] Email reparation & Copyright [FIX] change sets of commands [FIX] change command handling and removing code violation
common/cmd_mfsl.c | 16 ++++++------ cpu/microblaze/cache.c | 2 +- cpu/microblaze/start.S | 6 +--- cpu/microblaze/timer.c | 7 +++++ drivers/serial_xuartlite.c | 2 +- include/configs/ml401.h | 53 +++++++++++++++++++++---------------------- include/configs/suzaku.h | 19 +++++++-------- include/configs/xupv2p.h | 3 +- lib_microblaze/time.c | 8 ++++++ 9 files changed, 64 insertions(+), 52 deletions(-)

In message 001101c7fe27$252a5760$0200a8c0@monstrone you wrote:
Please pull from git://denx.de/git/u-boot-microblaze.git merge
Please don't do that. Please put the stuff for me to merge in the master branch.
I'll make an exception this time, but only this time.
Best regards,
Wolfgang Denk

On 10/13/07, Wolfgang Denk wd@denx.de wrote:
In message 001101c7fe27$252a5760$0200a8c0@monstrone you wrote:
Please pull from git://denx.de/git/u-boot-microblaze.git merge
Please don't do that. Please put the stuff for me to merge in the master branch.
Really? It's perfectly reasonable for custodians to have multiple branches and to request for you to pull from a specific one. This becomes especially true with the adoption of the merge window process. For instance, I have two branches on the 5xxx tree; one for bugfixes to be merged immediately and another for stuff queued up for the next window.
Besides, when someone uses git-request-pull (like Michal did) it's a pretty trivial cut/paste to use git-pull to bring it into your branch. It's not like it causes you extra work. :-)
Cheers, g.

In message fa686aa40710131739u31ab087axe554ab04fbb6b2c5@mail.gmail.com you wrote:
Really? It's perfectly reasonable for custodians to have multiple branches and to request for you to pull from a specific one. This
It is definitely perfectly reasonable to have multiple branches (otherwise we might go back to CVS - shudder).
But if you want to make life easy for me, then always use the same one (ideally simply master) to request the poull from.
THis allows me to set up all the custodian repos as remote tracking branches in one remotes.<group>. This allows me to get a quick overview. If you use several branches for oulling, it's pretty likely that I miss the correct branch name in your pull request and do the wrong thing.
becomes especially true with the adoption of the merge window process. For instance, I have two branches on the 5xxx tree; one for bugfixes to be merged immediately and another for stuff queued up for the next window.
You could merge the bugfixes branch into master immediately and the other one when the next window opens?
Besides, when someone uses git-request-pull (like Michal did) it's a pretty trivial cut/paste to use git-pull to bring it into your branch.
I don't pull immediately. I first fetch it into a local tracking branch so I can review it more easily before merging it.
It's not like it causes you extra work. :-)
That's exactly the problem: it *does* cause more work.
Maybe my usage of git is sub-optimal, I'm just learning. But it seems to work pretty efficiet to me... If you have better ideas I'd appreciate all tips and tricks...
Best regards,
Wolfgang Denk
participants (5)
-
David Saada
-
Grant Likely
-
Markus Klotzbücher
-
Michal Simek
-
Wolfgang Denk