From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034120AbdAERjG (ORCPT ); Thu, 5 Jan 2017 12:39:06 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:36034 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751626AbdAERhi (ORCPT ); Thu, 5 Jan 2017 12:37:38 -0500 Date: Thu, 5 Jan 2017 18:36:45 +0100 From: Maxime Ripard To: Andre Przywara Cc: Ulf Hansson , Chen-Yu Tsai , Hans De Goede , Icenowy Zheng , Mark Rutland , Rob Herring , devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/5] arm64: dts: add BananaPi-M64 support Message-ID: <20170105173645.fif72dhcdy4xgsa7@lukather> References: <1483398226-29321-1-git-send-email-andre.przywara@arm.com> <1483398226-29321-6-git-send-email-andre.przywara@arm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cohpke4bna7mpkw4" Content-Disposition: inline In-Reply-To: <1483398226-29321-6-git-send-email-andre.przywara@arm.com> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --cohpke4bna7mpkw4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 02, 2017 at 11:03:46PM +0000, Andre Przywara wrote: > The Banana Pi M64 board is a typical single board computer based on the > Allwinner A64 SoC. Aside from the usual peripherals it features eMMC > storage, which is connected to the 8-bit capable SDHC2 controller. > Also it has a soldered WiFi/Bluetooth chip, so we enable UART1 and SDHC1 > as those two interfaces are connected to it. >=20 > Signed-off-by: Andre Przywara > --- > arch/arm64/boot/dts/allwinner/Makefile | 1 + > .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 125 +++++++++++++++= ++++++ > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 10 ++ > 3 files changed, 136 insertions(+) > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64= =2Edts >=20 > diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts= /allwinner/Makefile > index 1e29a5a..51ecb04 100644 > --- a/arch/arm64/boot/dts/allwinner/Makefile > +++ b/arch/arm64/boot/dts/allwinner/Makefile > @@ -1,4 +1,5 @@ > dtb-$(CONFIG_ARCH_SUNXI) +=3D sun50i-a64-pine64-plus.dtb sun50i-a64-pine= 64.dtb > +dtb-$(CONFIG_ARCH_SUNXI) +=3D sun50i-a64-bananapi-m64.dtb Please sort it by alphabetical order. > =20 > always :=3D $(dtb-y) > subdir-y :=3D $(dts-dirs) > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/= arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > new file mode 100644 > index 0000000..941ea07 > --- /dev/null > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > @@ -0,0 +1,125 @@ > +/* > + * Copyright (c) 2016 ARM Ltd. > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > + > +#include "sun50i-a64.dtsi" > + > +/ { > + model =3D "BananaPi-M64"; > + compatible =3D "sinovoip,bananapi-m64", "allwinner,sun50i-a64"; > + > + aliases { > + serial0 =3D &uart0; > + serial1 =3D &uart1; > + }; > + > + chosen { > + stdout-path =3D "serial0:115200n8"; > + }; > + > + reg_vcc3v3: vcc3v3 { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "vcc3v3"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + }; > +}; > + > +&uart0 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&uart0_pins_a>; > + status =3D "okay"; > +}; > + > +&uart1 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&uart1_pins_4>; > + status =3D "okay"; > +}; > + > +&i2c1 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&i2c1_pins>; > + status =3D "okay"; > +}; And the nodes too. > + > +&i2c1_pins { > + bias-pull-up; > +}; > + > +&mmc0 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&mmc0_pins>, <&mmc0_default_cd_pin>; > + vmmc-supply =3D <®_vcc3v3>; > + cd-gpios =3D <&pio 5 6 0>; Please use a define here. > + cd-inverted; > + disable-wp; > + bus-width =3D <4>; > + status =3D "okay"; > +}; > + > +&mmc1 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&mmc1_pins>; > + vmmc-supply =3D <®_vcc3v3>; > + bus-width =3D <4>; > + non-removable; > + status =3D "okay"; > +}; > + > +&mmc2 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&mmc2_pins>; > + vmmc-supply =3D <®_vcc3v3>; > + bus-width =3D <8>; > + non-removable; > + cap-mmc-hw-reset; > + status =3D "okay"; > +}; > + > +&mmc2_pins { > + /* Increase drive strength for DDR modes */ > + drive-strength =3D <40>; Allwinner recommends to use 30mA, have you tested it? > + /* eMMC is missing pull-ups */ > + bias-pull-up; This is the default now. > +}; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/b= oot/dts/allwinner/sun50i-a64.dtsi > index c680566..9de96ba 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > @@ -151,6 +151,16 @@ > function =3D "uart0"; > }; > =20 > + uart1_pins: uart1@0 { > + pins =3D "PG6", "PG7"; > + function =3D "uart1"; > + }; > + > + uart1_pins_4: uart1_4@0 { > + pins =3D "PG6", "PG7", "PG8", "PG9"; For other nodes, we've been creating another node for the cts and rts signals, and reference both nodes in the pinctrl properties. It allows to avoid duplication. > + function =3D "uart1"; > + }; > + > mmc0_pins: mmc0@0 { Please sort it by alphabetical order. And it should be in a separate patch. Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --cohpke4bna7mpkw4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJYboQpAAoJEBx+YmzsjxAgBH8QAIEEFztN43Jiufh2n+RS2UU4 s+ZIsgXAbNYjkcn1qgC8Wf2AoMAVunXMCKfQdFbcEnq8q1WORgFqVDybRZXzJMVr cANgaAfUtqMutmVg4fNrKY2qyLxFX/SUKVyyDSbT4X5zhTqsSNc+RO+fTk5uvTE3 X3WuMM8OdOycdSoJWd1gOWbLObAnBRRRG5eHjOTojnUAxld41OBSj0MTVzMDLVNW 54GLN9oH21ui7sVMl/R5/7sNWEEzBYmHPtpDZaAzHBZWpCVyZ4HCd/rJXx/TLMzH lM8P6yXVxdq+F1OHuQVWgmD3+KSfckLkZk5wSLJk3luZNTnL4XnpJxPYCz5H8hqp GeckTAXTKVcvOTvscrt4sCZQ7h3DGrMBMZpiNKpj2bFdohjMOlybB/WPkWlu0UpO ZhQOzaqc8A4XFGd+ppU6Atbi+aJcX6x4RtjhNwV5xUXJPT1UsL3frkcoxH4YAew5 eIOC3yFLCnCI63D6JcC2LK9YofJqfwoRVItdZ83bLVNQp7TQzNA2a1CGzw7L5be+ 7R+QbWZPrnAN9wxtzEsg7NL5eWAgTVe7d4zd1Hm7zJ+z0C8q/ccb/7neIrhHxffw cRIylbExlX4oCgFTkB180oJ+V+tEdV2n6JLE4SbVwbs5ihIJkFrAKtcqBSSQOQCc ZlPRjluEvTUBU517r2fJ =MFuN -----END PGP SIGNATURE----- --cohpke4bna7mpkw4--