Commit e04d368f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull DeviceTree fixes from Rob Herring:

 - update i.MX thermal binding example to use current binding, not the
   deprecated one

 - move arm-charlcd to auxdisplay/

 - fix misspelling of "debounce-interval"

* tag 'devicetree-fixes-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: power: Fix "debounce-interval" property misspelling
  auxdisplay: Move arm-charlcd binding to correct folder
  dt-bindings: thermal: imx: update the binding to new method
parents f3afe530 d40ade43

Documentation/devicetree/bindings/power/wakeup-source.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ Examples 
		#size-cells = <0>;



		button@1 {

			debounce_interval = <50>;

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <116>;

			label = "POWER";

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

+25 −0
Original line number Diff line number Diff line
@@ -22,7 +22,32 @@ Optional properties: 
- clocks : thermal sensor's clock source.



Example:

ocotp: ocotp@21bc000 {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "fsl,imx6sx-ocotp", "syscon";

	reg = <0x021bc000 0x4000>;

	clocks = <&clks IMX6SX_CLK_OCOTP>;



	tempmon_calib: calib@38 {

		reg = <0x38 4>;

	};



	tempmon_temp_grade: temp-grade@20 {

		reg = <0x20 4>;

	};

};



tempmon: tempmon {

	compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";

	interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

	fsl,tempmon = <&anatop>;

	nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;

	nvmem-cell-names = "calib", "temp_grade";

	clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;

};



Legacy method (Deprecated):

tempmon {

	compatible = "fsl,imx6q-tempmon";

	fsl,tempmon = <&anatop>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE