Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752997Ab2J2JPA (ORCPT ); Mon, 29 Oct 2012 05:15:00 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:52940 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912Ab2J2JO6 convert rfc822-to-8bit (ORCPT ); Mon, 29 Oct 2012 05:14:58 -0400 From: "Philip, Avinash" To: "Porter, Matt" , Tony Lindgren , "Nori, Sekhar" , Grant Likely , Mark Brown , "Cousson, Benoit" , Russell King , Vinod Koul , Rob Landley , Chris Ball CC: Linux DaVinci Kernel List , Arnd Bergmann , Linux Documentation List , Devicetree Discuss , Linux MMC List , Linux Kernel Mailing List , Rob Herring , Dan Williams , Linux SPI Devel List , Linux OMAP List , Linux ARM Kernel List Subject: RE: [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support Thread-Topic: [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support Thread-Index: AQHNrTWmKO3CW9x0C02azABU1J7r6pfP73hQ Date: Mon, 29 Oct 2012 09:11:34 +0000 Deferred-Delivery: Mon, 29 Oct 2012 09:11:00 +0000 Message-ID: <518397C60809E147AF5323E0420B992E3E9D526E@DBDE01.ent.ti.com> References: <1350566815-409-1-git-send-email-mporter@ti.com> <1350566815-409-17-git-send-email-mporter@ti.com> In-Reply-To: <1350566815-409-17-git-send-email-mporter@ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.24.162.25] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4241 Lines: 150 On Thu, Oct 18, 2012 at 18:56:55, Porter, Matt wrote: > Adds AM33XX SPI support for am335x-bone and am335x-evm. > > Signed-off-by: Matt Porter > --- > 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@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 */ > + >; > + }; > + }; > + Change to am33xx_pinmux. > ocp { > uart1: serial@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@0 { > + compatible = "spansion,s25fl064k", "m25p80"; > + spi-max-frequency = <24000000>; > + reg = <0>; > + }; > +}; In AM335x-evm, SPI flash available in profile #2 (am335x evm specific profiles). So can you drop this changes as if I understood correctly, am335x-evm.dts will be populated for devices present only on profile #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@44e10800 { > + compatible = "pinctrl-single"; > + reg = <0x44e10800 0x0238>; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-single,register-width = <32>; > + pinctrl-single,function-mask = <0x7f>; > + }; > + Pin ctrl support already submitted http://git.kernel.org/?p=linux/kernel/git/bcousson/linux-omap-dt.git;a=commitdiff;h=3e0603e905d9ba662e8c1885ecb1d28bc454e448 Thanks Avinash > /* > * 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@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@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@44e35000 { > compatible = "ti,omap3-wdt"; > ti,hwmods = "wd_timer2"; > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/