OMAP3 ISP and camera drivers (update)
Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
- LSC errors should be handled properly now.
I won't post the modified patches to the list this time since I guess it wouldn't be much of use, I guess. Or does someone want that? :)
Signature · 2 lines
Sakari Ailus [email protected]
Hi Sakari,
I've been trying to pull your gitorious patchset into my linux-omap repository (which is completely clean and up-to-date), but I'm having some problem.
Please find following messages. I captured my git repository messages.
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull
Already up-to-date.
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status
# On branch master
nothing to commit (working directory clean)
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu omap3camera base
error: Could not read 5b007183d51543624bc9f582966f245a64157b57
error: Could not read fa8977215db5ab6139379e95efc193e45833afa3
error: Could not read 7de046a6a8446358001c38ad1d0b2b829ca0c98c
error: Could not read 5b007183d51543624bc9f582966f245a64157b57
Unable to find common commit with dc05ee10583dca44e0f8d4109bd1397ee3c5ffae
Automatic merge failed; fix conflicts and then commit the result.
I guess other people should also have the same issue with it. or am I doing wrong way?
Please let me know
Quoted 25 lines · Sakari Ailus
Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
- LSC errors should be handled properly now.
I won't post the modified patches to the list this time since I guess it wouldn't be much of use, I guess. Or does someone want that? :)
--
Sakari Ailus
[email protected]
Signature · 9 lines
======================================================== DongSoo(Nathaniel), Kim Engineer Mobile S/W Platform Lab. S/W Team. DMC Samsung Electronics CO., LTD. e-mail : [email protected] [email protected] ========================================================
2009/3/9 DongSoo(Nathaniel) Kim <[email protected]>:
Quoted 31 lines
Hi Sakari,
I've been trying to pull your gitorious patchset into my linux-omap repository (which is completely clean and up-to-date), but I'm having some problem.
Please find following messages. I captured my git repository messages.kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pullAlready up-to-date.
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status# On branch master
nothing to commit (working directory clean)
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu omap3camera base
error: Could not read
5b007183d51543624bc9f582966f245a64157b57error: Could not read
fa8977215db5ab6139379e95efc193e45833afa3error: Could not read
7de046a6a8446358001c38ad1d0b2b829ca0c98cerror: Could not read
5b007183d51543624bc9f582966f245a64157b57Unable to find common commit with
dc05ee10583dca44e0f8d4109bd1397ee3c5ffae
Quoted 8 lines
Automatic merge failed; fix conflicts and then commit the result.
I guess other people should also have the same issue with it. or am I doing wrong way?
Please let me know
Hi Nate,
I tried this git pull git://git.gitorious.org/omap3camera/mainline.git
v4l iommu omap3camera base
and it works for me.
Thanks,
Arun
Quoted 47 lines
Quoted 16 lines · Sakari Ailus
Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
Quoted 9 lines
- LSC errors should be handled properly now.
I won't post the modified patches to the list this time since I guess it wouldn't be much of use, I guess. Or does someone want that? :)
--
Sakari Ailus
[email protected]--
========================================================
DongSoo(Nathaniel), Kim
Engineer
Mobile S/W Platform Lab. S/W Team.
DMC
Samsung Electronics CO., LTD.
e-mail : [email protected]
[email protected]
========================================================
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Arun,
I've tried again after receiving your mail.
It seems to be weired but it works this time. Difference between last time is I cloned linux-omap repo again and tried pulled Sakari's repo into that.
It could be my fault maybe ;(
Strange day. Sorry for making you confused.
Nate
Quoted 97 lines · Arun KS
2009/3/9 DongSoo(Nathaniel) Kim <[email protected]>:
Quoted 31 lines
Hi Sakari,
I've been trying to pull your gitorious patchset into my linux-omap repository (which is completely clean and up-to-date), but I'm having some problem.
Please find following messages. I captured my git repository messages.kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pullAlready up-to-date.
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status# On branch master
nothing to commit (working directory clean)
kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu omap3camera base
error: Could not read
5b007183d51543624bc9f582966f245a64157b57error: Could not read
fa8977215db5ab6139379e95efc193e45833afa3error: Could not read
7de046a6a8446358001c38ad1d0b2b829ca0c98cerror: Could not read
5b007183d51543624bc9f582966f245a64157b57Unable to find common commit with
dc05ee10583dca44e0f8d4109bd1397ee3c5ffaeQuoted 8 lines
Automatic merge failed; fix conflicts and then commit the result.
I guess other people should also have the same issue with it. or am I doing wrong way?
Please let me knowHi Nate,
I tried this git pull
git://git.gitorious.org/omap3camera/mainline.git
v4l iommu omap3camera base
and it works for me.Thanks,
ArunQuoted 47 lines
Quoted 16 lines · Sakari Ailus
Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
Quoted 9 lines
- LSC errors should be handled properly now.
I won't post the modified patches to the list this time since I guess it wouldn't be much of use, I guess. Or does someone want that? :)
--
Sakari Ailus
[email protected]--
========================================================
DongSoo(Nathaniel), Kim
Engineer
Mobile S/W Platform Lab. S/W Team.
DMC
Samsung Electronics CO., LTD.
e-mail : [email protected]
[email protected]
========================================================
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 9 lines
======================================================== DongSoo, Nathaniel Kim Engineer Mobile S/W Platform Lab. Digital Media & Communications R&D Centre Samsung Electronics CO., LTD. e-mail : [email protected] [email protected] ========================================================
Quoted 21 lines
-----Original Message-----
From: Sakari Ailus [mailto:[email protected]]
Sent: Friday, March 06, 2009 9:32 AM
To: [email protected]
Cc: Aguirre Rodriguez, Sergio Alberto; DongSoo Kim; Hiremath, Vaibhav; Toivonen Tuukka Olli Artturi; Koskipää Antti Jussi Petteri; Cohen David Abraham; Alexey Klimov
Subject: OMAP3 ISP and camera drivers (update)Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
Quoted 7 lines
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
- LSC errors should be handled properly now.
Hi Sakari,
Doing a pull like you suggested in past release:
$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \ iommu omap3camera base
Brings the same code than before...
I see that omap3isp branch is updated on gitorious, but trying to pull that branch gives merge errors.
Regards,
Sergio
Quoted 1 line · Sergio Alberto
Hi Sakari,
Hello, Sergio!
Quoted 6 lines
Doing a pull like you suggested in past release:
$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \ iommu omap3camera baseBrings the same code than before...
Oops. Could you try again now?
Quoted 1 line
I see that omap3isp branch is updated on gitorious, but trying to pull that branch gives merge errors.
Are you pulling it on top of linux-omap?
I've replaced the whole patchset so git tries to apply the new patches on top of the old ones.
Signature · 2 lines
Sakari Ailus [email protected]
Hi Sakari,
I'm also having problem pulling your git now. I've pulled prior version of yours and this is second time of pulling your repository.
Here you are a part of git diff message of mine after pulling your TUESDAY MARCH 10 version. Looks like all about indent thing.
What should I do? If I want to pull your repository in my repository and merging automatically.
I don't have any clue ;-(
kdsoo@chromatix:/home/share/GIT/OMAP3430/linux-2.6.29-rc3-omap_sakari$ git diff
drivers/media/video/isp/isp.c +0 -0
index 12a545c,54c839b..0000000
--- a/drivers/media/video/isp/isp.c
+++ b/drivers/media/video/isp/isp.c
@@@ -47,7 -47,7 +47,11 @@@
static struct isp_device *omap3isp;
static int isp_try_size(struct v4l2_pix_format *pix_input,
++<<<<<<< .merge_file_S5fkv9
+ struct v4l2_pix_format *pix_output);
++=======
+ struct v4l2_pix_format *pix_output);
++>>>>>>> .merge_file_ygq1qZ
Quoted 26 lines · Sakari Ailus
Quoted 2 lines · Sergio Alberto
Hi Sakari,
Hello, Sergio!
Quoted 5 lines
Doing a pull like you suggested in past release:
$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \ iommu omap3camera baseBrings the same code than before...
Oops. Could you try again now?
Quoted 2 lines
I see that omap3isp branch is updated on gitorious, but trying to pull that branch gives merge errors.
Are you pulling it on top of linux-omap?
I've replaced the whole patchset so git tries to apply the new patches on top of the old ones.
--
Sakari Ailus
[email protected]
Signature · 9 lines
======================================================== DongSoo, Nathaniel Kim Engineer Mobile S/W Platform Lab. Digital Media & Communications R&D Centre Samsung Electronics CO., LTD. e-mail : [email protected] [email protected] ========================================================
Quoted 5 lines · Nathaniel Kim
Hi Sakari,
I'm also having problem pulling your git now. I've pulled prior version of yours and this is second time of pulling your repository.
Quoted 7 lines
Here you are a part of git diff message of mine after pulling your TUESDAY MARCH 10 version. Looks like all about indent thing.
What should I do? If I want to pull your repository in my repository and merging automatically.
I don't have any clue ;-(
This branch branch now contains linux-omap plus the updated patchset. So the old patchset has been replaced by the new one. You're trying to pull the new patchset on top of the old one and merging very likely fails because of that.
Signature · 2 lines
Sakari Ailus [email protected]
Hi Sakari and other OMAP developers,
In order to better organize the OMAP stuff, I've created an account for Sakari at linuxtv.org.
It is simply too much for me to review all those stuff again and again. So I want to concentrate the process with Sakari, letting him do the review of OMAP patches and coordinating the OMAP merge process.
I expect that Sakari will send me periodic pull requests, after finishing the discussions, for me to do a final review and merge upstream.
In order to reduce my pending list at patchwork, I'm marking all OMAP there patches as RFC, trusting that Sakari will properly handle they.
Sakari, thanks for your help!
Cheers,
Mauro.
Quoted 13 lines · On Fri, 06 Mar 2009 17:32:06 +0200 Sakari Ailus…
Hi,
I've updated the patchset in Gitorious.
<URL:http://www.gitorious.org/projects/omap3camera>
Changes include
- Power management support. ISP suspend/resume should work now.
- Reindented and cleaned up everything. There are still some warnings from checkpatch.pl from the CSI2 code.
Quoted 8 lines
- Fix for crash in device registration, posted to list already. (Thanks, Vaibhav, Alexey!)
- LSC errors should be handled properly now.
I won't post the modified patches to the list this time since I guess it wouldn't be much of use, I guess. Or does someone want that? :)
Cheers,
Mauro