* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
@ 2007-09-16 8:00 David Saada
2007-09-16 14:02 ` Markus Klotzbücher
2007-09-16 15:23 ` Wolfgang Denk
0 siblings, 2 replies; 12+ messages in thread
From: David Saada @ 2007-09-16 8:00 UTC (permalink / raw)
To: u-boot
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}
};
--
View this message in context: http://www.nabble.com/-PATCH--USB-OHCI-driver%3A-Add-NEC%27s-PCI-OHCI-module-ID-tf4450412.html#a12697486
Sent from the Uboot - Users mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
2007-09-16 8:00 [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID David Saada
@ 2007-09-16 14:02 ` Markus Klotzbücher
2007-09-16 15:23 ` Wolfgang Denk
1 sibling, 0 replies; 12+ messages in thread
From: Markus Klotzbücher @ 2007-09-16 14:02 UTC (permalink / raw)
To: u-boot
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 at denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
2007-09-16 8:00 [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID David Saada
2007-09-16 14:02 ` Markus Klotzbücher
@ 2007-09-16 15:23 ` Wolfgang Denk
2007-09-17 11:44 ` David Saada
1 sibling, 1 reply; 12+ messages in thread
From: Wolfgang Denk @ 2007-09-16 15:23 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
2007-09-16 15:23 ` Wolfgang Denk
@ 2007-09-17 11:44 ` David Saada
2007-09-17 15:16 ` Markus Klotzbücher
0 siblings, 1 reply; 12+ messages in thread
From: David Saada @ 2007-09-17 11:44 UTC (permalink / raw)
To: u-boot
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}
};
--
View this message in context: http://www.nabble.com/-PATCH--USB-OHCI-driver%3A-Add-NEC%27s-PCI-OHCI-module-ID-tf4450412.html#a12734121
Sent from the Uboot - Users mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
2007-09-17 11:44 ` David Saada
@ 2007-09-17 15:16 ` Markus Klotzbücher
2007-09-17 20:47 ` Wolfgang Denk
0 siblings, 1 reply; 12+ messages in thread
From: Markus Klotzbücher @ 2007-09-17 15:16 UTC (permalink / raw)
To: u-boot
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 at denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID
2007-09-17 15:16 ` Markus Klotzbücher
@ 2007-09-17 20:47 ` Wolfgang Denk
2007-09-19 8:55 ` [U-Boot-Users] [USB] Pull Request: git://www.denx.de/git/u-boot-usb.git Markus Klotzbücher
0 siblings, 1 reply; 12+ messages in thread
From: Wolfgang Denk @ 2007-09-17 20:47 UTC (permalink / raw)
To: u-boot
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
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Sometimes, too long is too long. - Joe Crowe
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [USB] Pull Request: git://www.denx.de/git/u-boot-usb.git
2007-09-17 20:47 ` Wolfgang Denk
@ 2007-09-19 8:55 ` Markus Klotzbücher
2007-09-22 22:51 ` Wolfgang Denk
0 siblings, 1 reply; 12+ messages in thread
From: Markus Klotzbücher @ 2007-09-19 8:55 UTC (permalink / raw)
To: u-boot
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 at denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot-Users] [USB] Pull Request: git://www.denx.de/git/u-boot-usb.git
2007-09-19 8:55 ` [U-Boot-Users] [USB] Pull Request: git://www.denx.de/git/u-boot-usb.git Markus Klotzbücher
@ 2007-09-22 22:51 ` Wolfgang Denk
2007-09-23 21:17 ` [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch Michal Simek
0 siblings, 1 reply; 12+ messages in thread
From: Wolfgang Denk @ 2007-09-22 22:51 UTC (permalink / raw)
To: u-boot
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
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If I ever needed a brain transplant, I'd choose a teenager's because
I'd want a brain that had never been used.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch
2007-09-22 22:51 ` Wolfgang Denk
@ 2007-09-23 21:17 ` Michal Simek
2007-10-13 20:55 ` Wolfgang Denk
0 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2007-09-23 21:17 UTC (permalink / raw)
To: u-boot
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(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch
2007-09-23 21:17 ` [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch Michal Simek
@ 2007-10-13 20:55 ` Wolfgang Denk
2007-10-14 0:39 ` Grant Likely
0 siblings, 1 reply; 12+ messages in thread
From: Wolfgang Denk @ 2007-10-13 20:55 UTC (permalink / raw)
To: u-boot
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
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
God is real, unless declared integer.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch
2007-10-13 20:55 ` Wolfgang Denk
@ 2007-10-14 0:39 ` Grant Likely
2007-10-14 9:16 ` Wolfgang Denk
0 siblings, 1 reply; 12+ messages in thread
From: Grant Likely @ 2007-10-14 0:39 UTC (permalink / raw)
To: u-boot
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.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch
2007-10-14 0:39 ` Grant Likely
@ 2007-10-14 9:16 ` Wolfgang Denk
0 siblings, 0 replies; 12+ messages in thread
From: Wolfgang Denk @ 2007-10-14 9:16 UTC (permalink / raw)
To: u-boot
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
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
CAUTION: The Mass of This Product Contains the Energy Equivalent of
85 Million Tons of TNT per Net Ounce of Weight.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2007-10-14 9:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-16 8:00 [U-Boot-Users] [PATCH] USB OHCI driver: Add NEC's PCI OHCI module ID David Saada
2007-09-16 14:02 ` Markus Klotzbücher
2007-09-16 15:23 ` Wolfgang Denk
2007-09-17 11:44 ` David Saada
2007-09-17 15:16 ` Markus Klotzbücher
2007-09-17 20:47 ` Wolfgang Denk
2007-09-19 8:55 ` [U-Boot-Users] [USB] Pull Request: git://www.denx.de/git/u-boot-usb.git Markus Klotzbücher
2007-09-22 22:51 ` Wolfgang Denk
2007-09-23 21:17 ` [U-Boot-Users] [Microblaze] Pull Request: git://www.denx.de/git/u-boot-microblaze.git merge branch Michal Simek
2007-10-13 20:55 ` Wolfgang Denk
2007-10-14 0:39 ` Grant Likely
2007-10-14 9:16 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox