Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.y' into imx_3.10.y_android

Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/boot/dts/imx6sx.dtsi
	arch/arm/mach-imx/clk-imx6sx.c
	arch/arm/mach-imx/mach-imx6sx.c
	drivers/dma/pxp/pxp_dma_v2.c
	drivers/media/platform/mxc/capture/csi_v4l2_capture.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
	drivers/pwm/pwm-imx.c
	include/dt-bindings/clock/imx6sx-clock.h

8 files changed, 139 insertions, 62 deletions

diff --git a/Documentation/devicetree/bindings/arm/imx/gpc.txt b/Documentation/devicetree/bindings/arm/imx/gpc.txt
index 5a363a85822c..dd6a4be066ac 100644
--- a/Documentation/devicetree/bindings/arm/imx/gpc.txt
+++ b/Documentation/devicetree/bindings/arm/imx/gpc.txt
@@ -9,9 +9,15 @@ Optional properties:
 These properties are for adjusting the GPC PGC CPU power up/down setting, if there is no such property in dts, then default
 value in GPC PGC registers will be used.
 
+- fsl,mf-mix-wakeup-irq: for recording those wakeup sources' irq number in fast/mega mix domain, same as GPC_IMRx register layout.
+If the bitmap in this properties is 1, then fast/mega mix's power can NOT be gated if it is set as wakeup source in kernel.
 
 Example:
 
+	gpc: gpc@020dc000 {
+		fsl,mf-mix-wakeup-irq = <0x4000000 0x3d00 0x0 0x0>;
+	};
+
 	&gpc {
 		fsl,cpu_pupscr_sw2iso = <0xf>;
 		fsl,cpu_pupscr_sw = <0xf>;
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index 4f493bf9e961..622e5ac90d28 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -128,7 +128,7 @@ clocks and IDs.
 	ecspi4			115
 	ecspi5			116
 	enet			117
-	esai			118
+	esai_extal		118
 	gpt_ipg			119
 	gpt_ipg_per		120
 	gpu2d_core		121
@@ -238,6 +238,8 @@ clocks and IDs.
 	spdif1                  225
 	asrc_ipg                226
 	asrc_mem                227
+	esai_ipg		228
+	esai_mem		229
 
 Examples:
 
diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
index 72a06c0ab1db..1486497a24c1 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
@@ -4,16 +4,33 @@ Specifying interrupt information for devices
 1) Interrupt client nodes
 -------------------------
 
-Nodes that describe devices which generate interrupts must contain an
-"interrupts" property. This property must contain a list of interrupt
-specifiers, one per output interrupt. The format of the interrupt specifier is
-determined by the interrupt controller to which the interrupts are routed; see
-section 2 below for details.
+Nodes that describe devices which generate interrupts must contain an either an
+"interrupts" property or an "interrupts-extended" property. These properties
+contain a list of interrupt specifiers, one per output interrupt. The format of
+the interrupt specifier is determined by the interrupt controller to which the
+interrupts are routed; see section 2 below for details.
+
+  Example:
+	interrupt-parent = <&intc1>;
+	interrupts = <5 0>, <6 0>;
 
 The "interrupt-parent" property is used to specify the controller to which
 interrupts are routed and contains a single phandle referring to the interrupt
 controller node. This property is inherited, so it may be specified in an
-interrupt client node or in any of its parent nodes.
+interrupt client node or in any of its parent nodes. Interrupts listed in the
+"interrupts" property are always in reference to the node's interrupt parent.
+
+The "interrupts-extended" property is a special form for use when a node needs
+to reference multiple interrupt parents. Each entry in this property contains
+both the parent phandle and the interrupt specifier. "interrupts-extended"
+should only be used when a device has multiple interrupt parents.
+
+  Example:
+	interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;
+
+A device node may contain either "interrupts" or "interrupts-extended", but not
+both. If both properties are present, then the operating system should log an
+error and use only the data in "interrupts".
 
 2) Interrupt controller nodes
 -----------------------------
