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

Commit b68c50d8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc 

Patches from Roland Stigge <stigge@antcom.de>:

  Platform topic branch for lpc32xx

* 'lpc32xx/core' of git://git.antcom.de/linux-2.6

:
  ARM: LPC32xx: Add the motor PWM clock
  ARM: LPC32xx: Cleanup irq.c
  ARM: LPC32xx: Relocate calls to irq_set_chained_handler()
  ARM: LPC32xx: Remove superfluous irq_alloc_descs()

Includes an update to v3.7-rc4

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5bd09fb0 84cee34d

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* EETI eGalax Multiple Touch Controller



Required properties:

- compatible: must be "eeti,egalax_ts"

- reg: i2c slave address

- interrupt-parent: the phandle for the interrupt controller

- interrupts: touch controller interrupt

- wakeup-gpios: the gpio pin to be used for waking up the controller

  as well as uased as irq pin



Example:



	egalax_ts@04 {

		compatible = "eeti,egalax_ts";

		reg = <0x04>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 2>;

		wakeup-gpios = <&gpio1 9 0>;

	};

Documentation/hwmon/fam15h_power

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Supported chips: 
  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors

    (not yet published)



Author: Andreas Herrmann <andreas.herrmann3@amd.com>

Author: Andreas Herrmann <herrmann.der.user@googlemail.com>



Description

-----------

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ F: include/linux/altera_uart.h 
F:	include/linux/altera_jtaguart.h



AMD FAM15H PROCESSOR POWER MONITORING DRIVER

M:	Andreas Herrmann <andreas.herrmann3@amd.com>

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/fam15h_power
@@ -2507,6 +2507,7 @@ M: Joonyoung Shim <jy0922.shim@samsung.com> 
M:	Seung-Woo Kim <sw0312.kim@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git

S:	Supported

F:	drivers/gpu/drm/exynos

F:	include/drm/exynos*
@@ -5647,7 +5648,7 @@ S: Maintained 
F:	drivers/pinctrl/spear/



PKTCDVD DRIVER

M:	Peter Osterlund <petero2@telia.com>

M:	Jiri Kosina <jkosina@suse.cz>

S:	Maintained

F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Terrified Chipmunk



# *DOCUMENTATION*

arch/arm/mach-lpc32xx/clock.c

+8 −0
Original line number Diff line number Diff line
@@ -585,6 +585,13 @@ static struct clk clk_timer3 = { 
	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_TIMER3_EN,

	.get_rate	= local_return_parent_rate,

};

static struct clk clk_mpwm = {

	.parent		= &clk_pclk,

	.enable		= local_onoff_enable,

	.enable_reg	= LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1,

	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_MPWM_EN,

	.get_rate	= local_return_parent_rate,

};

static struct clk clk_wdt = {

	.parent		= &clk_pclk,

	.enable		= local_onoff_enable,
@@ -1202,6 +1209,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_INIT("pl08xdmac", NULL, &clk_dma),

	CLKDEV_INIT("4003c000.watchdog", NULL, &clk_wdt),

	CLKDEV_INIT("4005c000.pwm", NULL, &clk_pwm),

	CLKDEV_INIT("400e8000.mpwm", NULL, &clk_mpwm),

	CLKDEV_INIT(NULL, "uart3_ck", &clk_uart3),

	CLKDEV_INIT(NULL, "uart4_ck", &clk_uart4),

	CLKDEV_INIT(NULL, "uart5_ck", &clk_uart5),