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

Commit 3d0049e8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.12-4' of... 

Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.12

A few small fixes, nothing with any broad impact but all useful for the
affected systems.  The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.
parents be8cf445 2ae2caff

Documentation/devicetree/bindings/sound/mvebu-audio.txt

+8 −4
Original line number Diff line number Diff line
@@ -2,13 +2,17 @@ 


Required properties:



- compatible: "marvell,mvebu-audio"

- compatible:

  "marvell,kirkwood-audio" for Kirkwood platforms

  "marvell,dove-audio" for Dove platforms



- reg: physical base address of the controller and length of memory mapped

  region.



- interrupts: list of two irq numbers.

  The first irq is used for data flow and the second one is used for errors.

- interrupts:

  with "marvell,kirkwood-audio", the audio interrupt

  with "marvell,dove-audio", a list of two interrupts, the first for

  the data flow, and the second for errors.



- clocks: one or two phandles.

  The first one is mandatory and defines the internal clock.
@@ -21,7 +25,7 @@ Required properties: 
Example:



i2s1: audio-controller@b4000 {

	compatible = "marvell,mvebu-audio";

	compatible = "marvell,dove-audio";

	reg = <0xb4000 0x2210>;

	interrupts = <21>, <22>;

	clocks = <&gate_clk 13>;

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6067,7 +6067,7 @@ M: Rob Herring <rob.herring@calxeda.com> 
M:	Pawel Moll <pawel.moll@arm.com>

M:	Mark Rutland <mark.rutland@arm.com>

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Ian Campbell <ian.campbell@citrix.com>

M:	Ian Campbell <ijc+devicetree@hellion.org.uk>

L:	devicetree@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/arm/mach-prima2/common.c

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static const char *atlas6_dt_match[] __initdata = { 


DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.init_late	= sirfsoc_init_late,
@@ -59,7 +58,6 @@ static const char *prima2_dt_match[] __initdata = { 


DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.nr_irqs	= 128,

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.dma_zone_size	= SZ_256M,

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -979,6 +979,7 @@ config RELOCATABLE 
	  must live at a different physical address than the primary

	  kernel.



# This value must have zeroes in the bottom 60 bits otherwise lots will break

config PAGE_OFFSET

	hex

	default "0xc000000000000000"