From patchwork Sun Jul 7 20:33:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 257420 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0534B2C007E for ; Mon, 8 Jul 2013 06:34:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753206Ab3GGUeJ (ORCPT ); Sun, 7 Jul 2013 16:34:09 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:55002 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753121Ab3GGUeH (ORCPT ); Sun, 7 Jul 2013 16:34:07 -0400 Received: by mail-ee0-f54.google.com with SMTP id t10so2416716eei.41 for ; Sun, 07 Jul 2013 13:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=1YOz8d4/DUMO3hp6GBPIrvocLrHdC+DQEWuPmNFdg30=; b=Ak0/FPwodm5xU/3uCRpuMkZtk25z78PYxe4f0AvDbxIQEK7PfbO4OXG8JSwRs9mlHB r8z9XgHArbgKRDMHL3Z9y7Zt5f8FjH3jQjHrWYqvgh+G446gnOyNRhzcQe+3EthBMris fxKetmVRp2uCv+sYMOZeKtmWx2d1qfQcqKAXJwd3nVZiyfPoEWWUeWmTZUioULBfkO0g yEO0oUwHVScBKOs1Yum1D6Unyg0vnuFtKjiCS1dKlkgI+W7zmj/RtreZUoqe2xTBIcpG MZrjgOFJx1K8HUf5ZRcmJGeQ7Im7dJeW1Yo8n0yDybRaUKlqRPVfmI7y7YgUFu37pAJW yQOg== X-Received: by 10.15.94.142 with SMTP id bb14mr21491611eeb.112.1373229244646; Sun, 07 Jul 2013 13:34:04 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id p49sm36263720eeu.2.2013.07.07.13.34.02 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Jul 2013 13:34:03 -0700 (PDT) Received: from edge.lan (magicgate.lan [192.168.1.1]) by topkick.lan (Postfix) with ESMTPSA id 223105FBB5; Sun, 7 Jul 2013 22:32:19 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Lennert Buytenhek , Jonas Gorski , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: mv643xx_eth: fix DT port device name Date: Sun, 7 Jul 2013 22:33:51 +0200 Message-Id: <1373229231-8838-1-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Device tree support added to Marvell MV643xx ethernet driver registers port devices from port device nodes found on the corresponding controller node. The current port device name will cause the second controller to fail on registration because of two identical device names. This fixes the issue by taking the device node's name also as port device name. Signed-off-by: Sebastian Hesselbarth Reported-by: Jonas Gorski --- Cc: Lennert Buytenhek Cc: Jonas Gorski Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 6495bea..1f3a03d 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2521,7 +2521,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, of_property_read_u32(pnp, "duplex", &ppd.duplex); } - ppdev = platform_device_alloc(MV643XX_ETH_NAME, ppd.port_number); + ppdev = platform_device_alloc(pnp->name, ppd.port_number); if (!ppdev) return -ENOMEM; ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);