diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /arch/arm/boot/dts/sama5d3xcm.dtsi | |
| parent | cd4373984a5903276f52777a6003425e023eaa7e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/sama5d3xcm.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d3xcm.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi index 1f8ed404626c..b336e7787cb3 100644 --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi | |||
| @@ -32,6 +32,10 @@ | |||
| 32 | 32 | ||
| 33 | ahb { | 33 | ahb { |
| 34 | apb { | 34 | apb { |
| 35 | spi0: spi@f0004000 { | ||
| 36 | cs-gpios = <&pioD 13 0>, <0>, <0>, <0>; | ||
| 37 | }; | ||
| 38 | |||
| 35 | macb0: ethernet@f0028000 { | 39 | macb0: ethernet@f0028000 { |
| 36 | phy-mode = "rgmii"; | 40 | phy-mode = "rgmii"; |
| 37 | }; | 41 | }; |