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

Commit 2002e904 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/ics43432' of... 

Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-gtm601
parents 02a9547e 3b7ce997

Documentation/arm/sunxi/README

+17 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf



      - Allwinner A23

      - Allwinner A23 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

        + User Manual
@@ -55,7 +55,23 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf



      - Allwinner A33 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf

        + User Manual

          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf



      - Allwinner H3 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

        + Datasheet

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf



    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ using one of the following compatible strings: 
  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-h3

  allwinner,sun9i-a80

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it. 
Required properties:

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>

  is the IP revision of the specific EMIF instance.

		  For am437x should be ti,emif-am4372.



- phy-type	: <u32> indicating the DDR phy type. Following are the

  allowed values

Documentation/devicetree/bindings/sound/ics43432.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Invensense ICS-43432 MEMS microphone with I2S output.



There are no software configuration options for this device, indeed, the only

host connection is the I2S interface. Apart from requirements on clock

frequency (460 kHz to 3.379 MHz according to the data sheet) there must be

64 clock cycles in each stereo output frame; 24 of the 32 available bits

contain audio data. A hardware pin determines if the device outputs data

on the left or right channel of the I2S frame.



Required properties:

  - compatible : Must be "invensense,ics43432"



Example:



	ics43432: ics43432 {

		compatible = "invensense,ics43432";

	};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ ingenic Ingenic Semiconductor 
innolux	Innolux Corporation

intel	Intel Corporation

intercontrol	Inter Control Group

invensense	InvenSense Inc.

isee	ISEE 2007 S.L.

isil	Intersil

karo	Ka-Ro electronics GmbH