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

Commit 07afa018 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/pxa' into asoc-pxa

parents 01a61f49 3b4bc7bc

Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Device tree bindings for twl4030-wdt driver (TWL4030 watchdog)



Required properties:

	compatible = "ti,twl4030-wdt";



Example:



watchdog {

	compatible = "ti,twl4030-wdt";

};

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -5385,6 +5385,15 @@ F: arch/arm/*omap*/ 
F:	drivers/i2c/busses/i2c-omap.c

F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/boot/dts/*omap*

F:	arch/arm/boot/dts/*am3*



OMAP CLOCK FRAMEWORK SUPPORT

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

Makefile

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

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Terrified Chipmunk



# *DOCUMENTATION*

arch/arm/boot/dts/twl4030.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
		interrupts = <11>;

	};



	watchdog {

		compatible = "ti,twl4030-wdt";

	};



	vdac: regulator-vdac {

		compatible = "ti,twl4030-vdac";

		regulator-min-microvolt = <1800000>;

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y 
CONFIG_MACH_ARMADA_XP=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_SOCFPGA=y

CONFIG_ARCH_SUNXI=y

# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set

CONFIG_ARM_ERRATA_754322=y

CONFIG_SMP=y