Changeset 44730


Ignore:
Timestamp:
2015-03-13T04:01:50+01:00 (3 years ago)
Author:
nbd
Message:

atheros: v3.18: cleanup includes

Remove odd and add missed includes.

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

Location:
trunk/target/linux/atheros/patches-3.18
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-3.18/100-board.patch

    r44729 r44730  
    7878--- /dev/null 
    7979+++ b/arch/mips/ath25/board.c 
    80 @@ -0,0 +1,244 @@ 
     80@@ -0,0 +1,235 @@ 
    8181+/* 
    8282+ * This file is subject to the terms and conditions of the GNU General Public 
     
    9090+ */ 
    9191+ 
    92 +#include <generated/autoconf.h> 
    9392+#include <linux/init.h> 
    94 +#include <linux/module.h> 
    95 +#include <linux/types.h> 
    96 +#include <linux/string.h> 
    97 +#include <linux/platform_device.h> 
    98 +#include <linux/kernel.h> 
    99 +#include <linux/random.h> 
    100 +#include <linux/etherdevice.h> 
    101 +#include <linux/irq.h> 
    102 +#include <linux/io.h> 
     93+#include <linux/interrupt.h> 
    10394+#include <asm/irq_cpu.h> 
    10495+#include <asm/reboot.h> 
     
    11031094--- /dev/null 
    11041095+++ b/arch/mips/ath25/ar5312_regs.h 
    1105 @@ -0,0 +1,225 @@ 
     1096@@ -0,0 +1,223 @@ 
    11061097+/* 
    11071098+ * This file is subject to the terms and conditions of the GNU General Public 
     
    11161107+#ifndef __ASM_MACH_ATH25_AR5312_REGS_H 
    11171108+#define __ASM_MACH_ATH25_AR5312_REGS_H 
    1118 + 
    1119 +#include <asm/addrspace.h> 
    11201109+ 
    11211110+/* 
     
    13311320--- /dev/null 
    13321321+++ b/arch/mips/ath25/ar5312.c 
    1333 @@ -0,0 +1,401 @@ 
     1322@@ -0,0 +1,396 @@ 
    13341323+/* 
    13351324+ * This file is subject to the terms and conditions of the GNU General Public 
     
    13481337+ */ 
    13491338+ 
    1350 +#include <generated/autoconf.h> 
    13511339+#include <linux/init.h> 
    1352 +#include <linux/module.h> 
    1353 +#include <linux/types.h> 
    1354 +#include <linux/string.h> 
    1355 +#include <linux/mtd/physmap.h> 
    1356 +#include <linux/platform_device.h> 
    13571340+#include <linux/kernel.h> 
    13581341+#include <linux/bitops.h> 
    13591342+#include <linux/irqdomain.h> 
     1343+#include <linux/interrupt.h> 
     1344+#include <linux/platform_device.h> 
     1345+#include <linux/mtd/physmap.h> 
    13601346+#include <linux/reboot.h> 
    13611347+#include <asm/bootinfo.h> 
    13621348+#include <asm/reboot.h> 
    13631349+#include <asm/time.h> 
    1364 +#include <linux/irq.h> 
    1365 +#include <linux/io.h> 
    13661350+ 
    13671351+#include <ath25_platform.h> 
     
    17351719--- /dev/null 
    17361720+++ b/arch/mips/ath25/ar2315.c 
    1737 @@ -0,0 +1,312 @@ 
     1721@@ -0,0 +1,307 @@ 
    17381722+/* 
    17391723+ * This file is subject to the terms and conditions of the GNU General Public 
     
    17521736+ */ 
    17531737+ 
    1754 +#include <generated/autoconf.h> 
    17551738+#include <linux/init.h> 
    1756 +#include <linux/module.h> 
    1757 +#include <linux/types.h> 
    1758 +#include <linux/string.h> 
    1759 +#include <linux/platform_device.h> 
    17601739+#include <linux/kernel.h> 
    17611740+#include <linux/bitops.h> 
    17621741+#include <linux/irqdomain.h> 
     1742+#include <linux/interrupt.h> 
     1743+#include <linux/platform_device.h> 
    17631744+#include <linux/reboot.h> 
    17641745+#include <asm/bootinfo.h> 
    17651746+#include <asm/reboot.h> 
    17661747+#include <asm/time.h> 
    1767 +#include <linux/irq.h> 
    1768 +#include <linux/io.h> 
    17691748+ 
    17701749+#include <ath25_platform.h> 
     
    21282107--- /dev/null 
    21292108+++ b/arch/mips/ath25/devices.h 
    2130 @@ -0,0 +1,41 @@ 
     2109@@ -0,0 +1,43 @@ 
    21312110+#ifndef __ATH25_DEVICES_H 
    21322111+#define __ATH25_DEVICES_H 
     2112+ 
     2113+#include <linux/cpu.h> 
    21332114+ 
    21342115+#define ATH25_REG_MS(_val, _field)     (((_val) & _field##_M) >> _field##_S) 
     
    21722153--- /dev/null 
    21732154+++ b/arch/mips/ath25/devices.c 
    2174 @@ -0,0 +1,127 @@ 
     2155@@ -0,0 +1,125 @@ 
    21752156+#include <linux/kernel.h> 
    21762157+#include <linux/init.h> 
    2177 +#include <linux/serial.h> 
    2178 +#include <linux/serial_core.h> 
    21792158+#include <linux/serial_8250.h> 
    21802159+#include <linux/platform_device.h> 
  • trunk/target/linux/atheros/patches-3.18/101-early-printk-support.patch

    r44729 r44730  
    11--- /dev/null 
    22+++ b/arch/mips/ath25/early_printk.c 
    3 @@ -0,0 +1,46 @@ 
     3@@ -0,0 +1,45 @@ 
    44+/* 
    55+ * This file is subject to the terms and conditions of the GNU General Public 
     
    1313+#include <linux/io.h> 
    1414+#include <linux/serial_reg.h> 
    15 +#include <asm/addrspace.h> 
    1615+ 
    1716+#include "devices.h" 
  • trunk/target/linux/atheros/patches-3.18/105-ar2315_pci.patch

    r44729 r44730  
    538538--- a/arch/mips/ath25/ar2315.c 
    539539+++ b/arch/mips/ath25/ar2315.c 
    540 @@ -139,6 +139,10 @@ static void ar2315_irq_dispatch(void) 
     540@@ -134,6 +134,10 @@ static void ar2315_irq_dispatch(void) 
    541541  
    542542        if (pending & CAUSEF_IP3) 
     
    549549                do_IRQ(AR2315_IRQ_MISC); 
    550550        else if (pending & CAUSEF_IP7) 
    551 @@ -303,10 +307,62 @@ void __init ar2315_plat_mem_setup(void) 
     551@@ -298,10 +302,62 @@ void __init ar2315_plat_mem_setup(void) 
    552552        _machine_restart = ar2315_restart; 
    553553 } 
  • trunk/target/linux/atheros/patches-3.18/107-ar5312_gpio.patch

    r44729 r44730  
    1111--- a/arch/mips/ath25/ar5312.c 
    1212+++ b/arch/mips/ath25/ar5312.c 
    13 @@ -25,6 +25,7 @@ 
    14  #include <linux/bitops.h> 
    15  #include <linux/irqdomain.h> 
     13@@ -22,6 +22,7 @@ 
     14 #include <linux/platform_device.h> 
     15 #include <linux/mtd/physmap.h> 
    1616 #include <linux/reboot.h> 
    1717+#include <linux/gpio.h> 
     
    1919 #include <asm/reboot.h> 
    2020 #include <asm/time.h> 
    21 @@ -185,6 +186,22 @@ static struct platform_device ar5312_phy 
     21@@ -180,6 +181,22 @@ static struct platform_device ar5312_phy 
    2222        .num_resources = 1, 
    2323 }; 
     
    4242 { 
    4343        void __iomem *flashctl_base; 
    44 @@ -252,6 +269,8 @@ void __init ar5312_init_devices(void) 
     44@@ -247,6 +264,8 @@ void __init ar5312_init_devices(void) 
    4545  
    4646        platform_device_register(&ar5312_physmap_flash); 
  • trunk/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch

    r44729 r44730  
    1111--- a/arch/mips/ath25/ar2315.c 
    1212+++ b/arch/mips/ath25/ar2315.c 
    13 @@ -24,6 +24,8 @@ 
    14  #include <linux/bitops.h> 
    15  #include <linux/irqdomain.h> 
     13@@ -21,6 +21,8 @@ 
     14 #include <linux/interrupt.h> 
     15 #include <linux/platform_device.h> 
    1616 #include <linux/reboot.h> 
    1717+#include <linux/delay.h> 
     
    2020 #include <asm/reboot.h> 
    2121 #include <asm/time.h> 
    22 @@ -172,11 +174,42 @@ void __init ar2315_arch_init_irq(void) 
     22@@ -167,11 +169,42 @@ void __init ar2315_arch_init_irq(void) 
    2323        ar2315_misc_irq_domain = domain; 
    2424 } 
     
    6363 } 
    6464  
    65 @@ -192,8 +225,8 @@ static void ar2315_restart(char *command 
     65@@ -187,8 +220,8 @@ static void ar2315_restart(char *command 
    6666        /* Cold reset does not work on the AR2315/6, use the GPIO reset bits 
    6767         * a workaround. Give it some time to attempt a gpio based hardware 
     
    338338--- a/arch/mips/ath25/devices.h 
    339339+++ b/arch/mips/ath25/devices.h 
    340 @@ -1,6 +1,11 @@ 
    341  #ifndef __ATH25_DEVICES_H 
    342  #define __ATH25_DEVICES_H 
     340@@ -3,6 +3,11 @@ 
     341  
     342 #include <linux/cpu.h> 
    343343  
    344344+#define AR231X_GPIO_IRQ_BASE           0x30 
  • trunk/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch

    r44729 r44730  
    15461546--- a/arch/mips/ath25/ar5312_regs.h 
    15471547+++ b/arch/mips/ath25/ar5312_regs.h 
    1548 @@ -66,6 +66,10 @@ 
     1548@@ -64,6 +64,10 @@ 
    15491549 #define AR5312_AR5312_REV7      0x0057          /* AR5312 WMAC (AP30-040) */ 
    15501550 #define AR5312_AR2313_REV8      0x0058          /* AR2313 WMAC (AP43-030) */ 
     
    15591559--- a/arch/mips/ath25/ar2315.c 
    15601560+++ b/arch/mips/ath25/ar2315.c 
    1561 @@ -141,6 +141,8 @@ static void ar2315_irq_dispatch(void) 
     1561@@ -136,6 +136,8 @@ static void ar2315_irq_dispatch(void) 
    15621562  
    15631563        if (pending & CAUSEF_IP3) 
     
    15681568        else if (pending & CAUSEF_IP5) 
    15691569                do_IRQ(AR2315_IRQ_LCBUS_PCI); 
    1570 @@ -174,6 +176,29 @@ void __init ar2315_arch_init_irq(void) 
     1570@@ -169,6 +171,29 @@ void __init ar2315_arch_init_irq(void) 
    15711571        ar2315_misc_irq_domain = domain; 
    15721572 } 
     
    15981598        { 
    15991599                .name = "ar2315-gpio", 
    1600 @@ -210,6 +235,11 @@ void __init ar2315_init_devices(void) 
     1600@@ -205,6 +230,11 @@ void __init ar2315_init_devices(void) 
    16011601        ar2315_gpio_res[1].end = ar2315_gpio_res[1].start; 
    16021602        platform_device_register(&ar2315_gpio); 
     
    16121612--- a/arch/mips/ath25/ar5312.c 
    16131613+++ b/arch/mips/ath25/ar5312.c 
    1614 @@ -137,6 +137,10 @@ static void ar5312_irq_dispatch(void) 
     1614@@ -132,6 +132,10 @@ static void ar5312_irq_dispatch(void) 
    16151615  
    16161616        if (pending & CAUSEF_IP2) 
     
    16231623                do_IRQ(AR5312_IRQ_WLAN1); 
    16241624        else if (pending & CAUSEF_IP6) 
    1625 @@ -168,6 +172,36 @@ void __init ar5312_arch_init_irq(void) 
     1625@@ -163,6 +167,36 @@ void __init ar5312_arch_init_irq(void) 
    16261626        ar5312_misc_irq_domain = domain; 
    16271627 } 
     
    16601660        .width = 2, 
    16611661 }; 
    1662 @@ -248,6 +282,7 @@ static void __init ar5312_flash_init(voi 
     1662@@ -243,6 +277,7 @@ static void __init ar5312_flash_init(voi 
    16631663 void __init ar5312_init_devices(void) 
    16641664 { 
     
    16681668        ar5312_flash_init(); 
    16691669  
    1670 @@ -271,8 +306,30 @@ void __init ar5312_init_devices(void) 
     1670@@ -266,8 +301,30 @@ void __init ar5312_init_devices(void) 
    16711671  
    16721672        platform_device_register(&ar5312_gpio); 
     
    16991699                        return; 
    17001700  
    1701 @@ -281,8 +338,18 @@ void __init ar5312_init_devices(void) 
     1701@@ -276,8 +333,18 @@ void __init ar5312_init_devices(void) 
    17021702  
    17031703                ath25_add_wmac(0, AR5312_WLAN0_BASE, AR5312_IRQ_WLAN0); 
     
    17201720--- a/arch/mips/ath25/devices.h 
    17211721+++ b/arch/mips/ath25/devices.h 
    1722 @@ -30,6 +30,8 @@ extern struct ar231x_board_config ath25_ 
     1722@@ -32,6 +32,8 @@ extern struct ar231x_board_config ath25_ 
    17231723 extern void (*ath25_irq_dispatch)(void); 
    17241724  
     
    17311731--- a/arch/mips/ath25/devices.c 
    17321732+++ b/arch/mips/ath25/devices.c 
    1733 @@ -14,6 +14,51 @@ 
     1733@@ -12,6 +12,51 @@ 
    17341734 struct ar231x_board_config ath25_board; 
    17351735 enum ath25_soc_type ath25_soc = ATH25_SOC_UNKNOWN; 
     
    17831783        { 
    17841784                .name = "wmac0_membase", 
    1785 @@ -72,6 +117,25 @@ const char *get_system_type(void) 
     1785@@ -70,6 +115,25 @@ const char *get_system_type(void) 
    17861786        return soc_type_strings[ath25_soc]; 
    17871787 } 
  • trunk/target/linux/atheros/patches-3.18/120-spiflash.patch

    r44729 r44730  
    595595--- a/arch/mips/ath25/ar2315.c 
    596596+++ b/arch/mips/ath25/ar2315.c 
    597 @@ -225,6 +225,28 @@ static struct platform_device ar2315_gpi 
     597@@ -220,6 +220,28 @@ static struct platform_device ar2315_gpi 
    598598        .num_resources = ARRAY_SIZE(ar2315_gpio_res) 
    599599 }; 
     
    624624 { 
    625625        /* Find board configuration */ 
    626 @@ -235,6 +257,8 @@ void __init ar2315_init_devices(void) 
     626@@ -230,6 +252,8 @@ void __init ar2315_init_devices(void) 
    627627        ar2315_gpio_res[1].end = ar2315_gpio_res[1].start; 
    628628        platform_device_register(&ar2315_gpio); 
  • trunk/target/linux/atheros/patches-3.18/130-watchdog.patch

    r44729 r44730  
    239239--- a/arch/mips/ath25/ar2315.c 
    240240+++ b/arch/mips/ath25/ar2315.c 
    241 @@ -225,6 +225,24 @@ static struct platform_device ar2315_gpi 
     241@@ -220,6 +220,24 @@ static struct platform_device ar2315_gpi 
    242242        .num_resources = ARRAY_SIZE(ar2315_gpio_res) 
    243243 }; 
     
    264264        { 
    265265                .name = "spiflash_read", 
    266 @@ -257,6 +275,11 @@ void __init ar2315_init_devices(void) 
     266@@ -252,6 +270,11 @@ void __init ar2315_init_devices(void) 
    267267        ar2315_gpio_res[1].end = ar2315_gpio_res[1].start; 
    268268        platform_device_register(&ar2315_gpio); 
  • trunk/target/linux/atheros/patches-3.18/330-board_leds.patch

    r44729 r44730  
    11--- a/arch/mips/ath25/ar2315.c 
    22+++ b/arch/mips/ath25/ar2315.c 
    3 @@ -26,6 +26,7 @@ 
     3@@ -23,6 +23,7 @@ 
    44 #include <linux/reboot.h> 
    55 #include <linux/delay.h> 
     
    99 #include <asm/reboot.h> 
    1010 #include <asm/time.h> 
    11 @@ -265,6 +266,50 @@ static struct platform_device ar2315_spi 
     11@@ -260,6 +261,50 @@ static struct platform_device ar2315_spi 
    1212        .num_resources = ARRAY_SIZE(ar2315_spiflash_res) 
    1313 }; 
     
    6060 { 
    6161        /* Find board configuration */ 
    62 @@ -275,6 +320,8 @@ void __init ar2315_init_devices(void) 
     62@@ -270,6 +315,8 @@ void __init ar2315_init_devices(void) 
    6363        ar2315_gpio_res[1].end = ar2315_gpio_res[1].start; 
    6464        platform_device_register(&ar2315_gpio); 
     
    7171--- a/arch/mips/ath25/ar5312.c 
    7272+++ b/arch/mips/ath25/ar5312.c 
    73 @@ -26,6 +26,7 @@ 
    74  #include <linux/irqdomain.h> 
     73@@ -23,6 +23,7 @@ 
     74 #include <linux/mtd/physmap.h> 
    7575 #include <linux/reboot.h> 
    7676 #include <linux/gpio.h> 
     
    7979 #include <asm/reboot.h> 
    8080 #include <asm/time.h> 
    81 @@ -236,6 +237,23 @@ static struct platform_device ar5312_gpi 
     81@@ -231,6 +232,23 @@ static struct platform_device ar5312_gpi 
    8282        .num_resources = ARRAY_SIZE(ar5312_gpio_res), 
    8383 }; 
     
    103103 { 
    104104        void __iomem *flashctl_base; 
    105 @@ -306,6 +324,11 @@ void __init ar5312_init_devices(void) 
     105@@ -301,6 +319,11 @@ void __init ar5312_init_devices(void) 
    106106  
    107107        platform_device_register(&ar5312_gpio); 
Note: See TracChangeset for help on using the changeset viewer.