linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mporter@ti.com (Matt Porter)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support
Date: Thu, 18 Oct 2012 09:26:55 -0400	[thread overview]
Message-ID: <1350566815-409-17-git-send-email-mporter@ti.com> (raw)
In-Reply-To: <1350566815-409-1-git-send-email-mporter@ti.com>

Adds AM33XX SPI support for am335x-bone and am335x-evm.

Signed-off-by: Matt Porter <mporter@ti.com>
---
 arch/arm/boot/dts/am335x-bone.dts |   17 +++++++++++++++
 arch/arm/boot/dts/am335x-evm.dts  |    9 ++++++++
 arch/arm/boot/dts/am33xx.dtsi     |   43 +++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 5510979..23edfd8 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -18,6 +18,17 @@
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
 
+	am3358_pinmux: pinmux at 44e10800 {
+		spi1_pins: pinmux_spi1_pins {
+			pinctrl-single,pins = <
+				0x190 0x13	/* mcasp0_aclkx.spi1_sclk, OUTPUT_PULLUP | MODE3 */
+				0x194 0x33	/* mcasp0_fsx.spi1_d0, INPUT_PULLUP | MODE3 */
+				0x198 0x13	/* mcasp0_axr0.spi1_d1, OUTPUT_PULLUP | MODE3 */
+				0x19c 0x13	/* mcasp0_ahclkr.spi1_cs0, OUTPUT_PULLUP | MODE3 */
+			>;
+		};
+	};
+
 	ocp {
 		uart1: serial at 44e09000 {
 			status = "okay";
@@ -84,3 +95,9 @@
 &mmc1 {
 	vmmc-supply = <&ldo3_reg>;
 };
+
+&spi1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi1_pins>;
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index d63fce8..8d5f660 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -124,3 +124,12 @@
 &mmc1 {
 	vmmc-supply = <&vmmc_reg>;
 };
+
+&spi0 {
+	status = "okay";
+	spi-flash at 0 {
+		compatible = "spansion,s25fl064k", "m25p80";
+		spi-max-frequency = <24000000>;
+		reg = <0>;
+	};
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 26a6af7..063ecea 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -40,6 +40,15 @@
 		};
 	};
 
+	am3358_pinmux: pinmux at 44e10800 {
+		compatible = "pinctrl-single";
+		reg = <0x44e10800 0x0238>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-single,register-width = <32>;
+		pinctrl-single,function-mask = <0x7f>;
+	};
+
 	/*
 	 * XXX: Use a flat representation of the AM33XX interconnect.
 	 * The real AM33XX interconnect network is quite complex.Since
@@ -261,6 +270,40 @@
 			status = "disabled";
 		};
 
+		spi0: spi at 48030000 {
+			compatible = "ti,omap4-mcspi";
+			ti,hwmods = "spi0";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x48030000 0x400>;
+			interrupt-parent = <&intc>;
+			interrupt = <65>;
+			dmas = <&edma 16
+				&edma 17
+				&edma 18
+				&edma 19>;
+			dma-names = "tx0", "rx0", "tx1", "rx1";
+			ti,spi-num-cs = <2>;
+			status = "disabled";
+		};
+
+		spi1: spi at 481a0000 {
+			compatible = "ti,omap4-mcspi";
+			ti,hwmods = "spi1";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x481a0000 0x400>;
+			interrupt-parent = <&intc>;
+			interrupt = <125>;
+			dmas = <&edma 42
+				&edma 43
+				&edma 44
+				&edma 45>;
+			dma-names = "tx0", "rx0", "tx1", "rx1";
+			ti,spi-num-cs = <2>;
+			status = "disabled";
+		};
+
 		wdt2: wdt at 44e35000 {
 			compatible = "ti,omap3-wdt";
 			ti,hwmods = "wd_timer2";
-- 
1.7.9.5

  parent reply	other threads:[~2012-10-18 13:26 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-18 13:26 [RFC PATCH v3 00/16] DMA Engine support for AM33XX Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 01/16] dmaengine: edma: fix slave config dependency on direction Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 02/16] ARM: davinci: move private EDMA API to arm/common Matt Porter
2012-10-28  8:17   ` Sekhar Nori
2012-11-16 16:49     ` Matt Porter
2013-01-10 23:51     ` Matt Porter
2013-01-22 15:40       ` Sekhar Nori
     [not found]       ` <d631bf39a8b8474bae448d089497fe0e@DLEE74.ent.ti.com>
2013-01-23 21:00         ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 03/16] ARM: edma: remove unused transfer controller handlers Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 04/16] ARM: edma: add DT and runtime PM support for AM33XX Matt Porter
2012-10-28 11:03   ` Sekhar Nori
2013-01-10 19:18     ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 05/16] ARM: edma: add AM33XX crossbar event support Matt Porter
2012-10-26 12:53   ` Hebbar, Gururaja
2012-10-28 11:11   ` Sekhar Nori
2013-01-10 22:54     ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 06/16] dmaengine: edma: enable build for AM33XX Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 07/16] dmaengine: edma: Add TI EDMA device tree binding Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 08/16] ARM: dts: add AM33XX EDMA support Matt Porter
2012-10-28 11:16   ` Sekhar Nori
2013-01-10 19:27     ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 09/16] dmaengine: add dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 10/16] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 11/16] mmc: omap_hsmmc: limit max_segs with the EDMA DMAC Matt Porter
2012-10-29  8:18   ` Sekhar Nori
2013-01-10 19:30     ` Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 12/16] mmc: omap_hsmmc: add generic DMA request support to the DT binding Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 13/16] ARM: dts: add AM33XX MMC support Matt Porter
2012-10-30  5:33   ` AnilKumar, Chimata
2013-01-10 20:26     ` Matt Porter
2013-01-03 10:03   ` Hebbar, Gururaja
2012-10-18 13:26 ` [RFC PATCH v3 14/16] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-18 13:26 ` [RFC PATCH v3 15/16] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2012-10-18 13:26 ` Matt Porter [this message]
2012-10-28 11:31   ` [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support Sekhar Nori
2013-01-10 19:35     ` Matt Porter
2013-01-10 19:46       ` Nishanth Menon
2013-01-10 20:49         ` Matt Porter
2013-01-10 20:49           ` Nishanth Menon
2012-10-29  9:11   ` Philip, Avinash
2012-10-30  9:41   ` Philip, Avinash
2012-10-31 10:16     ` Benoit Cousson
2012-10-31 10:35       ` Benoit Cousson
2012-10-31 11:03         ` Philip, Avinash
2012-10-19 10:26 ` [RFC PATCH v3 00/16] DMA Engine support for AM33XX Bedia, Vaibhav
2012-10-19 11:15   ` Matt Porter
2012-10-19 12:02     ` Bedia, Vaibhav
2012-10-19 16:46       ` Matt Porter
2012-10-22  5:53         ` Bedia, Vaibhav
2012-10-26  8:32 ` Russ Dill
2012-11-05  7:19 ` Hebbar, Gururaja

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1350566815-409-17-git-send-email-mporter@ti.com \
    --to=mporter@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).