diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-06-29 16:53:43 -0700 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-07-01 14:51:14 -0700 |
| commit | 5e6f874c4be699ed6e95e3d17bbd516bba5fbd2d (patch) | |
| tree | 8c677abc39e183efe2488db77488dab20a8c2a99 /arch/arm/boot | |
| parent | fb84fb13fbd855f209916b820d131376033ad421 (diff) | |
exynos5250: sata: Fixup SATA support for 3.10+
This static clock sources have gone so we need to add clock sources in
the device tree so the drivers can pick it up, and add the necessary
bindings between the i2c bus and the sata-phy layer.
There also seems to a change where the clocks don't get prepared before
they get enabled (perhaps because the clocks were always declared
statically?), so prepare and enable these clocks at the same time in the
users. I have know idea if this is correct, but it seems to work.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-arndale.dts | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index ba28af2a5e9b..f1244e47eaa4 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -20,6 +20,17 @@ reg = <0x40000000 0x80000000>; }; + 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>; + }; + }; + chosen { bootargs = "console=ttySAC2,115200"; }; @@ -314,10 +325,6 @@ status = "disabled"; }; - i2c@121D0000 { - status = "disabled"; - }; - dwmmc_0: dwmmc0@12200000 { num-slots = <1>; supports-highspeed; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index fc9fb3d526e2..5f27952445c3 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -235,6 +235,7 @@ compatible = "samsung,exynos5-sata-ahci"; reg = <0x122F0000 0x1ff>; interrupts = <0 115 0>; + samsung,sata-freq = <66>; clocks = <&clock 277>, <&clock 143>; clock-names = "sata", "sclk_sata"; }; @@ -242,6 +243,8 @@ sata-phy@12170000 { compatible = "samsung,exynos5-sata-phy"; reg = <0x12170000 0x1ff>; + clocks = <&clock 0x11f>; + clock-names = "sata-phy"; }; i2c_0: i2c@12C60000 { |