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

Commit 55982fd1 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] Fix random segfault with preemption
  [AVR32] Don't use __builtin_xchg()
  [AVR32] ngw100 i2c-gpio tweaks
  [AVR32] Ignore a few irrelevant syscalls
  [AVR32] SMC configuration in clock cycles
  [AVR32] Drop support for redundant "keepinitrd" boot-time parm.
  [AVR32] Make dma_sync_*_for_cpu no-ops
  [AVR32] Remove unneeded 8K alignment of .text section
  [AVR32] Kill a few hardcoded constants in vmlinux.lds
  [AVR32] rename vmlinux.lds
  [AVR32] fix command line parsing in early_parse_fbmem
  [AVR32] checkstack support
  [AVR32] Wire up USBA device
  [AVR32] add multidrive support for pio driver
  [AVR32] /sys/kernel/debug/at32ap_clk
  [AVR32] Move AT32_PM_BASE definition into pm.h
parents 1ef3e362 a7e30b8d

arch/avr32/boards/atngw100/flash.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 




#include <asm/arch/smc.h>

#include <asm/arch/smc.h>





static struct smc_config flash_config __initdata = {

static struct smc_timing flash_timing __initdata = {

	.ncs_read_setup		= 0,

	.ncs_read_setup		= 0,

	.nrd_setup		= 40,

	.nrd_setup		= 40,

	.ncs_write_setup	= 0,

	.ncs_write_setup	= 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = { 




	.read_cycle		= 120,

	.read_cycle		= 120,

	.write_cycle		= 120,

	.write_cycle		= 120,

};





static struct smc_config flash_config __initdata = {

	.bus_width		= 2,

	.bus_width		= 2,

	.nrd_controlled		= 1,

	.nrd_controlled		= 1,

	.nwe_controlled		= 1,

	.nwe_controlled		= 1,
@@ -82,6 +84,7 @@ static int __init atngw100_flash_init(void) 
{

{

	int ret;

	int ret;





	smc_set_timing(&flash_config, &flash_timing);

	ret = smc_set_configuration(0, &flash_config);

	ret = smc_set_configuration(0, &flash_config);

	if (ret < 0) {

	if (ret < 0) {

		printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");

		printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");

arch/avr32/boards/atngw100/setup.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -127,6 +127,9 @@ static struct platform_device ngw_gpio_leds = { 
static struct i2c_gpio_platform_data i2c_gpio_data = {

static struct i2c_gpio_platform_data i2c_gpio_data = {

	.sda_pin		= GPIO_PIN_PA(6),

	.sda_pin		= GPIO_PIN_PA(6),

	.scl_pin		= GPIO_PIN_PA(7),

	.scl_pin		= GPIO_PIN_PA(7),

	.sda_is_open_drain	= 1,

	.scl_is_open_drain	= 1,

	.udelay			= 2,	/* close to 100 kHz */

};

};





static struct platform_device i2c_gpio_device = {

static struct platform_device i2c_gpio_device = {
@@ -154,6 +157,7 @@ static int __init atngw100_init(void) 
	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));

	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));





	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));

	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));

	at32_add_device_usba(0, NULL);





	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {

	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {

		at32_select_gpio(ngw_leds[i].gpio,

		at32_select_gpio(ngw_leds[i].gpio,
@@ -161,8 +165,10 @@ static int __init atngw100_init(void) 
	}

	}

	platform_device_register(&ngw_gpio_leds);

	platform_device_register(&ngw_gpio_leds);





	at32_select_gpio(i2c_gpio_data.sda_pin, 0);

	at32_select_gpio(i2c_gpio_data.sda_pin,

	at32_select_gpio(i2c_gpio_data.scl_pin, 0);

		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);

	platform_device_register(&i2c_gpio_device);





	return 0;

	return 0;

arch/avr32/boards/atstk1000/atstk1002.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -241,6 +241,7 @@ static int __init atstk1002_init(void) 
	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size);

			     fbmem_start, fbmem_size);

#endif

#endif

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM

#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM

	at32_add_device_ssc(0, ATMEL_SSC_TX);

	at32_add_device_ssc(0, ATMEL_SSC_TX);

#endif

#endif

arch/avr32/boards/atstk1000/flash.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 




#include <asm/arch/smc.h>

#include <asm/arch/smc.h>





static struct smc_config flash_config __initdata = {

static struct smc_timing flash_timing __initdata = {

	.ncs_read_setup		= 0,

	.ncs_read_setup		= 0,

	.nrd_setup		= 40,

	.nrd_setup		= 40,

	.ncs_write_setup	= 0,

	.ncs_write_setup	= 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = { 




	.read_cycle		= 120,

	.read_cycle		= 120,

	.write_cycle		= 120,

	.write_cycle		= 120,

};





static struct smc_config flash_config __initdata = {

	.bus_width		= 2,

	.bus_width		= 2,

	.nrd_controlled		= 1,

	.nrd_controlled		= 1,

	.nwe_controlled		= 1,

	.nwe_controlled		= 1,
@@ -82,6 +84,7 @@ static int __init atstk1000_flash_init(void) 
{

{

	int ret;

	int ret;





	smc_set_timing(&flash_config, &flash_timing);

	ret = smc_set_configuration(0, &flash_config);

	ret = smc_set_configuration(0, &flash_config);

	if (ret < 0) {

	if (ret < 0) {

		printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n");

		printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n");

arch/avr32/kernel/Makefile

+0 −5
Original line number Original line Diff line number Diff line
@@ -11,8 +11,3 @@ obj-y += signal.o sys_avr32.o process.o time.o 
obj-y				+= init_task.o switch_to.o cpu.o

obj-y				+= init_task.o switch_to.o cpu.o

obj-$(CONFIG_MODULES)		+= module.o avr32_ksyms.o

obj-$(CONFIG_MODULES)		+= module.o avr32_ksyms.o

obj-$(CONFIG_KPROBES)		+= kprobes.o
 
obj-$(CONFIG_KPROBES)		+= kprobes.o
 


USE_STANDARD_AS_RULE		:= true



%.lds: %.lds.c FORCE

	$(call if_changed_dep,cpp_lds_S)