From mboxrd@z Thu Jan 1 00:00:00 1970 From: marex@denx.de (Marek Vasut) Date: Thu, 19 Nov 2015 15:41:22 +0100 Subject: [PATCH] ARM: socfpga: Add support for DENX MCV SoM and MCVEVK baseboard In-Reply-To: <20151119082246.GA3833@pengutronix.de> References: <1446420549-5572-1-git-send-email-marex@denx.de> <20151119082246.GA3833@pengutronix.de> Message-ID: <201511191541.22648.marex@denx.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday, November 19, 2015 at 09:22:46 AM, Steffen Trumtrar wrote: > Hi! Hi! > On Mon, Nov 02, 2015 at 12:29:09AM +0100, Marek Vasut wrote: > > Add support for the DENX MCV SoM and MCVEVK baseboard. The SoM contains > > eMMC, DRAM, Altera Cyclone V SoC. The baseboard contains CAN ports, UART > > ports, STMPE811 touchscreen controller, USB OTG port, ethernet port and > > a lot of IO pins. > > > > Signed-off-by: Marek Vasut > > Cc: Vince Bridgers > > Cc: Alan Tull > > Cc: Thor Thayer > > Cc: Dinh Nguyen > > Cc: Olof Johansson > > --- > > > > arch/arm/boot/dts/Makefile | 1 + > > arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 33 ++++++++++ > > arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 94 > > +++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) > > create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi > > create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index 7d3e495..8f322be 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -555,6 +555,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ > > > > dtb-$(CONFIG_ARCH_SOCFPGA) += \ > > > > socfpga_arria5_socdk.dtb \ > > socfpga_arria10_socdk_sdmmc.dtb \ > > > > + socfpga_cyclone5_mcvevk.dtb \ > > > > socfpga_cyclone5_socdk.dtb \ > > socfpga_cyclone5_de0_sockit.dtb \ > > socfpga_cyclone5_sockit.dtb \ > > > > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi > > b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi new file mode 100644 > > index 0000000..70dacf3 > > --- /dev/null > > +++ b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi > > @@ -0,0 +1,33 @@ > > +/* > > + * Copyright (C) 2015 Marek Vasut > > + * > > + * This program 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 program 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. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see . > > + */ > > + > > +#include "socfpga_cyclone5.dtsi" > > + > > +/ { > > + model = "DENX MCV"; > > + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; > > + > > + memory { > > + name = "memory"; > > + device_type = "memory"; > > + reg = <0x0 0x40000000>; /* 1 GiB */ > > + }; > > +}; > > + > > +&mmc0 { /* On-SoM eMMC */ > > + bus-width = <8>; > > +}; > > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts > > b/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts new file mode 100644 > > index 0000000..7cbe9b3 > > --- /dev/null > > +++ b/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts > > @@ -0,0 +1,94 @@ > > +/* > > + * Copyright (C) 2015 Marek Vasut > > + * > > + * This program 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 program 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. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see . > > + */ > > + > > +#include "socfpga_cyclone5_mcv.dtsi" > > + > > +/ { > > + model = "DENX MCV EVK"; > > + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; > > + > > + aliases { > > + ethernet0 = &gmac0; > > + stmpe-i2c0 = &stmpe1; > > + }; > > + > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > +}; > > + > > +&gpio0 { /* GPIO 0 ... 28 */ > > + status = "okay"; > > +}; > > + > > +&gpio1 { /* GPIO 29 ... 57 */ > > + status = "okay"; > > +}; > > + > > +&gpio2 { /* GPIO 58..66 (HLGPI 0..13 at offset 13) */ > > + status = "okay"; > > +}; > > + > > +&can0 { > > + status = "okay"; > > +}; > > + > > +&can1 { > > + status = "okay"; > > +}; > > + > > +&i2c0 { > > + status = "okay"; > > + speed-mode = <0>; > > + > > + stmpe1: stmpe811 at 41 { > > + compatible = "st,stmpe811"; > > + #address-cells = <1>; > > + #size-cells = <0>; > > + reg = <0x41>; > > + id = <0>; > > + blocks = <0x5>; > > + irq-gpio = <&portb 28 0x4>; /* GPIO 57, trig. level HI */ > > + > > + stmpe_touchscreen { > > + compatible = "st,stmpe-ts"; > > + reg = <0>; > > + ts,sample-time = <4>; > > + ts,mod-12b = <1>; > > + ts,ref-sel = <0>; > > + ts,adc-freq = <1>; > > + ts,ave-ctrl = <1>; > > + ts,touch-det-delay = <3>; > > + ts,settling = <4>; > > + ts,fraction-z = <7>; > > + ts,i-drive = <1>; > > + }; > > + }; > > +}; > > + > > +&gmac0 { > > + phy-mode = "rgmii"; > > + status = "okay"; > > +}; > > + > > +&uart0 { > > + status = "okay"; > > +}; > > + > > +&usb1 { > > + status = "okay"; > > +}; > > Could you please sort the nodes alphabetically? I guess the risk of merge > conflicts is pretty low as this seems to be a complete description of the > hardware, but I would still prefer it that way. > > Otherwise: > > Reviewed-by: Steffen Trumtrar Done and reposted, thanks for the review!