Commit 5498380e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.17-rc6' of... 

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

ASoC: Fixes for v3.17

A few small driver specific fixes and a couple of error handling fixes
in the core.
parents e76bf634 82b925c4

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ Required properties: 


Optional properties for main touchpad device:



- linux,gpio-keymap: An array of up to 4 entries indicating the Linux

    keycode generated by each GPIO. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

Documentation/devicetree/bindings/spi/spi-rockchip.txt

+6 −2
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ Required Properties: 
- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for

			   the peripheral clock.

- #address-cells: should be 1.

- #size-cells: should be 0.



Optional Properties:



- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

		Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.

- #address-cells: should be 1.

- #size-cells: should be 0.





Example:

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -1665,6 +1665,12 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> 
S:	Supported

F:	drivers/tty/serial/atmel_serial.c



ATMEL Audio ALSA driver

M:	Bo Shen <voice.shen@atmel.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel



ATMEL DMA DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6876,7 +6882,7 @@ F: arch/x86/kernel/quirks.c 


PCI DRIVER FOR IMX6

M:	Richard Zhu <r65037@freescale.com>

M:	Shawn Guo <shawn.guo@freescale.com>

M:	Lucas Stach <l.stach@pengutronix.de>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

Makefile

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

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/arm/include/asm/tls.h

+62 −0
Original line number Diff line number Diff line 
#ifndef __ASMARM_TLS_H

#define __ASMARM_TLS_H



#include <linux/compiler.h>

#include <asm/thread_info.h>



#ifdef __ASSEMBLY__

#include <asm/asm-offsets.h>

	.macro switch_tls_none, base, tp, tpuser, tmp1, tmp2
@@ -50,6 +53,47 @@ 
#endif



#ifndef __ASSEMBLY__



static inline void set_tls(unsigned long val)

{

	struct thread_info *thread;



	thread = current_thread_info();



	thread->tp_value[0] = val;



	/*

	 * This code runs with preemption enabled and therefore must

	 * be reentrant with respect to switch_tls.

	 *

	 * We need to ensure ordering between the shadow state and the

	 * hardware state, so that we don't corrupt the hardware state

	 * with a stale shadow state during context switch.

	 *

	 * If we're preempted here, switch_tls will load TPIDRURO from

	 * thread_info upon resuming execution and the following mcr

	 * is merely redundant.

	 */

	barrier();



	if (!tls_emu) {

		if (has_tls_reg) {

			asm("mcr p15, 0, %0, c13, c0, 3"

			    : : "r" (val));

		} else {

			/*

			 * User space must never try to access this

			 * directly.  Expect your app to break

			 * eventually if you do so.  The user helper

			 * at 0xffff0fe0 must be used instead.  (see

			 * entry-armv.S for details)

			 */

			*((unsigned int *)0xffff0ff0) = val;

		}



	}

}



static inline unsigned long get_tpuser(void)

{

	unsigned long reg = 0;
@@ -59,5 +103,23 @@ static inline unsigned long get_tpuser(void) 


	return reg;

}



static inline void set_tpuser(unsigned long val)

{

	/* Since TPIDRURW is fully context-switched (unlike TPIDRURO),

	 * we need not update thread_info.

	 */

	if (has_tls_reg && !tls_emu) {

		asm("mcr p15, 0, %0, c13, c0, 2"

		    : : "r" (val));

	}

}



static inline void flush_tls(void)

{

	set_tls(0);

	set_tpuser(0);

}



#endif

#endif	/* __ASMARM_TLS_H */