From patchwork Tue Nov 18 03:11:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunhe Lan X-Patchwork-Id: 411895 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 306DB14011B for ; Tue, 18 Nov 2014 14:06:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3DFD4B639; Tue, 18 Nov 2014 04:06:42 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WmRwx0nM+nT1; Tue, 18 Nov 2014 04:06:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 464214B62C; Tue, 18 Nov 2014 04:06:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0B66E4B62C for ; Tue, 18 Nov 2014 04:06:39 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RqCw1KqbNU7V for ; Tue, 18 Nov 2014 04:06:38 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0102.outbound.protection.outlook.com [157.56.110.102]) by theia.denx.de (Postfix) with ESMTPS id 5C10B4B628 for ; Tue, 18 Nov 2014 04:06:34 +0100 (CET) Received: from BN3PR0301CA0079.namprd03.prod.outlook.com (25.160.152.175) by BY2PR03MB044.namprd03.prod.outlook.com (10.255.241.148) with Microsoft SMTP Server (TLS) id 15.1.16.10; Tue, 18 Nov 2014 03:06:30 +0000 Received: from BN1BFFO11FD040.protection.gbl (2a01:111:f400:7c10::1:106) by BN3PR0301CA0079.outlook.office365.com (2a01:111:e400:401e::47) with Microsoft SMTP Server (TLS) id 15.1.16.15 via Frontend Transport; Tue, 18 Nov 2014 03:06:30 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD040.mail.protection.outlook.com (10.58.144.103) with Microsoft SMTP Server (TLS) id 15.1.6.13 via Frontend Transport; Tue, 18 Nov 2014 03:06:28 +0000 Received: from localhost.localdomain (udp189469uds.ap.freescale.net [10.193.20.71]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id sAI36Pgu011961; Mon, 17 Nov 2014 20:06:26 -0700 From: Chunhe Lan To: Date: Tue, 18 Nov 2014 11:11:54 +0800 Message-ID: <1416280314-3086-1-git-send-email-Chunhe.Lan@freescale.com> X-Mailer: git-send-email 1.7.6.5 X-EOPAttributedMessage: 0 Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Chunhe.Lan@freescale.com; X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(44976005)(47776003)(20776003)(84676001)(48376002)(88136002)(85426001)(77156002)(68736004)(19580395003)(62966003)(104166001)(104016003)(92726001)(92566001)(450100001)(87286001)(97736003)(87936001)(64706001)(89996001)(4396001)(50226001)(46102003)(31966008)(49486002)(50986999)(50466002)(93916002)(21056001)(36756003)(95666004)(120916001)(86362001)(99396003)(105606002)(102836001)(6806004)(19580405001)(106466001)(107046002)(110136001)(2351001)(229853001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB044; H:tx30smr01.am.freescale.net; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB044; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB044; X-Forefront-PRVS: 039975700A X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB044; X-OriginatorOrg: freescale.com Cc: yorksun@freescale.com Subject: [U-Boot] [PATCH] powerpc/hydra: Update MDIO mux fixups X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The new device trees use a more generic interface for supporting muxing mdio buses. The mux property is thus specified in "reg", rather than "fsl,hydra-mdio-muxval". In order to support using old device trees, we keep the old fixup in there. Linux will therefore see the both properties, but will ignore fsl,hydra-mdio-muxval. Signed-off-by: Chunhe Lan --- board/freescale/corenet_ds/eth_hydra.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c index 35825c4..a934c8c 100644 --- a/board/freescale/corenet_ds/eth_hydra.c +++ b/board/freescale/corenet_ds/eth_hydra.c @@ -62,7 +62,7 @@ #ifdef CONFIG_FMAN_ENET -#define BRDCFG1_EMI1_SEL_MASK 0x70 +#define BRDCFG1_EMI1_SEL_MASK 0x78 #define BRDCFG1_EMI1_SEL_SLOT1 0x10 #define BRDCFG1_EMI1_SEL_SLOT2 0x20 #define BRDCFG1_EMI1_SEL_SLOT5 0x30 @@ -202,6 +202,8 @@ static void fdt_set_mdio_mux(void *fdt, const char *alias, u32 mux) if (!path) path = alias; + do_fixup_by_path(fdt, path, "reg", + &mux, sizeof(mux), 1); do_fixup_by_path(fdt, path, "fsl,hydra-mdio-muxval", &mux, sizeof(mux), 1); }