diff mbox

[v2] ARM: dts: map SATA controller port to SATA PHY controller

Message ID 1360071864-25758-2-git-send-email-vasanthananthan@gmail.com
State New, archived
Headers show

Commit Message

Vasanth Ananthan Feb. 5, 2013, 1:44 p.m. UTC
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 <vasanth.a@samsung.com>
---
 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 mbox

Patch

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),