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

Commit d3ad4a60 authored by Rob Herring's avatar Rob Herring
Browse files

Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll

parents e095c0d1 e5c5f2ad

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/include/asm/mach/map.h

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ extern void iotable_init(struct map_desc *, int); 
extern void vm_reserve_area_early(unsigned long addr, unsigned long size,

				  void *caller);



#ifdef CONFIG_DEBUG_LL

extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);

extern void debug_ll_io_init(void);

#else

static inline void debug_ll_io_init(void) {}

#endif



struct mem_type;

extern const struct mem_type *get_mem_type(unsigned int type);

/*