From patchwork Fri Nov 14 15:57:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 5308231 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4FFBC9FBB9 for ; Fri, 14 Nov 2014 16:04:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78BC820136 for ; Fri, 14 Nov 2014 16:04:18 +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 59CBB200E5 for ; Fri, 14 Nov 2014 16:04:17 +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 1XpJJb-00028F-VJ; Fri, 14 Nov 2014 16:01:39 +0000 Received: from mail-wi0-f173.google.com ([209.85.212.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XpJGs-0006Zs-Ne for linux-arm-kernel@lists.infradead.org; Fri, 14 Nov 2014 15:58:52 +0000 Received: by mail-wi0-f173.google.com with SMTP id n3so3115669wiv.12 for ; Fri, 14 Nov 2014 07:58:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uW84qhxyjqG3hy71M5lmxjpGm+I61N9WqD6G8Tu3cCE=; b=j5MbLv4o9bKyMhjQFCpzk/yMYxsjy7NSo10N85IWbwrXLW5xsgaAy44zQRoeTY/ZdU oUbU1P/1ySTSiFYHeR/Af6gnetn0vIcd4SogPfq7etYy6cl0rV06lZmTDUArCF25Gcwg puMirpLI+XYIz3US9Tk8u4f1Gu9IxotKcYZmuhsOfBRHHheB3Dp4OnN+CTmMwkA/RdHk ThhulyCsP/qX0ktnjnv/SXVlLj2uQ/4j99/sYAUVCkHV7msvDOqXp6VjhfW0FvGN55CV CeT83C8uwZXmORe5ZoUJBf0EsZoF3bkrnA6iCOb9iEj8eTGkm5p8K9sfE2l88cv2Eunt AMVg== X-Gm-Message-State: ALoCoQm93h4QjZoQ3QXQRa2ydJIVENrvwxzvmrwTHsBCme1benVZYWuTaSrUzuH0gweRumG/ajOG X-Received: by 10.180.7.135 with SMTP id j7mr8831162wia.79.1415980708206; Fri, 14 Nov 2014 07:58:28 -0800 (PST) Received: from mw-VirtualBox.semihalf.com (cardhu.semihalf.com. [213.17.239.108]) by mx.google.com with ESMTPSA id dm10sm3898170wib.18.2014.11.14.07.58.26 for (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Nov 2014 07:58:27 -0800 (PST) From: Marcin Wojtas To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/5] ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x Date: Fri, 14 Nov 2014 16:57:31 +0100 Message-Id: <1415980652-7429-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1415980652-7429-1-git-send-email-mw@semihalf.com> References: <1415980652-7429-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141114_075850_943540_1E6477C7 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, jason@lakedaemon.net, tawfik@marvell.com, alior@marvell.com, ezequiel.garcia@free-electrons.com, gregory.clement@free-electrons.com, mw@semihalf.com, sebastian.hesselbarth@gmail.com 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 In order to update MAC address entries in the ethernet nodes in Device Tree both mainline U-Boot and Barebox bootloaders accept the same format of aliases, which is 'ethernetX', where X stands for an interface number. Other platforms in the mainline Linux, that comprise ethernet references in '/aliases' node (like various flavours of imx or sunXi), follow the naming scheme described above. This commit ajusts ethernet aliases of Marvell Armada 38x SoC to be properly recognized by bootloaders' MAC address fixup routines. Signed-off-by: Marcin Wojtas Reviewed-by: Gregory CLEMENT Acked-by: Andrew Lunn --- arch/arm/boot/dts/armada-38x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 242d0ec..74391da 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -25,9 +25,9 @@ aliases { gpio0 = &gpio0; gpio1 = &gpio1; - eth0 = ð0; - eth1 = ð1; - eth2 = ð2; + ethernet0 = ð0; + ethernet1 = ð1; + ethernet2 = ð2; }; soc {