diff --git a/Documentation/devicetree/bindings/net/can/m_can.txt b/Documentation/devicetree/bindings/net/can/m_can.txt
new file mode 100644
index 000000000000..2b22d027e6b6
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/can/m_can.txt
@@ -0,0 +1,29 @@
+Bosch MCAN controller Device Tree Bindings
+-------------------------------------------------
+
+Required properties:
+- compatible		: Should be "bosch,m_can" for M_CAN controllers
+- reg			: physical base address and size of the M_CAN
+			  registers map and message ram
+- interrupts		: property with a value describing the interrupt
+			  number
+- clocks		: clocks used by controller
+- mram-cfg		: message ram configuration data, the format is
+  <offset sidf_elems xidf_elems rxf1_elems rxb_elems txe_elems txb_elems>
+  The 'offset' is the address offset inside the message ram. This is usually set
+  if you're using the shared message ram while the other part is used by another
+  m_can controller.
+  The left cell are all the number of each elements inside the message ram.
+  Please refer to 2.4.1 Message RAM Con.guration in Bosch M_CAN user mannual
+  for each elements definition.
+
+Example:
+canfd1: canfd@020e8000 {
+	compatible = "bosch,m_can";
+	reg = <0x020e8000 0x4000>, <0x02298000 0x4000>;
+	reg-names = "canfd", "message_ram";
+	interrupts = <0 114 0x04>;
+	clocks = <&clks IMX6SX_CLK_CANFD>;
+	mram-cfg = <0x0 0 0 32 32 32 0 1>;
+	status = "disabled";
+};
diff --git a/Documentation/devicetree/bindings/sound/cs42888.txt b/Documentation/devicetree/bindings/sound/cs42888.txt
deleted file mode 100644
index e669ef3972ca..000000000000
--- a/Documentation/devicetree/bindings/sound/cs42888.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CS42888 audio CODEC
-
-This device supports I2C only.
-
-Required properties:
-
-  - compatible: "cirrus,cs42888"
-  - reg: the I2C address of the device.
-  - clocks: Phandle to the clock node.
-  - clock-names: Contains name for each entry in clocks.
-		"codec_osc" : the external oscillator.
-		"esai" : the hckt clock from esai.
-  - <name>-supply: Phandle to the regulator <name>.
-
-Note: cs42888 needs a regulators node and a clocks node.
-
-Example:
-In this case, the clock is external oscillator.
-
-codec: cs42888@48 {
-	compatible = "cirrus,cs42888";
-	reg = <0x048>;
-	clocks = <&codec_osc 0>;
-	clock-names = "codec_osc";
-	VA-supply = <&reg_audio>;
-	VD-supply = <&reg_audio>;
-	VLS-supply = <&reg_audio>;
-	VLC-supply = <&reg_audio>;
-};
diff --git a/Documentation/devicetree/bindings/sound/cs42xx8.txt b/Documentation/devicetree/bindings/sound/cs42xx8.txt
new file mode 100644
index 000000000000..f631fbca6284
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42xx8.txt
@@ -0,0 +1,28 @@
+CS42448/CS42888 audio CODEC
+
+Required properties:
+
+  - compatible : must contain one of "cirrus,cs42448" and "cirrus,cs42888"
+
+  - reg : the I2C address of the device for I2C
+
+  - clocks : a list of phandles + clock-specifiers, one for each entry in
+    clock-names
+
+  - clock-names : must contain "mclk"
+
+  - VA-supply, VD-supply, VLS-supply, VLC-supply: power supplies for the device,
+    as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+Example:
+
+codec: cs42888@48 {
+	compatible = "cirrus,cs42888";
+	reg = <0x48>;
+	clocks = <&codec_mclk 0>;
+	clock-names = "mclk";
+	VA-supply = <&reg_audio>;
+	VD-supply = <&reg_audio>;
+	VLS-supply = <&reg_audio>;
+	VLC-supply = <&reg_audio>;
+};
diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.txt b/Documentation/devicetree/bindings/sound/fsl,esai.txt
new file mode 100644
index 000000000000..d7b99fa637b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt
@@ -0,0 +1,50 @@
+Freescale Enhanced Serial Audio Interface (ESAI) Controller
+
+The Enhanced Serial Audio Interface (ESAI) provides a full-duplex serial port
+for serial communication with a variety of serial devices, including industry
+standard codecs, Sony/Phillips Digital Interface (S/PDIF) transceivers, and
+other DSPs. It has up to six transmitters and four receivers.
+
+Required properties:
+
+  - compatible : Compatible list, must contain "fsl,imx35-esai".
+
+  - reg : Offset and length of the register set for the device.
+
+  - interrupts : Contains the spdif interrupt.
+
+  - dmas : Generic dma devicetree binding as described in
+  Documentation/devicetree/bindings/dma/dma.txt.
+
+  - dma-names : Two dmas have to be defined, "tx" and "rx".
+
+  - clocks: Contains an entry for each entry in clock-names.
+
+  - clock-names : Includes the following entries:
+	"core"		The core clock used to access registers
+	"extal"		The esai baud clock for esai controller used to derive
+			HCK, SCK and FS.
+	"fsys"		The system clock derived from ahb clock used to derive
+			HCK, SCK and FS.
+
+  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.
+    This number is the maximum allowed value for TFCR[TFWM] or RFCR[RFWM].
+
+  - fsl,esai-synchronous: This is a boolean property. If present, indicating
+    that ESAI would work in the synchronous mode, which means all the settings
+    for Receiving would be duplicated from Transmition related registers.
+
+Example:
+
+esai: esai@02024000 {
+	compatible = "fsl,imx35-esai";
+	reg = <0x02024000 0x4000>;
+	interrupts = <0 51 0x04>;
+	clocks = <&clks 208>, <&clks 118>, <&clks 208>;
+	clock-names = "core", "extal", "fsys";
+	dmas = <&sdma 23 21 0>, <&sdma 24 21 0>;
+	dma-names = "rx", "tx";
+	fsl,fifo-depth = <128>;
+	fsl,esai-synchronous;
+	status = "disabled";
+};
diff --git a/Documentation/devicetree/bindings/sound/fsl-easi.txt b/Documentation/devicetree/bindings/sound/fsl-easi.txt
deleted file mode 100644
index b6196622accd..000000000000
--- a/Documentation/devicetree/bindings/sound/fsl-easi.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-* Freescale Enhanced Serial Audio Interface (ESAI)
-
-Required properties:
-  - compatible: Should be "fsl,<chip>-esai".
-  - reg: Offset and length of the register set for the device.
-  - interrupts: Contains ESAI interrupt.
-  - clocks: Contains an entry for each entry in clock-names.
-  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.
-                    This number is the maximum allowed value for TFCR[TFWM].
-  - fsl,esai-dma-events: The dma event of the esai, <a b>, a is the tx dma.
-			 b is the rx dma.
-  - fsl,flags: <1> is for ESAI network mode, <2> is for ESAI SYNC mode.
-	       <3> is for network and SYNC mode.
-
-Example:
-
-esai: esai@02024000 {
-	compatible = "fsl,imx6q-esai";
-	reg = <0x02024000 0x4000>;
-	interrupts = <0 51 0x04>;
-	clocks = <&clks 118>;
-	fsl,fifo-depth = <128>;
-	fsl,esai-dma-events = <24 23>;
-	fsl,flags = <1>;
-	status = "disabled";
-};