From patchwork Thu Feb 12 00:55:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 5814931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 299399F37F for ; Thu, 12 Feb 2015 00:58:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 36E0F2015E for ; Thu, 12 Feb 2015 00:58:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4951F200E9 for ; Thu, 12 Feb 2015 00:58:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YLi4R-0005M9-Ck; Thu, 12 Feb 2015 00:55:55 +0000 Received: from cantor2.suse.de ([195.135.220.15] helo=mx2.suse.de) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YLi4J-0004zB-Qq for linux-arm-kernel@lists.infradead.org; Thu, 12 Feb 2015 00:55:49 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3FFAAAC47; Thu, 12 Feb 2015 00:55:26 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: Michal Simek Subject: [PATCH 1/5] ARM: dts: zynq: Split out common Parallella bits Date: Thu, 12 Feb 2015 01:55:09 +0100 Message-Id: <1423702513-4032-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1423702513-4032-1-git-send-email-afaerber@suse.de> References: <1423702513-4032-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150211_165548_303225_FE1F2815 X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: Mark Rutland , "open list:OPEN FIRMWARE AND..." , Russell King , Ola Jeppsson , Pawel Moll , Andreas Olofsson , Ian Campbell , open list , Rob Herring , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , Matteo Vit , Sean Rickerd , Olof Johansson , Kumar Gala , =?UTF-8?q?Andreas=20F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This prepares for the USB-less Microserver edition as well as headless vs. HDMI bitstreams. Cc: Ola Jeppsson Signed-off-by: Andreas Färber --- arch/arm/boot/dts/zynq-parallella.dts | 80 +--------------------- .../{zynq-parallella.dts => zynq-parallella1.dtsi} | 3 +- 2 files changed, 3 insertions(+), 80 deletions(-) copy arch/arm/boot/dts/{zynq-parallella.dts => zynq-parallella1.dtsi} (97%) diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts index 0ebd2107022b..99ee6551ae8d 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella.dts @@ -1,11 +1,6 @@ /* * Copyright (c) 2014 SUSE LINUX Products GmbH - * - * Derived from zynq-zed.dts: - * - * Copyright (C) 2011 Xilinx - * Copyright (C) 2012 National Instruments Corp. - * Copyright (C) 2013 Xilinx + * Copyright (c) 2015 SUSE Linux GmbH * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -17,79 +12,8 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-parallella1.dtsi" / { model = "Adapteva Parallella Board"; - compatible = "adapteva,parallella", "xlnx,zynq-7000"; - - aliases { - ethernet0 = &gem0; - serial0 = &uart1; - }; - - memory { - device_type = "memory"; - reg = <0x0 0x40000000>; - }; - - chosen { - bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; - linux,stdout-path = "/amba/serial@e0001000"; - }; -}; - -&clkc { - fclk-enable = <0xf>; - ps-clk-frequency = <33333333>; -}; - -&gem0 { - status = "okay"; - phy-mode = "rgmii-id"; - phy-handle = <ðernet_phy>; - - ethernet_phy: ethernet-phy@0 { - /* Marvell 88E1318 */ - compatible = "ethernet-phy-id0141.0e90", - "ethernet-phy-ieee802.3-c22"; - reg = <0>; - marvell,reg-init = <0x3 0x10 0xff00 0x1e>, - <0x3 0x11 0xfff0 0xa>; - }; -}; - -&i2c0 { - status = "okay"; - - isl9305: isl9305@68 { - compatible = "isil,isl9305"; - reg = <0x68>; - - regulators { - dcd1 { - regulator-name = "VDD_DSP"; - regulator-always-on; - }; - dcd2 { - regulator-name = "1P35V"; - regulator-always-on; - }; - ldo1 { - regulator-name = "VDD_ADJ"; - }; - ldo2 { - regulator-name = "VDD_GPIO"; - regulator-always-on; - }; - }; - }; -}; - -&sdhci1 { - status = "okay"; -}; - -&uart1 { - status = "okay"; }; diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella1.dtsi similarity index 97% copy from arch/arm/boot/dts/zynq-parallella.dts copy to arch/arm/boot/dts/zynq-parallella1.dtsi index 0ebd2107022b..7c1206f928bc 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella1.dtsi @@ -1,5 +1,6 @@ /* * Copyright (c) 2014 SUSE LINUX Products GmbH + * Copyright (c) 2015 SUSE Linux GmbH * * Derived from zynq-zed.dts: * @@ -16,11 +17,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -/dts-v1/; /include/ "zynq-7000.dtsi" / { - model = "Adapteva Parallella Board"; compatible = "adapteva,parallella", "xlnx,zynq-7000"; aliases {