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

Commit a044a1b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: ensure mfp is in correct range in mfp_{read,write}
  [ARM] pxa/hx4700: fix hx4700 touchscreen pressure values
  ARM: 5787/1: U300 COH 901 331 fixes
  ARM: Fix warning in sa1100-flash.c
  [ARM] Kirkwood: disable propagation of mbus error to the CPU local bus
  [ARM] pxa: fix incorrect mfp_to_gpio() conversion
  [ARM] pxa/colibri: fix AC97 ifdefs and add missing include
  [ARM] pxa: fix missing underscores in mfp-pxa910.h
  [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y
parents b1219e24 112a674f

arch/arm/mach-kirkwood/common.c

+8 −0
Original line number Diff line number Diff line
@@ -915,6 +915,14 @@ void __init kirkwood_init(void) 
	kirkwood_uart0_data[0].uartclk = kirkwood_tclk;

	kirkwood_uart1_data[0].uartclk = kirkwood_tclk;



	/*

	 * Disable propagation of mbus errors to the CPU local bus,

	 * as this causes mbus errors (which can occur for example

	 * for PCI aborts) to throw CPU aborts, which we're not set

	 * up to deal with.

	 */

	writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);



	kirkwood_setup_cpu_mbus();



#ifdef CONFIG_CACHE_FEROCEON_L2

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 


#include <mach/kirkwood.h>



#define CPU_CONFIG		(BRIDGE_VIRT_BASE | 0x0100)

#define CPU_CONFIG_ERROR_PROP	0x00000004



#define CPU_CONTROL		(BRIDGE_VIRT_BASE | 0x0104)

#define CPU_RESET		0x00000002

arch/arm/mach-mmp/include/mach/mfp-pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
#define MMC1_WP_MMC1_WP		MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM)



/* PWM */

#define GPIO27 PWM3 AF2		MFP_CFG(GPIO27, AF2)

#define GPIO27_PWM3_AF2		MFP_CFG(GPIO27, AF2)

#define GPIO51_PWM2_OUT		MFP_CFG(GPIO51, AF2)

#define GPIO117_PWM1_OUT	MFP_CFG(GPIO117, AF2)

#define GPIO118_PWM2_OUT	MFP_CFG(GPIO118, AF2)

arch/arm/mach-pxa/colibri-pxa320.c

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <mach/colibri.h>

#include <mach/pxafb.h>

#include <mach/ohci.h>

#include <mach/audio.h>



#include "generic.h"

#include "devices.h"
@@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void) 
static inline void colibri_pxa320_init_lcd(void) {}

#endif



#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)

#if	defined(CONFIG_SND_AC97_CODEC) || \

	defined(CONFIG_SND_AC97_CODEC_MODULE)

static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = {

	GPIO34_AC97_SYSCLK,

	GPIO35_AC97_SDATA_IN_0,

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = { 
static const struct ads7846_platform_data tsc2046_info = {

	.model            = 7846,

	.vref_delay_usecs = 100,

	.pressure_max     = 512,

	.pressure_max     = 1024,

	.debounce_max     = 10,

	.debounce_tol     = 3,

	.debounce_rep     = 1,