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

Commit fbea3a0f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-dt-for-4.10' of... 

Merge tag 'sti-dt-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

STi dts update:

Remove deprecated STiH415/416 DTS files
Add DT part associated to following ASoC patchset:
   http://www.spinics.net/lists/alsa-devel/msg54782.html
Enable hdmi audio card on b2120 board
Clean STi sound card field for STiH407 family socs
Add PROC_STFE as a critical clock for STiH410

* tag 'sti-dt-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti

: (27 commits)
  ARM: dts: stih410-clocks: Add PROC_STFE as a critical clock
  ARM: dts: STiH410-B2260: clean unnecessary hdmi node overlay
  ARM: dts: STiHxxx-b2120: Add support of HDMI audio
  ARM: dts: STiH410: Add label for sti-hdmi node
  ARM: dts: STiH407: Add label for sti-hdmi node
  ARM: dts: STiH407-family: sti sound card field cleaning
  ARM: dts: remove STiH41x-b2020.dtsi
  ARM: dts: remove STiH41x-b2000.dtsi
  ARM: dts: remove STiH41x-b2020.dtsi
  ARM: dts: remove STiH41x.dtsi
  ARM: dts: remove STiH416.dtsi
  ARM: dts: remove STiH415.dtsi
  ARM: dts: remove STiH415-pinctrl.dtsi
  ARM: dts: remove STiH415-clock.dtsi
  ARM: dts: remove STiH415-b2000.dts
  ARM: dts: remove STiH415-b2020.dts
  ARM: dts: remove STiH416-pinctrl.dtsi
  ARM: dts: remove STiH416-clock.dtsi
  ARM: dts: remove STiH416-b2000.dts
  ARM: dts: remove STiH416-b2020.dts
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 07d9a380 97a0b97f

Documentation/devicetree/bindings/ata/ahci-st.txt

+0 −15
Original line number Original line Diff line number Diff line
@@ -18,21 +18,6 @@ Optional properties: 




Example:

