Changeset 44728


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

atheros: v3.18: move GPIO patches behind PCI

Move GPIO patches behind PCI patch, since they are not yet merged
upstream.

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

Location:
trunk/target/linux/atheros/patches-3.18
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-3.18/105-ar2315_pci.patch

    r44727 r44728  
    525525--- a/arch/mips/ath25/Kconfig 
    526526+++ b/arch/mips/ath25/Kconfig 
    527 @@ -9,3 +9,10 @@ config SOC_AR2315 
     527@@ -7,3 +7,10 @@ config SOC_AR2315 
     528        bool "Atheros 2315+ support" 
    528529        depends on ATH25 
    529         select GPIO_AR2315 
    530530        default y 
    531531+ 
     
    549549                do_IRQ(AR2315_IRQ_MISC); 
    550550        else if (pending & CAUSEF_IP7) 
    551 @@ -460,10 +464,62 @@ void __init ar2315_plat_mem_setup(void) 
     551@@ -429,10 +433,62 @@ void __init ar2315_plat_mem_setup(void) 
    552552        _machine_restart = ar2315_restart; 
    553553 } 
  • trunk/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch

    r44727 r44728  
    11--- a/arch/mips/ath25/Kconfig 
    22+++ b/arch/mips/ath25/Kconfig 
    3 @@ -7,4 +7,5 @@ config SOC_AR5312 
     3@@ -7,6 +7,7 @@ config SOC_AR5312 
    44 config SOC_AR2315 
    55        bool "Atheros 2315+ support" 
     
    77+       select GPIO_AR2315 
    88        default y 
     9  
     10 config PCI_AR2315 
    911--- a/arch/mips/ath25/ar2315.c 
    1012+++ b/arch/mips/ath25/ar2315.c 
    11 @@ -236,6 +236,32 @@ static struct platform_device ar2315_wdt 
     13@@ -240,6 +240,32 @@ static struct platform_device ar2315_wdt 
    1214        .num_resources = ARRAY_SIZE(ar2315_wdt_res) 
    1315 }; 
     
    4244 static struct gpio_led ar2315_leds[6]; 
    4345 static struct gpio_led_platform_data ar2315_led_data = { 
    44 @@ -286,6 +312,11 @@ void __init ar2315_init_devices(void) 
     46@@ -290,6 +316,11 @@ void __init ar2315_init_devices(void) 
    4547        ath25_find_config(AR2315_SPI_READ_BASE, AR2315_SPI_READ_SIZE); 
    4648        ar2315_eth_data.macaddr = ath25_board.config->enet0_mac; 
Note: See TracChangeset for help on using the changeset viewer.