From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752797AbcFNQx2 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 14 Jun 2016 12:53:28 -0400
Received: from mail-pa0-f67.google.com ([209.85.220.67]:35368 "EHLO
	mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751388AbcFNQxZ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 14 Jun 2016 12:53:25 -0400
Date: Mon, 13 Jun 2016 14:53:39 -0700
From: Olof Johansson <olof@lixom.net>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Kevin Hilman <khilman@kernel.org>,
        arm@kernel.org, Javier Martinez Canillas <javier@osg.samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Sylwester Nawrocki <s.nawrocki@samsung.com>,
        Kukjin Kim <kgene@kernel.org>, linux-arm-kernel@lists.infradead.org,
        linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: Re: [GIT PULL 7/8] ARM: dts: exynos: Topic branch with Odroid XU for
 v4.8
Message-ID: <20160613215339.GE20845@localhost>
References: <1465215933-22709-1-git-send-email-k.kozlowski@samsung.com>
 <1465215933-22709-8-git-send-email-k.kozlowski@samsung.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1465215933-22709-8-git-send-email-k.kozlowski@samsung.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jun 06, 2016 at 02:25:32PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> This topic branch pulls external clk dependency (provided by Sylwester
> Nawrocki).
> 
> Expected annoying conflict with DT changes here (please see the email 0/8).
> 
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 1a695a905c18548062509178b98bc91e67510864:
> 
>   Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-odroid-xu-4.8
> 
> for you to fetch changes up to b8bd7e23bb0be762c39510497c931066dc62e62f:
> 
>   ARM: dts: exynos: Add watchdog and Security SubSystem to Exynos5410 (2016-06-06 13:20:57 +0200)
> 
> ----------------------------------------------------------------
> Topic branch for adding Exynos 5410 Odroid XU board for v4.8.
> 
> This brings support for Hardkernel's Odroid XU board.  It was the first
> design with big.LITTLE SoC from Samsung: Exynos5410.  The board is not
> very popular.  Newer XU3 and XU4 got more attention.
> 
> Board details:
> 1. Exynos5410 octa-core (A15+A7, however as of now only one cluster is
>    enabled),
> 2. 2 GB DDR3 RAM,
> 3. PowerVR SGX544MP3 GPU (not enabled in DTS),
> 4. USB 3.0 Host x 1, USB 3.0 OTG x 1, USB 2.0 Host x 4,
> 5. HDMI 1.4a, MIPI DSI and Display Port (Display Port not on all of
>    revisions though),
> 6. eMMC 4.5 and microSD slots.

Merged. Please double-check conflict resolution but it seemed trivial
(reapplied "ARM: dts: exynos: Add async-bridge clock to MFC power domain
for Exynos5420" to the new context).


-Olof