Andreas, On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber <afaerber@xxxxxxx> wrote: > exynos5250-cros-common.dtsi was meant for sharing common pieces across > ChromeOS devices. This turned out premature, as several devices ended up > in the common file that are not common after all. Since the remaining > common ChromeOS pieces are fairly minor, exynos5250-cros-common.dtsi > was requested to be merged into the Snow device tree, sharing only the > keyboard controller for now. This may be re-evaluated as both mature. > > Suggested-by: Doug Anderson <dianders@xxxxxxxxxxxx> > Reviewed-by: Tomasz Figa <t.figa@xxxxxxxxxxx> > Signed-off-by: Andreas Färber <afaerber@xxxxxxx> > --- > v4 -> v5: > * Extended commit message (Tomasz Figa) > > v3 -> v4: Unchanged > > v2 -> v3: > * Renamed subject to match Kukjin's style > * Rebased onto MMC pinctrl bug fix (Doug Anderson) > > v2: New (Doug Anderson) > > arch/arm/boot/dts/exynos5250-cros-common.dtsi | 164 -------------------------- > arch/arm/boot/dts/exynos5250-snow.dts | 164 +++++++++++++++++++++++--- > 2 files changed, 145 insertions(+), 183 deletions(-) Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx> I'd suggest that this land sooner rather than later to avoid future conflicts. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html