Commit ab96d9d6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/fsl-sai', 'asoc/topic/fsl-ssl',... 

Merge remote-tracking branches 'asoc/topic/fsl-sai', 'asoc/topic/fsl-ssl', 'asoc/topic/hdac' and 'asoc/topic/max9867' into asoc-next
parents 6fee37df 512feb4e 6139b1b1 391005e8 90966391

Documentation/devicetree/bindings/regmap/regmap.txt

+7 −4
Original line number Diff line number Diff line
@@ -5,15 +5,18 @@ Index Device Endianness properties 
---------------------------------------------------

1         BE         'big-endian'

2         LE         'little-endian'

3	  Native     'native-endian'



For one device driver, which will run in different scenarios above

on different SoCs using the devicetree, we need one way to simplify

this.



Required properties:

- {big,little}-endian: these are boolean properties, if absent

  meaning that the CPU and the Device are in the same endianness mode,

  these properties are for register values and all the buffers only.

Optional properties:

- {big,little,native}-endian: these are boolean properties, if absent

  then the implementation will choose a default based on the device

  being controlled.  These properties are for register values and all

  the buffers only.  Native endian means that the CPU and device have

  the same endianness.



Examples:

Scenario 1 : CPU in LE mode & device in LE mode.

Documentation/devicetree/bindings/sound/max9867.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
max9867 codec



This device supports I2C mode only.



Required properties:



- compatible : "maxim,max9867"

- reg : The chip select number on the I2C bus



Example:



&i2c {

	max9867: max9867@0x18 {

		compatible = "maxim,max9867";

		reg = <0x18>;

	};

};

Documentation/devicetree/bindings/sound/max98926.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
max98926 audio CODEC



This device supports I2C.



Required properties:



  - compatible : "maxim,max98926"



  - vmon-slot-no : slot number used to send voltage information

                   or in inteleave mode this will be used as

                   interleave slot.



  - imon-slot-no : slot number used to send current information



  - interleave-mode : When using two MAX98926 in a system it is

                      possible to create ADC data that that will

                      overflow the frame size. Digital Audio Interleave

                      mode provides a means to output VMON and IMON data

                      from two devices on a single DOUT line when running

                      smaller frames sizes such as 32 BCLKS per LRCLK or

                      48 BCLKS per LRCLK.



  - reg : the I2C address of the device for I2C



Example:



codec: max98926@1a {

   compatible = "maxim,max98926";

   vmon-slot-no = <0>;

   imon-slot-no = <2>;

   reg = <0x1a>;

};

arch/mips/boot/dts/brcm/bcm6328.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
		timer: timer@10000040 {

			compatible = "syscon";

			reg = <0x10000040 0x2c>;

			little-endian;

			native-endian;

		};



		reboot {

arch/mips/boot/dts/brcm/bcm6368.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		periph_cntl: syscon@10000000 {

			compatible = "syscon";

			reg = <0x10000000 0x14>;

			little-endian;

			native-endian;

		};



		reboot: syscon-reboot@10000008 {