From: kgene.kim@samsung.com (Kukjin Kim) Date: Mon, 18 Aug 2014 15:03:17 -0500 Subject: [PATCH v5 02/10] ARM: dts: Fold exynos5250-cros-common into exynos5250-snow In-Reply-To: References: <1406868897-26874-1-git-send-email-afaerber@suse.de> <1406868897-26874-3-git-send-email-afaerber@suse.de> Message-ID: <53F25C05.5070604@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08/01/14 11:45, Doug Anderson wrote: > Andreas, > > On Thu, Jul 31, 2014 at 9:54 PM, Andreas F?rber 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 >> Reviewed-by: Tomasz Figa >> Signed-off-by: Andreas F?rber >> --- >> 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 > > I'd suggest that this land sooner rather than later to avoid future conflicts. Applied, thanks. - Kukjin