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

Commit 1a2217a9 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:
  avr32: Fix build failures in board code
  avr32: Allow selecting multiple pins at once
  avr32: Minor pm_power_off cleanup
  avr32: Implement {read,write}[bwl]_be
  avr32: Replace static clock list with dynamic linked list
  avr32: Use platform_driver_probe for pdc platform driver
  avr32: Use platform_driver_probe for pio platform driver
  avr32: Provide a way to deselect pins in the portmux
  ngw100: export J15 through sysfs
  avr32: Allow fine-grained control over LCDC pins
  avr32: added mem kernel command line option support
  Add kernel support for oprofile callgraphs on AVR32
  avr32: use the new byteorder headers
parents 46b5e340 6eb3ebe0

arch/avr32/boards/atngw100/setup.c

+11 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/clk.h>

#include <linux/etherdevice.h>

#include <linux/gpio.h>

#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>
@@ -193,7 +194,7 @@ static int __init atngw100_init(void) 
	 * 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_periph(GPIO_PIOB_BASE, 1 << 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,
@@ -207,6 +208,15 @@ postcore_initcall(atngw100_init); 


static int __init atngw100_arch_init(void)

{

	/* PB30 is the otherwise unused jumper on the mainboard, with an

	 * external pullup; the jumper grounds it.  Use it however you

	 * like, including letting U-Boot or Linux tweak boot sequences.

	 */

	at32_select_gpio(GPIO_PIN_PB(30), 0);

	gpio_request(GPIO_PIN_PB(30), "j15");

	gpio_direction_input(GPIO_PIN_PB(30));

	gpio_export(GPIO_PIN_PB(30), false);



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

	 * before the I2C subsystem could try using this IRQ.

	 */

arch/avr32/boards/atstk1000/atstk1002.c

+4 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static void __init atstk1002_setup_extdac(void) 
		goto err_set_clk;

	}



	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);

	at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);

	at73c213_data.dac_clk = gclk;



err_set_clk:
@@ -330,13 +330,14 @@ static int __init atstk1002_init(void) 
	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0, &mci0_pdata);

	at32_add_device_mci(0, &mci0_data);

#endif

#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM

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

#else

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size, 0);

			     fbmem_start, fbmem_size,

			     ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);

#endif

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM

arch/avr32/boards/atstk1000/atstk1003.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/spi/spi.h>



#include <asm/setup.h>

#include <asm/atmel-mci.h>



#include <mach/at32ap700x.h>

#include <mach/board.h>
@@ -94,7 +95,7 @@ static void __init atstk1003_setup_extdac(void) 
		goto err_set_clk;

	}



	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);

	at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);

	at73c213_data.dac_clk = gclk;



err_set_clk:

arch/avr32/boards/atstk1000/atstk1004.c

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <video/atmel_lcdc.h>



#include <asm/setup.h>

#include <asm/atmel-mci.h>



#include <mach/at32ap700x.h>

#include <mach/board.h>
@@ -99,7 +100,7 @@ static void __init atstk1004_setup_extdac(void) 
		goto err_set_clk;

	}



	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);

	at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);

	at73c213_data.dac_clk = gclk;



err_set_clk:
@@ -150,7 +151,8 @@ static int __init atstk1004_init(void) 
	at32_add_device_mci(0, &mci0_data);

#endif

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size, 0);

			     fbmem_start, fbmem_size,

			     ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM

	at32_add_device_ssc(0, ATMEL_SSC_TX);

arch/avr32/include/asm/byteorder.h

+14 −8
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
#include <asm/types.h>

#include <linux/compiler.h>



#define __BIG_ENDIAN

#define __SWAB_64_THRU_32__



#ifdef __CHECKER__

extern unsigned long __builtin_bswap_32(unsigned long x);

extern unsigned short __builtin_bswap_16(unsigned short x);
@@ -17,15 +20,18 @@ extern unsigned short __builtin_bswap_16(unsigned short x); 
 * the result.

 */

#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2)

#define __arch__swab32(x) __builtin_bswap_32(x)

#define __arch__swab16(x) __builtin_bswap_16(x)

#endif

static inline __attribute_const__ __u16 __arch_swab16(__u16 val)

{

	return __builtin_bswap_16(val);

}

#define __arch_swab16 __arch_swab16



#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)

# define __BYTEORDER_HAS_U64__

# define __SWAB_64_THRU_32__

static inline __attribute_const__ __u32 __arch_swab32(__u32 val)

{

	return __builtin_bswap_32(val);

}

#define __arch_swab32 __arch_swab32

#endif



#include <linux/byteorder/big_endian.h>



#include <linux/byteorder.h>

#endif /* __ASM_AVR32_BYTEORDER_H */