Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6842d4c2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

Here is another fixes series for AT91 designed for 3.4-rc.

We experienced some issues while compiling some drivers as modules: Joachim has
corrected several of them. We may reduce this number of exported values by
reworking some drivers, in the future.

Some drivers are also modified here, I would like to keep them in the series
as the modifications are really related with our recent move to irqdomains or
simply related with compiler annotations.

I keep dmaengine Kconfig modification in this "fixes" series. The DMA
driver will not be available for 9x5 SoC family otherwise.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  dmaengine: Kconfig: fix Atmel at_hdmac entry
  USB: gadget/at91_udc: add gpio_to_irq() function to vbus interrupt
  USB: ohci-at91: change annotations for probe/remove functions
  leds-atmel-pwm.c: Make pwmled_probe() __devinit
  ARM: at91: fix at91sam9261ek Ethernet dm9000 irq
  ARM: at91: fix rm9200ek flash size
  ARM: at91: remove empty at91_init_serial function
  ARM: at91: fix typo in at91_pmc_base assembly declaration
  ARM: at91: Export at91_matrix_base
  ARM: at91: Export at91_pmc_base
  ARM: at91: Export at91_ramc_base
  ARM: at91: Export at91_st_base
parents ea53671a f898fed0

arch/arm/mach-at91/at91rm9200_devices.c

+0 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,6 @@ void __init at91_add_device_serial(void) 
		printk(KERN_INFO "AT91: No default serial console defined.\n");

}

#else

void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}

void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}

void __init at91_set_serial_console(unsigned portnr) {}

void __init at91_add_device_serial(void) {}

arch/arm/mach-at91/at91rm9200_time.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/clockchips.h>

#include <linux/export.h>



#include <asm/mach/time.h>
@@ -176,6 +177,7 @@ static struct clock_event_device clkevt = { 
};



void __iomem *at91_st_base;

EXPORT_SYMBOL_GPL(at91_st_base);



void __init at91rm9200_ioremap_st(u32 addr)

{

arch/arm/mach-at91/board-rm9200ek.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = { 
};



#define EK_FLASH_BASE	AT91_CHIPSELECT_0

#define EK_FLASH_SIZE	SZ_2M

#define EK_FLASH_SIZE	SZ_8M



static struct physmap_flash_data ek_flash_data = {

	.width		= 2,

arch/arm/mach-at91/board-sam9261ek.c

+3 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ static struct resource dm9000_resource[] = { 
		.flags	= IORESOURCE_MEM

	},

	[2] = {

		.start	= AT91_PIN_PC11,

		.end	= AT91_PIN_PC11,

		.flags	= IORESOURCE_IRQ

			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,

	}
@@ -130,6 +128,8 @@ static struct sam9_smc_config __initdata dm9000_smc_config = { 


static void __init ek_add_device_dm9000(void)

{

	struct resource *r = &dm9000_resource[2];



	/* Configure chip-select 2 (DM9000) */

	sam9_smc_configure(0, 2, &dm9000_smc_config);
@@ -139,6 +139,7 @@ static void __init ek_add_device_dm9000(void) 
	/* Configure Interrupt pin as input, no pull-up */

	at91_set_gpio_input(AT91_PIN_PC11, 0);



	r->start = r->end = gpio_to_irq(AT91_PIN_PC11);

	platform_device_register(&dm9000_device);

}

#else

arch/arm/mach-at91/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "generic.h"



void __iomem *at91_pmc_base;

EXPORT_SYMBOL_GPL(at91_pmc_base);



/*

 * There's a lot more which can be done with clocks, including cpufreq