[PATCH 1/5] OMAP4: hwmod data: Fix hwmod entries order
Kevin Hilman
khilman at deeprootsystems.com
Mon Dec 13 22:07:32 EST 2010
Benoit Cousson <b-cousson at ti.com> writes:
> 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.
>
> 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 <b-cousson at ti.com>
> Cc: Paul Walmsley <paul at pwsan.com>
> Cc: Rajendra Nayak <rnayak at ti.com>
> Cc: Govindraj.R <govindraj.raja at ti.com>
> Cc: Charulatha V <charu at ti.com>
> Cc: Kevin Hilman <khilman at deeprootsystems.com>
Acked-by: Kevin Hilman <khilman at deeprootsystems.com>
My (mostly) blind git merges caused this problem in the first place.
Sorry.
Kevin
More information about the linux-arm-kernel
mailing list