Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541AbbDZIkK (ORCPT ); Sun, 26 Apr 2015 04:40:10 -0400 Received: from down.free-electrons.com ([37.187.137.238]:59555 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751411AbbDZIkF (ORCPT ); Sun, 26 Apr 2015 04:40:05 -0400 Date: Sun, 26 Apr 2015 10:39:58 +0200 From: Maxime Ripard To: Michal Suchanek Cc: linux-sunxi@googlegroups.com, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] ARM: dts: sunxi: A10s Olinuxino add missing SPI and simplefb. Message-ID: <20150426083958.GD5627@lukather> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bjuZg6miEcdLYP6q" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4202 Lines: 146 --bjuZg6miEcdLYP6q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Mon, Mar 23, 2015 at 03:00:31PM +0100, Michal Suchanek wrote: > Signed-off-by: Michal Suchanek Commit log, please. > --- > arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 12 ++++++++++ > arch/arm/boot/dts/sun5i-a10s.dtsi | 28 ++++++++++++++++++= ++++++ > 2 files changed, 40 insertions(+) >=20 > diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/= boot/dts/sun5i-a10s-olinuxino-micro.dts > index aa88ee8..e546b3f 100644 > --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts > +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts > @@ -59,6 +59,12 @@ > model =3D "Olimex A10s-Olinuxino Micro"; > compatible =3D "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s"; > =20 > + chosen { > + framebuffer@0 { > + status =3D "okay"; > + }; > + }; > + This is wrong. If the bootloader has set a simplefb node, it will enable the right one, if not it means that it's not meant to be used. > aliases { > serial0 =3D &uart0; > serial1 =3D &uart2; > @@ -182,6 +188,12 @@ > status =3D "okay"; > }; > =20 > +&spi2 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&spi2_pins_a>; > + status =3D "okay"; > +}; > + This should be in a separate patch, and the node are to be ordered alphabetically. > &ohci0 { > status =3D "okay"; > }; > diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-= a10s.dtsi > index a78c95d..438eba1 100644 > --- a/arch/arm/boot/dts/sun5i-a10s.dtsi > +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi > @@ -154,6 +154,20 @@ > clocks =3D <&apb1_gates 18>; > status =3D "disabled"; > }; > + > + spi2: spi@01c17000 { > + compatible =3D "allwinner,sun4i-a10-spi"; > + reg =3D <0x01c17000 0x1000>; > + interrupts =3D <12>; > + clocks =3D <&ahb_gates 22>, <&spi2_clk>; > + clock-names =3D "ahb", "mod"; > + dmas =3D <&dma SUN4I_DMA_DEDICATED 29>, > + <&dma SUN4I_DMA_DEDICATED 28>; > + dma-names =3D "rx", "tx"; > + status =3D "disabled"; > + #address-cells =3D <1>; > + #size-cells =3D <0>; > + }; > }; > }; This should be in sun5i.dtsi (and in a separate patch). > @@ -198,4 +212,18 @@ > allwinner,drive =3D ; > allwinner,pull =3D ; > }; > + > + spi2_pins_a: spi2@0 { > + allwinner,pins =3D "PB11", "PB12", "PB13", "PB14"; > + allwinner,function =3D "spi2"; > + allwinner,drive =3D ; > + allwinner,pull =3D ; > + }; > + > + spi2_pins_b: spi2@1 { > + allwinner,pins =3D "PE00", "PE01", "PE02", "PE03"; > + allwinner,function =3D "spi2"; > + allwinner,drive =3D ; > + allwinner,pull =3D ; > + }; > }; Ditto. Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --bjuZg6miEcdLYP6q Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVPKReAAoJEBx+YmzsjxAgTUMP/3ljBH4eeTVmukHBcLuenzFL ODKKduX+wp2bdp6sywVeXHOFr98DYRnIrNuYNhEAhaQ1gNljKfKcdAk+eKfl5uq1 HG7HxiXHGWR0zzqIYun1UyIP8zy5dgCgJGjStOo1nqDZG6Vep5FzkclDb3h9jsN1 HY/rSQLc5aqMGqsNUjmmzXwDK27ZvcGD55B7Rj9J/pFHBnH8RIpjXjC7gXfyLC1U t9SE04dWiOQeOMtiMMfxozgJzmewAaDrmsTGGmPqAP47iEhNf+GOp9kO2LFLW1jF YrlLJMT01mHwucfOjXLQYuqNeXsAPDegYil3u+B/ndNjeImxPP4p2RJMUonaoDdc CbP8a559VVAepvEBI0wpUT5jSD5eK3Hvek+aWgJWseD5lWB4K8Rkfe7/KpjA1EYN pFlgsB3Nm6AGJSpoMe4pG7CfXmM1pHoRA/5hdXiQSiXZ9EwhTbK/nHbSVfH9Knlo Tkr05RwxzMjkxZrEKv++KYNF+z1I+6Oc6rqgi+ZBW6oz98BYA1H95DwmePyg6W+E lShTKj20tc/keWxOsjV9pdI/EiwBDkcoZE7DGAko5iOtiSBxz5Y7eKgJLJ/WQJfn QZ4vLDjCCn8339YeeKysY1KI9vyUoEGRd79EDYNzpEBWoi2rumKtpbSpluc/ymqG PTO/U4QhINDbYVRARLo7 =iBw1 -----END PGP SIGNATURE----- --bjuZg6miEcdLYP6q-- -- 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/