Commit 6c118e43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (31 commits)
  avr32: Fix typo of IFSR in a comment in the PIO header file
  avr32: Power Management support ("standby" and "mem" modes)
  avr32: Add system device for the internal interrupt controller (intc)
  avr32: Add simple SRAM allocator
  avr32: Enable SDRAMC clock at startup
  rtc-at32ap700x: Enable wakeup
  macb: Basic suspend/resume support
  atmel_serial: Drain console TX shifter before suspending
  atmel_serial: Fix build on avr32 with CONFIG_PM enabled
  avr32: Use a quicklist for PTE allocation as well
  avr32: Use a quicklist for PGD allocation
  avr32: Cover the kernel page tables in the user PGDs
  avr32: Store virtual addresses in the PGD
  avr32: Remove useless zeroing of swapper_pg_dir at startup
  avr32: Clean up and optimize the TLB operations
  avr32: Rename at32ap.c -> pdc.c
  avr32: Move setup_platform() into chip-specific file
  avr32: Kill special exception handler sections
  avr32: Kill unneeded #include <asm/pgalloc.h> from asm/mmu_context.h
  avr32: Clean up time.c #includes
  ...
parents 847106ff 72f6befe

arch/avr32/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ config PLATFORM_AT32AP 
	select MMU

	select PERFORMANCE_COUNTERS

	select HAVE_GPIO_LIB

	select GENERIC_ALLOCATOR



#

# CPU types
@@ -147,6 +148,9 @@ config PHYS_OFFSET 


source "kernel/Kconfig.preempt"



config QUICKLIST

	def_bool y



config HAVE_ARCH_BOOTMEM_NODE

	def_bool n
@@ -201,6 +205,11 @@ endmenu 


menu "Power management options"



source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	def_bool y



menu "CPU Frequency scaling"



source "drivers/cpufreq/Kconfig"

arch/avr32/boards/atngw100/setup.c

+29 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 */

#include <linux/clk.h>

#include <linux/etherdevice.h>

#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/init.h>

#include <linux/linkage.h>
@@ -25,6 +27,13 @@ 
#include <asm/arch/init.h>

#include <asm/arch/portmux.h>



/* Oscillator frequencies. These are board-specific */

unsigned long at32_board_osc_rates[3] = {

	[0] = 32768,	/* 32.768 kHz on RTC osc */

	[1] = 20000000,	/* 20 MHz on osc0 */

	[2] = 12000000,	/* 12 MHz on osc1 */

};



/* Initialized by bootloader-specific startup code. */

struct tag *bootloader_tags __initdata;
@@ -140,6 +149,10 @@ static struct platform_device i2c_gpio_device = { 
	},

};



static struct i2c_board_info __initdata i2c_info[] = {

	/* NOTE:  original ATtiny24 firmware is at address 0x0b */

};



static int __init atngw100_init(void)

{

	unsigned	i;
@@ -165,12 +178,28 @@ static int __init atngw100_init(void) 
	}

	platform_device_register(&ngw_gpio_leds);



	/* all these i2c/smbus pins should have external pullups for

	 * open-drain sharing among all I2C devices.  SDA and SCL do;

	 * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus),

	 * but it's not available off-board.

	 */

	at32_select_periph(GPIO_PIN_PB(28), 0, AT32_GPIOF_PULLUP);

	at32_select_gpio(i2c_gpio_data.sda_pin,

		AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);

	at32_select_gpio(i2c_gpio_data.scl_pin,

		AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);

	platform_device_register(&i2c_gpio_device);

	i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));



	return 0;

}

postcore_initcall(atngw100_init);



static int __init atngw100_arch_init(void)

{

	/* set_irq_type() after the arch_initcall for EIC has run, and

	 * before the I2C subsystem could try using this IRQ.

	 */

	return set_irq_type(AT32_EXTINT(3), IRQ_TYPE_EDGE_FALLING);

}

arch_initcall(atngw100_arch_init);

arch/avr32/boards/atstk1000/atstk1002.c

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ 


#include "atstk1000.h"



/* Oscillator frequencies. These are board specific */

unsigned long at32_board_osc_rates[3] = {

	[0] = 32768,	/* 32.768 kHz on RTC osc */

	[1] = 20000000,	/* 20 MHz on osc0 */

	[2] = 12000000,	/* 12 MHz on osc1 */

};



struct eth_addr {

	u8 addr[6];
@@ -232,7 +238,7 @@ static int __init atstk1002_init(void) 
	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));

#else

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size);

			     fbmem_start, fbmem_size, 0);

#endif

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM

arch/avr32/boards/atstk1000/atstk1003.c

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ 


#include "atstk1000.h"



/* Oscillator frequencies. These are board specific */

unsigned long at32_board_osc_rates[3] = {

	[0] = 32768,	/* 32.768 kHz on RTC osc */

	[1] = 20000000,	/* 20 MHz on osc0 */

	[2] = 12000000,	/* 12 MHz on osc1 */

};



#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC

static struct at73c213_board_info at73c213_data = {

	.ssc_id		= 0,

arch/avr32/boards/atstk1000/atstk1004.c

+8 −1
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ 


#include "atstk1000.h"



/* Oscillator frequencies. These are board specific */

unsigned long at32_board_osc_rates[3] = {

	[0] = 32768,	/* 32.768 kHz on RTC osc */

	[1] = 20000000,	/* 20 MHz on osc0 */

	[2] = 12000000,	/* 12 MHz on osc1 */

};



#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC

static struct at73c213_board_info at73c213_data = {

	.ssc_id		= 0,
@@ -133,7 +140,7 @@ static int __init atstk1004_init(void) 
	at32_add_device_mci(0);

#endif

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size);

			     fbmem_start, fbmem_size, 0);

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM

	at32_add_device_ssc(0, ATMEL_SSC_TX);

CRA Git | Maintained and supported by SUSTech CRA and CCSE