| From 7030bfbcc59fb0c891c85cf1da755ca8643bc00c Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 16 Jan 2017 17:56:53 +0100 |
| Subject: [PATCH 091/255] ARM: dts: r8a7779, marzen: Fix sata device status |
| |
| Device nodes representing I/O devices should be marked disabled in the |
| SoC-specific DTS, and overridden by board-specific DTSes where needed. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit e8aa6811ca9547bc82baa6ed44c38dde01fb0d86) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7779-marzen.dts | 4 ++++ |
| arch/arm/boot/dts/r8a7779.dtsi | 1 + |
| 2 files changed, 5 insertions(+) |
| |
| --- a/arch/arm/boot/dts/r8a7779-marzen.dts |
| +++ b/arch/arm/boot/dts/r8a7779-marzen.dts |
| @@ -216,6 +216,10 @@ |
| }; |
| }; |
| |
| +&sata { |
| + status = "okay"; |
| +}; |
| + |
| &scif2 { |
| pinctrl-0 = <&scif2_pins>; |
| pinctrl-names = "default"; |
| --- a/arch/arm/boot/dts/r8a7779.dtsi |
| +++ b/arch/arm/boot/dts/r8a7779.dtsi |
| @@ -347,6 +347,7 @@ |
| interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; |
| clocks = <&mstp1_clks R8A7779_CLK_SATA>; |
| power-domains = <&sysc R8A7779_PD_ALWAYS_ON>; |
| + status = "disabled"; |
| }; |
| |
| sdhi0: sd@ffe4c000 { |
