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

Commit 8cc91677 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  [AVR32] Export intc_get_pending symbol
  [AVR32] Add missing bit in PCCR sysreg
  [AVR32] Fix duplicate clock index in at32ap machine code
  [AVR32] remove UID16 option
  [AVR32] Turn off debugging in SMC driver
  Extend I/O resource for wdt0 for at32ap7000 devices
  [AVR32] pcmcia ioaddr_t should be 32 bits on AVR32
parents d32ddd8f 597702ae

arch/avr32/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ config AVR32 
	  There is an AVR32 Linux project with a web page at

	  http://avr32linux.org/.



config UID16

	bool



config GENERIC_GPIO

	bool

	default y

arch/avr32/mach-at32ap/at32ap7000.c

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static struct resource at32ap700x_rtc0_resource[] = { 
static struct resource at32_wdt0_resource[] = {

	{

		.start	= 0xfff000b0,

		.end	= 0xfff000bf,

		.end	= 0xfff000cf,

		.flags	= IORESOURCE_MEM,

	},

};
@@ -690,7 +690,7 @@ static struct resource atmel_usart0_resource[] = { 
	IRQ(6),

};

DEFINE_DEV_DATA(atmel_usart, 0);

DEV_CLK(usart, atmel_usart0, pba, 4);

DEV_CLK(usart, atmel_usart0, pba, 3);



static struct atmel_uart_data atmel_usart1_data = {

	.use_dma_tx	= 1,

arch/avr32/mach-at32ap/hsmc.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#define DEBUG

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/init.h>

arch/avr32/mach-at32ap/intc.c

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/irq.h>

#include <linux/platform_device.h>



#include <asm/intc.h>

#include <asm/io.h>



#include "intc.h"
@@ -136,7 +137,8 @@ void __init init_IRQ(void) 
	panic("Interrupt controller initialization failed!\n");

}



unsigned long intc_get_pending(int group)

unsigned long intc_get_pending(unsigned int group)

{

	return intc_readl(&intc0, INTREQ0 + 4 * group);

}

EXPORT_SYMBOL_GPL(intc_get_pending);

include/asm-avr32/sysreg.h

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ 
#define SYSREG_IRP_SIZE				6



/* Bitfields in PCCR */

#define SYSREG_PCCR_E_OFFSET			0

#define SYSREG_PCCR_E_SIZE			1

#define SYSREG_PCCR_R_OFFSET			1

#define SYSREG_PCCR_R_SIZE			1

#define SYSREG_PCCR_C_OFFSET			2