From patchwork Thu Nov 13 15:18:28 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Barkowski X-Patchwork-Id: 8587 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C5D4A47618 for ; Fri, 14 Nov 2008 02:20:14 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 0D4E9DE714 for ; Fri, 14 Nov 2008 02:18:39 +1100 (EST) Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.12.11/az33egw02) with ESMTP id mADFIYBP005224 for ; Thu, 13 Nov 2008 08:18:35 -0700 (MST) Received: from [10.32.13.10] (udp120031uds.am.freescale.net [10.32.13.10]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id mADFIXpJ019004; Thu, 13 Nov 2008 09:18:33 -0600 (CST) Message-ID: <491C4544.7020707@freescale.com> Date: Thu, 13 Nov 2008 10:18:28 -0500 From: Michael Barkowski User-Agent: Thunderbird 2.0.0.17 (X11/20080925) MIME-Version: 1.0 To: linuxppc-dev@ozlabs.org Subject: [PATCH] mpc832x_rdb: fix swapped ethernet ids X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so that the interfaces do not swap addresses when control passes from U-Boot to the kernel. Signed-off-by: Michael Barkowski Acked-by: Kim Phillips --- Cheat sheet: | *Nickname* | WAN port | LAN switch | | *MAC address* | ethaddr | eth1addr | | *U-Boot name* | FSL UEC0 | FSL UEC1 | | *Linux name* | eth1 | eth0 | | *Phy ID* | 4 | 0 | | *QE Device* | UCC3@2200 | UCC2@3000 | arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 226ff06..dea3091 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -18,8 +18,8 @@ #size-cells = <1>; aliases { - ethernet0 = &enet0; - ethernet1 = &enet1; + ethernet0 = &enet1; + ethernet1 = &enet0; serial0 = &serial0; serial1 = &serial1; pci0 = &pci0;