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

Commit 8ce04367 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.14

parents ed109401 fabf08a0

Documentation/admin-guide/pm/cpufreq.rst

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,14 @@ are the following: 
	This attribute is not present if the scaling driver in use does not

	support it.



``cpuinfo_cur_freq``

	Current frequency of the CPUs belonging to this policy as obtained from

	the hardware (in KHz).



	This is expected to be the frequency the hardware actually runs at.

	If that frequency cannot be determined, this attribute should not

	be present.



``cpuinfo_max_freq``

	Maximum possible operating frequency the CPUs belonging to this policy

	can run at (in kHz).

Documentation/devicetree/bindings/ata/sata_rcar.txt

+11 −3
Original line number Diff line number Diff line 
* Renesas R-Car SATA



Required properties:

- compatible		: should contain one of the following:

- compatible		: should contain one or more of the following:

			  - "renesas,sata-r8a7779" for R-Car H1

			    ("renesas,rcar-sata" is deprecated)

			  - "renesas,sata-r8a7790-es1" for R-Car H2 ES1

			  - "renesas,sata-r8a7790" for R-Car H2 other than ES1

			  - "renesas,sata-r8a7791" for R-Car M2-W

			  - "renesas,sata-r8a7793" for R-Car M2-N

			  - "renesas,sata-r8a7795" for R-Car H3

			  - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device

			  - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device

			  - "renesas,rcar-sata" is deprecated



			  When compatible with the generic version nodes

			  must list the SoC-specific version corresponding

			  to the platform first followed by the generic

			  version.



- reg			: address and length of the SATA registers;

- interrupts		: must consist of one interrupt specifier.

- clocks		: must contain a reference to the functional clock.
@@ -16,7 +24,7 @@ Required properties: 
Example:



sata0: sata@ee300000 {

	compatible = "renesas,sata-r8a7791";

	compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";

	reg = <0 0xee300000 0 0x2000>;

	interrupt-parent = <&gic>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/gpio/gpio-exar.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
Exportable MPIO interface of Exar UART chips



Required properties of the device:

 - exar,first-pin: first exportable pins (0..15)

 - ngpios: number of exportable pins (1..16)

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Optional properties: 
Example for a Mali-T760:



gpu@ffa30000 {

	compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";

	compatible = "rockchip,rk3288-mali", "arm,mali-t760";

	reg = <0xffa30000 0x10000>;

	interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

Documentation/i2c/i2c-topology

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ i2c-arb-gpio-challenge Parent-locked 
i2c-mux-gpio              Normally parent-locked, mux-locked iff

                          all involved gpio pins are controlled by the

                          same i2c root adapter that they mux.

i2c-mux-gpmux             Normally parent-locked, mux-locked iff

                          specified in device-tree.

i2c-mux-ltc4306           Mux-locked

i2c-mux-mlxcpld           Parent-locked

i2c-mux-pca9541           Parent-locked

i2c-mux-pca954x           Parent-locked

i2c-mux-pinctrl           Normally parent-locked, mux-locked iff
@@ -50,9 +54,11 @@ i2c-mux-pinctrl Normally parent-locked, mux-locked iff 
i2c-mux-reg               Parent-locked



In drivers/iio/

gyro/mpu3050              Mux-locked

imu/inv_mpu6050/          Mux-locked



In drivers/media/

dvb-frontends/lgdt3306a   Mux-locked

dvb-frontends/m88ds3103   Parent-locked

dvb-frontends/rtl2830     Parent-locked

dvb-frontends/rtl2832     Mux-locked