Example:





	/* Example for stih416 */

	sata0: sata@fe380000 {

		compatible	= "st,ahci";

		reg		= <0xfe380000 0x1000>;

		interrupts	= <GIC_SPI 157 IRQ_TYPE_NONE>;

		interrupt-names	= "hostc";

		phys		= <&phy_port0 PHY_TYPE_SATA>;

		phy-names	= "ahci_phy";

		resets		= <&powerdown STIH416_SATA0_POWERDOWN>,

				  <&softreset STIH416_SATA0_SOFTRESET>;

		reset-names	= "pwr-dwn", "sw-rst";

		clocks		= <&clk_s_a0_ls CLK_ICN_REG>;

		clock-names	= "ahci_clk";

	};



	/* Example for stih407 family silicon */

	/* Example for stih407 family silicon */

	sata0: sata@9b20000 {

	sata0: sata@9b20000 {

		compatible	= "st,ahci";

		compatible	= "st,ahci";

Documentation/devicetree/bindings/reset/st,sti-powerdown.txt

+5 −7
Original line number Original line Diff line number Diff line
@@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset 
controller binding usage.

controller binding usage.





Required properties:

Required properties:

- compatible: Should be "st,<chip>-powerdown"

- compatible: Should be "st,stih407-powerdown"

	ex: "st,stih415-powerdown", "st,stih416-powerdown"

- #reset-cells: 1, see below

- #reset-cells: 1, see below





example:

example:





	powerdown: powerdown-controller {

	powerdown: powerdown-controller {

		compatible = "st,stih407-powerdown";

		#reset-cells = <1>;

		#reset-cells = <1>;

		compatible = "st,stih415-powerdown";

	};

	};
@@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt 




example:

example:





	usb1: usb@fe200000 {

	st_dwc3: dwc3@8f94000 {

		resets	= <&powerdown STIH41X_USB1_POWERDOWN>;

		resets          = <&powerdown STIH407_USB3_POWERDOWN>,

	};

	};





Macro definitions for the supported reset channels can be found in:

Macro definitions for the supported reset channels can be found in:





include/dt-bindings/reset/stih415-resets.h

include/dt-bindings/reset/stih407-resets.h
 
include/dt-bindings/reset/stih416-resets.h

Documentation/devicetree/bindings/reset/st,sti-softreset.txt

+3 −5
Original line number Original line Diff line number Diff line
@@ -15,15 +15,14 @@ Please refer to reset.txt in this directory for common reset 
controller binding usage.

controller binding usage.





Required properties:

Required properties:

- compatible: Should be "st,<chip>-softreset" example:

- compatible: Should be st,stih407-softreset";

	"st,stih415-softreset" or "st,stih416-softreset";

- #reset-cells: 1, see below

- #reset-cells: 1, see below





example:

example:





	softreset: softreset-controller {

	softreset: softreset-controller {

		#reset-cells = <1>;

		#reset-cells = <1>;

		compatible = "st,stih415-softreset";

		compatible = "st,stih407-softreset";

	};

	};
@@ -42,5 +41,4 @@ example: 




Macro definitions for the supported reset channels can be found in:

Macro definitions for the supported reset channels can be found in:





include/dt-bindings/reset/stih415-resets.h

include/dt-bindings/reset/stih407-resets.h
 
include/dt-bindings/reset/stih416-resets.h

Documentation/devicetree/bindings/thermal/st-thermal.txt

+9 −19
Original line number Original line Diff line number Diff line
@@ -3,17 +3,8 @@ Binding for Thermal Sensor driver for STMicroelectronics STi series of SoCs. 
Required parameters:

Required parameters:

-------------------

-------------------





compatible : 	st,<SoC>-<module>-thermal; should be one of:

compatible : 	Should be "st,stih407-thermal"

		  "st,stih415-sas-thermal",



		  "st,stih415-mpe-thermal",

		  "st,stih416-sas-thermal"

		  "st,stih416-mpe-thermal"

		  "st,stid127-thermal" or

		  "st,stih407-thermal"

		according to the SoC type (stih415, stih416, stid127, stih407)

		and module type (sas or mpe). On stid127 & stih407 there is only

		one die/module, so there is no module type in the compatible

		string.

clock-names : 	Should be "thermal".

clock-names : 	Should be "thermal".

		  See: Documentation/devicetree/bindings/resource-names.txt

		  See: Documentation/devicetree/bindings/resource-names.txt

clocks : 	Phandle of the clock used by the thermal sensor.

clocks : 	Phandle of the clock used by the thermal sensor.
@@ -25,18 +16,17 @@ Optional parameters: 
reg : 		For non-sysconf based sensors, this should be the physical base

reg : 		For non-sysconf based sensors, this should be the physical base

		address and length of the sensor's registers.

		address and length of the sensor's registers.

interrupts :	Standard way to define interrupt number.

interrupts :	Standard way to define interrupt number.

		Interrupt is mandatory to be defined when compatible is

		"stih416-mpe-thermal".

		  NB: For thermal sensor's for which no interrupt has been

		  NB: For thermal sensor's for which no interrupt has been

		  defined, a polling delay of 1000ms will be used to read the

		  defined, a polling delay of 1000ms will be used to read the

		  temperature from device.

		  temperature from device.





Example:

Example:





	temp1@fdfe8000 {

	temp0@91a0000 {

		compatible	= "st,stih416-mpe-thermal";

		compatible = "st,stih407-thermal";

		reg		= <0xfdfe8000 0x10>;

		reg = <0x91a0000 0x28>;

		clock-names = "thermal";

		clock-names = "thermal";

		clocks		= <&clk_m_mpethsens>;

		clocks = <&CLK_SYSIN>;

		interrupts	= <GIC_SPI 23 IRQ_TYPE_NONE>;

		interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;

		st,passive_cooling_temp = <110>;

	};
 
	};

MAINTAINERS

+0 −2
Original line number Original line Diff line number Diff line
@@ -1779,9 +1779,7 @@ F: drivers/media/rc/st_rc.c 
F:	drivers/media/platform/sti/c8sectpfe/

F:	drivers/media/platform/sti/c8sectpfe/

F:	drivers/mmc/host/sdhci-st.c

F:	drivers/mmc/host/sdhci-st.c

F:	drivers/phy/phy-miphy28lp.c

F:	drivers/phy/phy-miphy28lp.c

F:	drivers/phy/phy-miphy365x.c

F:	drivers/phy/phy-stih407-usb.c

F:	drivers/phy/phy-stih407-usb.c

F:	drivers/phy/phy-stih41x-usb.c

F:	drivers/pinctrl/pinctrl-st.c

F:	drivers/pinctrl/pinctrl-st.c

F:	drivers/remoteproc/st_remoteproc.c

F:	drivers/remoteproc/st_remoteproc.c

F:	drivers/reset/sti/

F:	drivers/reset/sti/