tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8cc91677 d32ddd8f

+8 -8
-3
arch/avr32/Kconfig
··· 19 19 There is an AVR32 Linux project with a web page at 20 20 http://avr32linux.org/. 21 21 22 - config UID16 23 - bool 24 - 25 22 config GENERIC_GPIO 26 23 bool 27 24 default y
+2 -2
arch/avr32/mach-at32ap/at32ap7000.c
··· 474 474 static struct resource at32_wdt0_resource[] = { 475 475 { 476 476 .start = 0xfff000b0, 477 - .end = 0xfff000bf, 477 + .end = 0xfff000cf, 478 478 .flags = IORESOURCE_MEM, 479 479 }, 480 480 }; ··· 690 690 IRQ(6), 691 691 }; 692 692 DEFINE_DEV_DATA(atmel_usart, 0); 693 - DEV_CLK(usart, atmel_usart0, pba, 4); 693 + DEV_CLK(usart, atmel_usart0, pba, 3); 694 694 695 695 static struct atmel_uart_data atmel_usart1_data = { 696 696 .use_dma_tx = 1,
-1
arch/avr32/mach-at32ap/hsmc.c
··· 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 9 */ 10 - #define DEBUG 11 10 #include <linux/clk.h> 12 11 #include <linux/err.h> 13 12 #include <linux/init.h>
+3 -1
arch/avr32/mach-at32ap/intc.c
··· 13 13 #include <linux/irq.h> 14 14 #include <linux/platform_device.h> 15 15 16 + #include <asm/intc.h> 16 17 #include <asm/io.h> 17 18 18 19 #include "intc.h" ··· 137 136 panic("Interrupt controller initialization failed!\n"); 138 137 } 139 138 140 - unsigned long intc_get_pending(int group) 139 + unsigned long intc_get_pending(unsigned int group) 141 140 { 142 141 return intc_readl(&intc0, INTREQ0 + 4 * group); 143 142 } 143 + EXPORT_SYMBOL_GPL(intc_get_pending);
+2
include/asm-avr32/sysreg.h
··· 215 215 #define SYSREG_IRP_SIZE 6 216 216 217 217 /* Bitfields in PCCR */ 218 + #define SYSREG_PCCR_E_OFFSET 0 219 + #define SYSREG_PCCR_E_SIZE 1 218 220 #define SYSREG_PCCR_R_OFFSET 1 219 221 #define SYSREG_PCCR_R_SIZE 1 220 222 #define SYSREG_PCCR_C_OFFSET 2
+1 -1
include/pcmcia/cs_types.h
··· 21 21 #include <sys/types.h> 22 22 #endif 23 23 24 - #if defined(__arm__) || defined(__mips__) 24 + #if defined(__arm__) || defined(__mips__) || defined(__avr32__) 25 25 /* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */ 26 26 typedef u_int ioaddr_t; 27 27 #else