From patchwork Fri Mar 13 02:19:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ryazanov X-Patchwork-Id: 449745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2D1C21400DE for ; Fri, 13 Mar 2015 13:24:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=OqAlo68I; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 728CF28C1A6; Fri, 13 Mar 2015 03:21:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A3ECF28BDBB for ; Fri, 13 Mar 2015 03:19:24 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-la0-f52.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 13 Mar 2015 03:19:23 +0100 (CET) Received: by labmn12 with SMTP id mn12so19860295lab.0 for ; Thu, 12 Mar 2015 19:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=1UlaZsmhvHuocPAY75FGk7v3KO5lnK+uou/6PqInCzQ=; b=OqAlo68I0tmX4dD3h++pzzXUu5dbXmKK7u5Wl0sXynrTqVdxDkEHvep9y9lrIJMwiY 1TjiYMmPOREogccFSfxVSmu7DpptRL6oY9eH5R2MXHnQnOmNsR8Zc7cPIWPGjquBdN2P LAJ3V7XtVrtKJrVFfh2UH3OVRX3TtA1qJmubObkUTzc8X8Jxsc92lgwlRcC3RLFEXPyB 5Ao4YUgZVCUx778RDnaYjSwc79aECf035wAdjax9NAJENgFIKWs98j1UIl++lzyNJPzf e/omrByj7aOKpi02T/1wOcKphjszlPycY/CDIIFnBifgkiMDz78etPYtMC/cCbS0AmiK 9Ifw== X-Received: by 10.112.170.72 with SMTP id ak8mr39647032lbc.95.1426213185869; Thu, 12 Mar 2015 19:19:45 -0700 (PDT) Received: from rsa-laptop.internal.lan ([217.25.229.52]) by mx.google.com with ESMTPSA id ao5sm107290lac.48.2015.03.12.19.19.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Mar 2015 19:19:45 -0700 (PDT) From: Sergey Ryazanov To: OpenWrt Development List Date: Fri, 13 Mar 2015 05:19:11 +0300 Message-Id: <1426213178-5239-7-git-send-email-ryazanov.s.a@gmail.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1426213178-5239-1-git-send-email-ryazanov.s.a@gmail.com> References: <1426213178-5239-1-git-send-email-ryazanov.s.a@gmail.com> Subject: [OpenWrt-Devel] [PATCH 06/33] atheros: v3.18: remove eth platform device unused field X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Ethernet controller driver don't use boarddata directly, so remove corresponding field from its platform device structure. Signed-off-by: Sergey Ryazanov --- target/linux/atheros/patches-3.18/100-board.patch | 10 +++------- target/linux/atheros/patches-3.18/102-ar5312_gpio.patch | 4 ++-- target/linux/atheros/patches-3.18/103-ar2315_gpio.patch | 4 ++-- target/linux/atheros/patches-3.18/105-ar2315_pci.patch | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/target/linux/atheros/patches-3.18/100-board.patch b/target/linux/atheros/patches-3.18/100-board.patch index e86bb48..abf1964 100644 --- a/target/linux/atheros/patches-3.18/100-board.patch +++ b/target/linux/atheros/patches-3.18/100-board.patch @@ -349,7 +349,7 @@ +} --- /dev/null +++ b/arch/mips/include/asm/mach-ath25/ath25_platform.h -@@ -0,0 +1,85 @@ +@@ -0,0 +1,84 @@ +#ifndef __ASM_MACH_ATH25_PLATFORM_H +#define __ASM_MACH_ATH25_PLATFORM_H + @@ -430,7 +430,6 @@ + void (*reset_clear)(u32); + u32 reset_mac; + u32 reset_phy; -+ struct ar231x_board_config *config; + char *macaddr; +}; + @@ -1499,7 +1498,7 @@ +#endif /* __ASM_MACH_ATH25_AR5312_REGS_H */ --- /dev/null +++ b/arch/mips/ath25/ar5312.c -@@ -0,0 +1,476 @@ +@@ -0,0 +1,474 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -1675,7 +1674,6 @@ + .reset_clear = ar5312_device_reset_clear, + .reset_mac = AR5312_RESET_ENET0, + .reset_phy = AR5312_RESET_EPHY0, -+ .config = &ar231x_board, +}; + +static struct ar231x_eth ar5312_eth1_data = { @@ -1683,7 +1681,6 @@ + .reset_clear = ar5312_device_reset_clear, + .reset_mac = AR5312_RESET_ENET1, + .reset_phy = AR5312_RESET_EPHY1, -+ .config = &ar231x_board, +}; + +static struct platform_device ar5312_physmap_flash = { @@ -1978,7 +1975,7 @@ + --- /dev/null +++ b/arch/mips/ath25/ar2315.c -@@ -0,0 +1,431 @@ +@@ -0,0 +1,430 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -2148,7 +2145,6 @@ + .reset_clear = ar2315_device_reset_clear, + .reset_mac = AR2315_RESET_ENET0, + .reset_phy = AR2315_RESET_EPHY0, -+ .config = &ar231x_board, +}; + +static struct resource ar2315_spiflash_res[] = { diff --git a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch index 2860c54..8bc9689 100644 --- a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch +++ b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch @@ -10,7 +10,7 @@ config SOC_AR2315 --- a/arch/mips/ath25/ar5312.c +++ b/arch/mips/ath25/ar5312.c -@@ -192,6 +192,22 @@ static struct platform_device ar5312_phy +@@ -190,6 +190,22 @@ static struct platform_device ar5312_phy .num_resources = 1, }; @@ -33,7 +33,7 @@ #ifdef CONFIG_LEDS_GPIO static struct gpio_led ar5312_leds[] = { { .name = "wlan", .gpio = 0, .active_low = 1, }, -@@ -282,6 +298,8 @@ int __init ar5312_init_devices(void) +@@ -280,6 +296,8 @@ int __init ar5312_init_devices(void) platform_device_register(&ar5312_physmap_flash); diff --git a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch index cd3baf5..9b55d37 100644 --- a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch +++ b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch @@ -8,7 +8,7 @@ default y --- a/arch/mips/ath25/ar2315.c +++ b/arch/mips/ath25/ar2315.c -@@ -212,6 +212,34 @@ static struct platform_device ar2315_wdt +@@ -211,6 +211,34 @@ static struct platform_device ar2315_wdt .num_resources = ARRAY_SIZE(ar2315_wdt_res) }; @@ -43,7 +43,7 @@ /* * NB: We use mapping size that is larger than the actual flash size, * but this shouldn't be a problem here, because the flash will simply -@@ -277,6 +305,7 @@ ar2315_init_devices(void) +@@ -276,6 +304,7 @@ ar2315_init_devices(void) ar231x_find_config(ar2315_flash_limit()); ar2315_eth_data.macaddr = ar231x_board.config->enet0_mac; diff --git a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch index 6e398dc..d86e9b7 100644 --- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch +++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch @@ -382,7 +382,7 @@ else if (pending & CAUSEF_IP2) do_IRQ(AR2315_IRQ_MISC_INTRS); else if (pending & CAUSEF_IP7) -@@ -458,3 +462,18 @@ ar2315_plat_setup(void) +@@ -457,3 +461,18 @@ ar2315_plat_setup(void) ar231x_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0, ar2315_apb_frequency()); }