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

Commit 50487c3a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.15-5' of... 

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

ASoC: Fixes for v3.15

A smattering of device specific fixes, nothing stands out here except
for the multiplatform fixes for Samsung and the device IDs being added
by Stephen Warren - there's no real code changes from those and they
give better robustness to the enumeration with DT.
parents 17c3ad03 ab5d6fbd

Documentation/devicetree/bindings/sound/fsl,ssi.txt

+12 −9
Original line number Diff line number Diff line
@@ -20,15 +20,6 @@ Required properties: 
                    have.

- interrupt-parent: The phandle for the interrupt controller that

                    services interrupts for this device.

- fsl,mode:         The operating mode for the SSI interface.

                    "i2s-slave" - I2S mode, SSI is clock slave

                    "i2s-master" - I2S mode, SSI is clock master

                    "lj-slave" - left-justified mode, SSI is clock slave

                    "lj-master" - l.j. mode, SSI is clock master

                    "rj-slave" - right-justified mode, SSI is clock slave

                    "rj-master" - r.j., SSI is clock master

                    "ac97-slave" - AC97 mode, SSI is clock slave

                    "ac97-master" - AC97 mode, SSI is clock master

- fsl,playback-dma: Phandle to a node for the DMA channel to use for

                    playback of audio.  This is typically dictated by SOC

                    design.  See the notes below.
@@ -47,6 +38,9 @@ Required properties: 
                    be connected together, and SRFS and STFS be connected

                    together.  This would still allow different sample sizes,

                    but not different sample rates.

 - clocks:          "ipg" - Required clock for the SSI unit

                    "baud" - Required clock for SSI master mode. Otherwise this

		      clock is not used



Required are also ac97 link bindings if ac97 is used. See

Documentation/devicetree/bindings/sound/soc-ac97link.txt for the necessary
@@ -64,6 +58,15 @@ Optional properties: 
		    Documentation/devicetree/bindings/dma/dma.txt.

- dma-names:	    Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq

		    is not defined.

- fsl,mode:         The operating mode for the SSI interface.

                    "i2s-slave" - I2S mode, SSI is clock slave

                    "i2s-master" - I2S mode, SSI is clock master

                    "lj-slave" - left-justified mode, SSI is clock slave

                    "lj-master" - l.j. mode, SSI is clock master

                    "rj-slave" - right-justified mode, SSI is clock slave

                    "rj-master" - r.j., SSI is clock master

                    "ac97-slave" - AC97 mode, SSI is clock slave

                    "ac97-master" - AC97 mode, SSI is clock master



Child 'codec' node required properties:

- compatible:       Compatible list, contains the name of the codec

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -1832,8 +1832,8 @@ F: net/bluetooth/ 
F:	include/net/bluetooth/



BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

M:	Veaceslav Falico <vfalico@redhat.com>

M:	Jay Vosburgh <j.vosburgh@gmail.com>

M:	Veaceslav Falico <vfalico@gmail.com>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/
@@ -2808,9 +2808,9 @@ S: Supported 
F:	drivers/acpi/dock.c



DOCUMENTATION

M:	Rob Landley <rob@landley.net>

M:	Randy Dunlap <rdunlap@infradead.org>

L:	linux-doc@vger.kernel.org

T:	TBD

T:	quilt http://www.infradead.org/~rdunlap/Doc/patches/

S:	Maintained

F:	Documentation/
@@ -6013,6 +6013,7 @@ F: include/uapi/linux/net.h 
F:	include/uapi/linux/netdevice.h

F:	tools/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>

Makefile

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

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/x86/include/asm/pgtable.h

+2 −12
Original line number Diff line number Diff line
@@ -445,20 +445,10 @@ static inline int pte_same(pte_t a, pte_t b) 
	return a.pte == b.pte;

}



static inline int pteval_present(pteval_t pteval)

{

	/*

	 * Yes Linus, _PAGE_PROTNONE == _PAGE_NUMA. Expressing it this

	 * way clearly states that the intent is that protnone and numa

	 * hinting ptes are considered present for the purposes of

	 * pagetable operations like zapping, protection changes, gup etc.

	 */

	return pteval & (_PAGE_PRESENT | _PAGE_PROTNONE | _PAGE_NUMA);

}



static inline int pte_present(pte_t a)

{

	return pteval_present(pte_flags(a));

	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE |

			       _PAGE_NUMA);

}



#define pte_accessible pte_accessible

arch/x86/include/asm/topology.h

+2 −1
Original line number Diff line number Diff line
@@ -119,9 +119,10 @@ static inline void setup_node_to_cpumask_map(void) { } 


extern const struct cpumask *cpu_coregroup_mask(int cpu);



#ifdef ENABLE_TOPO_DEFINES

#define topology_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_id)

#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)



#ifdef ENABLE_TOPO_DEFINES

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))

#define topology_thread_cpumask(cpu)		(per_cpu(cpu_sibling_map, cpu))

#endif