From patchwork Tue Feb 5 13:44:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanth Ananthan X-Patchwork-Id: 2097851 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8B08BDF23E for ; Tue, 5 Feb 2013 13:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754228Ab3BENoj (ORCPT ); Tue, 5 Feb 2013 08:44:39 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:62035 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753743Ab3BENoi (ORCPT ); Tue, 5 Feb 2013 08:44:38 -0500 Received: by mail-pa0-f48.google.com with SMTP id hz10so155466pad.7 for ; Tue, 05 Feb 2013 05:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=5B+rzAIGH5r3OALSyd666s/w6wqk9qch1uNrIKwtlXY=; b=JflLMzRyN14ZXMxRvDCU9Bqf9bgIOB8imf8VwUUIK6UeECybpcaaeaHomu9wNocxOd U5ocXyxLaBWAEJ/CmILKTuZdS9/ltJmntuN7eFgXE0l6c5TITKY4koLsep8RHkhgAQuz 1Nzv6Bfdzq9m/2EwE4f8aUhI0FnoPHHdfM8fBzw8LKr2pVWrrjMbCxZjjep9Hjp17ft4 A/Vh1/C1QiUmrG9T/PADAopta8bL1vE7cpICGTvCKShcFC199M2gc3KTHz78qghp2oDH gDFDqA18UN4RkuGLaVU4lLlw6GrYGvM+9lknQMGQX2JMju6pCcJjKAtB4Ilu58kU7djx WZOQ== X-Received: by 10.66.86.101 with SMTP id o5mr64818910paz.15.1360071878001; Tue, 05 Feb 2013 05:44:38 -0800 (PST) Received: from vasanth-ubuntu.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPS id d8sm29547721pax.23.2013.02.05.05.44.35 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Feb 2013 05:44:37 -0800 (PST) From: Vasanth Ananthan To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, thomas.abraham@linaro.org, Vasanth Ananthan , Vasanth Ananthan Subject: [PATCH v2] ARM: dts: map SATA controller port to SATA PHY controller Date: Tue, 5 Feb 2013 19:14:24 +0530 Message-Id: <1360071864-25758-2-git-send-email-vasanthananthan@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360071864-25758-1-git-send-email-vasanthananthan@gmail.com> References: <1360071864-25758-1-git-send-email-vasanthananthan@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Adding port nodes to the sata controller node, thus mapping the ports in sata controller to the corresponding PHY controllers they are connected to. Signed-off-by: Vasanth Ananthan --- arch/arm/boot/dts/exynos5250-smdk5250.dts | 11 ----------- arch/arm/boot/dts/exynos5250.dtsi | 22 +++++++++++++++++++--- arch/arm/mach-exynos/mach-exynos5-dt.c | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index e05b18f..27cb264 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -51,17 +51,6 @@ }; }; - i2c@121D0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <40000>; - samsung,i2c-slave-addr = <0x38>; - - sata-phy { - compatible = "samsung,sata-phy"; - reg = <0x38>; - }; - }; - sata@122F0000 { samsung,sata-freq = <66>; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 30485de..f74c91d 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -124,14 +124,22 @@ }; sata@122F0000 { - compatible = "samsung,exynos5-sata-ahci"; + compatible = "samsung,exynos5250-ahci"; reg = <0x122F0000 0x1ff>; interrupts = <0 115 0>; + samsung,exynos-sata-phy = <&phy0>; }; - sata-phy@12170000 { - compatible = "samsung,exynos5-sata-phy"; + phy0: sata-phy@12170000 { + compatible = "samsung,exynos5250-sata-phy"; reg = <0x12170000 0x1ff>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sataphy-pmu { + reg = <0x10040724 0x4>; + }; }; i2c_0: i2c@12C60000 { @@ -211,6 +219,14 @@ reg = <0x121D0000 0x100>; #address-cells = <1>; #size-cells = <0>; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <40000>; + samsung,i2c-slave-addr = <0x38>; + + sata-phy { + compatible = "samsung,exynos5250-sataphy"; + reg = <0x38>; + }; }; spi_0: spi@12d20000 { diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 4e074c6..932b1f7 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -80,9 +80,9 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos4210-spi.1", NULL), OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2, "exynos4210-spi.2", NULL), - OF_DEV_AUXDATA("samsung,exynos5-sata-ahci", 0x122F0000, + OF_DEV_AUXDATA("samsung,exynos5250-ahci", 0x122F0000, "exynos5-sata", NULL), - OF_DEV_AUXDATA("samsung,exynos5-sata-phy", 0x12170000, + OF_DEV_AUXDATA("samsung,exynos5250-sata-phy", 0x12170000, "exynos5-sata-phy", NULL), OF_DEV_AUXDATA("samsung,exynos5-sata-phy-i2c", 0x121D0000, "exynos5-sata-phy-i2c", NULL),