Commit 696cda5b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel',... 

Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/cirrus', 'asoc/topic/cs4271', 'asoc/topic/cs42l51', 'asoc/topic/cs42l52', 'asoc/topic/cs42l73' and 'asoc/topic/da7210' into asoc-next
parents 950c6672 d0800342 b0ffe9b1 17cb37aa 9c369c6e 423f0c4a 4682a0a2 52a5b545 e34042d8

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ atmel,24c02 i2c serial eeprom (24cxx) 
atmel,at97sc3204t	i2c trusted platform module (TPM)

capella,cm32181		CM32181: Ambient Light Sensor

catalyst,24c32		i2c serial eeprom

cirrus,cs42l51		Cirrus Logic CS42L51 audio codec

dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock

dallas,ds1338		I2C RTC with 56-Byte NV RAM

dallas,ds1339		I2C Serial Real-Time Clock

Documentation/devicetree/bindings/misc/atmel-ssc.txt

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ Required properties for devices compatible with "atmel,at91sam9g45-ssc": 
  See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.

- dma-names: Must be "tx", "rx".



Optional properties:

  - atmel,clk-from-rk-pin: bool property.

     - When SSC works in slave mode, according to the hardware design, the

       clock can get from TK pin, and also can get from RK pin. So, add

       this parameter to choose where the clock from.

     - By default the clock is from TK pin, if the clock from RK pin, this

       property is needed.



Examples:

- PDC transfer:

ssc0: ssc@fffbc000 {

drivers/misc/atmel-ssc.c

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ static int ssc_probe(struct platform_device *pdev) 
		return -ENODEV;

	ssc->pdata = (struct atmel_ssc_platform_data *)plat_dat;



	if (pdev->dev.of_node) {

		struct device_node *np = pdev->dev.of_node;

		ssc->clk_from_rk_pin =

			of_property_read_bool(np, "atmel,clk-from-rk-pin");

	}



	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ssc->regs = devm_ioremap_resource(&pdev->dev, regs);

	if (IS_ERR(ssc->regs))

include/linux/atmel-ssc.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ struct ssc_device { 
	struct clk		*clk;

	int			user;

	int			irq;

	bool			clk_from_rk_pin;

};



struct ssc_device * __must_check ssc_request(unsigned int ssc_num);

include/linux/mfd/arizona/registers.h

+3 −3
Original line number Diff line number Diff line
@@ -1702,9 +1702,9 @@ 
/*

 * R373 (0x175) - FLL1 Control 5

 */

#define ARIZONA_FLL1_FRATIO_MASK                 0x0700  /* FLL1_FRATIO - [10:8] */

#define ARIZONA_FLL1_FRATIO_SHIFT                     8  /* FLL1_FRATIO - [10:8] */

#define ARIZONA_FLL1_FRATIO_WIDTH                     3  /* FLL1_FRATIO - [10:8] */

#define ARIZONA_FLL1_FRATIO_MASK                 0x0F00  /* FLL1_FRATIO - [11:8] */

#define ARIZONA_FLL1_FRATIO_SHIFT                     8  /* FLL1_FRATIO - [11:8] */

#define ARIZONA_FLL1_FRATIO_WIDTH                     4  /* FLL1_FRATIO - [11:8] */

#define ARIZONA_FLL1_OUTDIV_MASK                 0x000E  /* FLL1_OUTDIV - [3:1] */

#define ARIZONA_FLL1_OUTDIV_SHIFT                     1  /* FLL1_OUTDIV - [3:1] */

#define ARIZONA_FLL1_OUTDIV_WIDTH                     3  /* FLL1_OUTDIV - [3:1] */