lkml.org 
[lkml]   [2014]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv3 02/15] ARM: at91: sam9260: remove unused platform_data
    Date
    num_channels and registers are not used anymore since they are defined inside
    the at91_adc driver and assigned by matching the id_table.

    Also, remove the mach/at91_adc.h include that is not necessary anymore.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    Acked-by: Jonathan Cameron <jic23@kernel.org>
    ---
    arch/arm/mach-at91/at91sam9260_devices.c | 10 ----------
    1 file changed, 10 deletions(-)

    diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
    index a0282928e9c1..fffcd09ac878 100644
    --- a/arch/arm/mach-at91/at91sam9260_devices.c
    +++ b/arch/arm/mach-at91/at91sam9260_devices.c
    @@ -24,7 +24,6 @@
    #include <mach/at91sam9260_matrix.h>
    #include <mach/at91_matrix.h>
    #include <mach/at91sam9_smc.h>
    -#include <mach/at91_adc.h>
    #include <mach/hardware.h>

    #include "board.h"
    @@ -1325,13 +1324,6 @@ static struct at91_adc_trigger at91_adc_triggers[] = {
    },
    };

    -static struct at91_adc_reg_desc at91_adc_register_g20 = {
    - .channel_base = AT91_ADC_CHR(0),
    - .drdy_mask = AT91_ADC_DRDY,
    - .status_register = AT91_ADC_SR,
    - .trigger_register = AT91_ADC_MR,
    -};
    -
    void __init at91_add_device_adc(struct at91_adc_data *data)
    {
    if (!data)
    @@ -1349,9 +1341,7 @@ void __init at91_add_device_adc(struct at91_adc_data *data)
    if (data->use_external_triggers)
    at91_set_A_periph(AT91_PIN_PA22, 0);

    - data->num_channels = 4;
    data->startup_time = 10;
    - data->registers = &at91_adc_register_g20;
    data->trigger_number = 4;
    data->trigger_list = at91_adc_triggers;

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-04-15 14:41    [W:4.105 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site