From patchwork Fri Jun 7 23:56:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 249905 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 C91582C00AB for ; Sat, 8 Jun 2013 09:56:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757352Ab3FGX4A (ORCPT ); Fri, 7 Jun 2013 19:56:00 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:58263 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756613Ab3FGXz7 (ORCPT ); Fri, 7 Jun 2013 19:55:59 -0400 Received: by mail-lb0-f181.google.com with SMTP id w10so2041533lbi.26 for ; Fri, 07 Jun 2013 16:55:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:organization:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id:x-gm-message-state; bh=JuVwHpbxHP9J+YCcXCHZogNPd4WEf8MhEYRiEfrSd8I=; b=kcTVURNrM6Vsj9YUoFG0Wv3vrdiZM58glS/9sqEjXs8ky16fKR4RC1+YcM1LNysKo2 TZ0EA97erXjPtP6gLw0dLrX7bbeghJhk6xTNB0f6i7W7su2GHqYND6Ix81BtHWqrRXGN HbunV/TgV8333WQCWMEC6MNELGfQF1co2zV+we07k7nBeOsTnvaPcBF7bCPudpG48BX5 lTeUSoYHX5a/9beJMC6hVmyAwsxemvBA9okuReJ+gH/uICtIr/iKNWnLutqZj02djtcC 5pgkJfxkIgmWg74JW3PO7HEDwpn8kD628g9IVoyzjMHJhbTTNfLg74Zy0roRd1c9zMlL pMdg== X-Received: by 10.112.55.9 with SMTP id n9mr2255952lbp.5.1370649358349; Fri, 07 Jun 2013 16:55:58 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-150-46.pppoe.mtu-net.ru. [91.76.150.46]) by mx.google.com with ESMTPSA id 4sm337605lai.4.2013.06.07.16.55.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 07 Jun 2013 16:55:57 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: netdev@vger.kernel.org Subject: [PATCH 3/9] sh_eth: get SH7619 support out of #ifdef Date: Sat, 8 Jun 2013 03:56:05 +0400 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.i686.PAE; KDE/4.4.5; i686; ; ) Cc: nobuhiro.iwamatsu.yj@renesas.com, linux-sh@vger.kernel.org References: <201306080351.39018.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201306080351.39018.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201306080356.05904.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQlVLpPgghRs/pDusNmfXWSG2Zhy0DofM/RAESY8QYMsRPvkoZOfcR9SnGdQKJb77na0V5AU Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Get the SH7619 data in the driver out of #ifdef by adding "sh7619-ether" to the platform driver's ID table. Change the Ether platform device's name in the SH platform code accordingly. Signed-off-by: Sergei Shtylyov --- Note that in this case the driver's probe will crash anyway as the platform code is hopelessly behind since it passes PHY ID instead of 'struct sh_eth_plat_data' pointer as a platform data. arch/sh/kernel/cpu/sh2/setup-sh7619.c | 4 ++-- drivers/net/ethernet/renesas/sh_eth.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next/arch/sh/kernel/cpu/sh2/setup-sh7619.c =================================================================== --- net-next.orig/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ net-next/arch/sh/kernel/cpu/sh2/setup-sh7619.c @@ -124,8 +124,8 @@ static struct resource eth_resources[] = }; static struct platform_device eth_device = { - .name = "sh-eth", - .id = -1, + .name = "sh7619-ether", + .id = -1, .dev = { .platform_data = (void *)1, }, Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -680,9 +680,9 @@ static struct sh_eth_cpu_data sh_eth_my_ .tsu = 1, .select_mii = 1, }; +#endif -#elif defined(CONFIG_CPU_SUBTYPE_SH7619) -static struct sh_eth_cpu_data sh_eth_my_cpu_data = { +static struct sh_eth_cpu_data sh7619_data = { .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, .apr = 1, @@ -690,7 +690,6 @@ static struct sh_eth_cpu_data sh_eth_my_ .tpauser = 1, .hw_swap = 1, }; -#endif static struct sh_eth_cpu_data sh771x_data = { .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, @@ -2700,6 +2699,7 @@ static const struct dev_pm_ops sh_eth_de #endif static struct platform_device_id sh_eth_id_table[] = { + { "sh7619-ether", (kernel_ulong_t)&sh7619_data }, { "sh771x-ether", (kernel_ulong_t)&sh771x_data }, { CARDNAME }, { }