From mboxrd@z Thu Jan 1 00:00:00 1970 From: b-cousson@ti.com (Cousson, Benoit) Date: Wed, 15 Dec 2010 14:44:44 +0100 Subject: [PATCH 1/5] OMAP4: hwmod data: Fix hwmod entries order In-Reply-To: References: <1291937615-18571-1-git-send-email-b-cousson@ti.com> <1291937615-18571-2-git-send-email-b-cousson@ti.com> Message-ID: <4D08C64C.1040809@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Paul, On 12/15/2010 2:09 AM, Paul Walmsley wrote: > > I had to modify this patch in order to apply it. Following is the updated > patch. Please let me know if this patch doesn't result in the correct > file. > > > - Paul > > From: Benoit Cousson > Date: Tue, 14 Dec 2010 17:37:24 -0700 > Subject: [PATCH] OMAP4: hwmod data: Fix hwmod entries order > > The original OMAP4 hwmod data files is fully generated from HW > database. But since the file is introduced incrementaly along > with driver that uses the data, it has to be splitted by the driver > owner and then re-merged by the maintainer. > Because of the similarity of the data, git is completely lost > during such merge and thus the data does not look like the original one > at the end. > > Re-order properly the structures to stay in sync with original data set. > This makes it much easier to diff the autogenerated script output with > what's in mainline, see differences, and generate patches for those > diffs. The goal is to stay in sync with the autogenerated data from now > on. > > Add a comment that does contain all the IPs that can have a hwmod, but > do not have it in the file for the moment. It gives a good indication > of the progress. > > Signed-off-by: Benoit Cousson > [paul at pwsan.com: updated to apply against current core integration branch, > commit message slightly amplified; fixed opt_clks_cnt whitespace] It looks like this fix is not in the integration branch. The commit id does have the new changelog but not the opt_clks_cnt fix: e4912451c076b082b5a427fc2541c29fdc93e715. Maybe I didn't use the right branch. Since I have a new hwmod_data patch, I will re-send my series with this fix included just in case. Thanks, Benoit