From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 13 Mar 2015 02:58:37 +0000 (+0000)
Subject: atheros: v3.18: remove eth platform device unused field
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2bb958374163f80956403e8a7905c1a8afd10454;p=openwrt%2Fstaging%2Fstintel.git

atheros: v3.18: remove eth platform device unused field

Ethernet controller driver don't use boarddata directly, so remove
corresponding field from its platform device structure.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 44710
---

diff --git a/target/linux/atheros/patches-3.18/100-board.patch b/target/linux/atheros/patches-3.18/100-board.patch
index e86bb4876d..abf19641bc 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 2860c541b2..8bc9689fbf 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 cd3baf5c15..9b55d378f8 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 6e398dc34e..d86e9b7901 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());
  }