summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/da850.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-10 15:39:18 +0200
committerArnd Bergmann <arnd@arndb.de>2016-05-10 15:39:18 +0200
commit10bd9eb7dddb5046399cbfa6cf24a1f302fd7fce (patch)
tree5de729b89b5ccb1e291574d6c53c5809ef490ada /arch/arm/boot/dts/da850.dtsi
parentc5e51c98e3177339815e62006a288b3ec83f5067 (diff)
parentc6d3b5dd8e6fd802a354590314df28d6024906d8 (diff)
Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
Merge "DaVinci DT updates for v4.7 (part 2)" from Sekhar Nori: Second set of DT updates for DaVinci adding support for SPI0 and some low priority fixes for ethernet and interrupt controller. * tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: da850: There are 101 interrupts. ARM: dts: da850: disable mdio and eth0 in da850.dtsi ARM: davinci: da8xx-dt: Add spi0 lookup for clock matching ARM: dts: da850: add spi0 to device tree
Diffstat (limited to 'arch/arm/boot/dts/da850.dtsi')
-rw-r--r--arch/arm/boot/dts/da850.dtsi28
1 files changed, 26 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c7e357ee2998..25f0f8e6dde5 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -19,7 +19,7 @@
compatible = "ti,cp-intc";
interrupt-controller;
#interrupt-cells = <1>;
- ti,intc-size = <100>;
+ ti,intc-size = <101>;
reg = <0xfffee000 0x2000>;
};
};
@@ -120,7 +120,19 @@
0x4 0x00000004 0x0000000f
>;
};
- spi1_pins: pinmux_spi_pins {
+ spi0_pins: pinmux_spi0_pins {
+ pinctrl-single,bits = <
+ /* SIMO, SOMI, CLK */
+ 0xc 0x00001101 0x0000ff0f
+ >;
+ };
+ spi0_cs0_pin: pinmux_spi0_cs0 {
+ pinctrl-single,bits = <
+ /* CS0 */
+ 0x10 0x00000010 0x000000f0
+ >;
+ };
+ spi1_pins: pinmux_spi1_pins {
pinctrl-single,bits = <
/* SIMO, SOMI, CLK */
0x14 0x00110100 0x00ff0f00
@@ -291,6 +303,16 @@
reg = <0x308000 0x80>;
status = "disabled";
};
+ spi0: spi@41000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "ti,da830-spi";
+ reg = <0x41000 0x1000>;
+ num-cs = <6>;
+ ti,davinci-spi-intr-line = <1>;
+ interrupts = <20>;
+ status = "disabled";
+ };
spi1: spi@30e000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -308,6 +330,7 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x224000 0x1000>;
+ status = "disabled";
};
eth0: ethernet@220000 {
compatible = "ti,davinci-dm6467-emac";
@@ -322,6 +345,7 @@
35
36
>;
+ status = "disabled";
};
gpio: gpio@226000 {
compatible = "ti,dm6441-gpio";