From a79f9cda99474d27dc71c02bdc935376ee180355 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2018 09:56:55 +0200 Subject: dts: update to v4.16-rc4 Signed-off-by: Sascha Hauer --- dts/Bindings/auxdisplay/arm-charlcd.txt | 18 ++++++++++++++++ dts/Bindings/eeprom/at24.txt | 2 +- dts/Bindings/interrupt-controller/renesas,irqc.txt | 1 + dts/Bindings/misc/arm-charlcd.txt | 18 ---------------- dts/Bindings/power/wakeup-source.txt | 2 +- dts/Bindings/thermal/imx-thermal.txt | 25 ++++++++++++++++++++++ 6 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 dts/Bindings/auxdisplay/arm-charlcd.txt delete mode 100644 dts/Bindings/misc/arm-charlcd.txt (limited to 'dts/Bindings') diff --git a/dts/Bindings/auxdisplay/arm-charlcd.txt b/dts/Bindings/auxdisplay/arm-charlcd.txt new file mode 100644 index 0000000000..e28e2aac47 --- /dev/null +++ b/dts/Bindings/auxdisplay/arm-charlcd.txt @@ -0,0 +1,18 @@ +ARM Versatile Character LCD +----------------------------------------------------- +This binding defines the character LCD interface found on ARM Versatile AB +and PB reference platforms. + +Required properties: +- compatible : "arm,versatile-clcd" +- reg : Location and size of character LCD registers + +Optional properties: +- interrupts - single interrupt for character LCD. The character LCD can + operate in polled mode without an interrupt. + +Example: + lcd@10008000 { + compatible = "arm,versatile-lcd"; + reg = <0x10008000 0x1000>; + }; diff --git a/dts/Bindings/eeprom/at24.txt b/dts/Bindings/eeprom/at24.txt index 1812c848e3..abfae1beca 100644 --- a/dts/Bindings/eeprom/at24.txt +++ b/dts/Bindings/eeprom/at24.txt @@ -38,9 +38,9 @@ Required properties: "catalyst", "microchip", + "nxp", "ramtron", "renesas", - "nxp", "st", Some vendors use different model names for chips which are just diff --git a/dts/Bindings/interrupt-controller/renesas,irqc.txt b/dts/Bindings/interrupt-controller/renesas,irqc.txt index 33c9a10fdc..20f121daa9 100644 --- a/dts/Bindings/interrupt-controller/renesas,irqc.txt +++ b/dts/Bindings/interrupt-controller/renesas,irqc.txt @@ -14,6 +14,7 @@ Required properties: - "renesas,irqc-r8a7794" (R-Car E2) - "renesas,intc-ex-r8a7795" (R-Car H3) - "renesas,intc-ex-r8a7796" (R-Car M3-W) + - "renesas,intc-ex-r8a77965" (R-Car M3-N) - "renesas,intc-ex-r8a77970" (R-Car V3M) - "renesas,intc-ex-r8a77995" (R-Car D3) - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in diff --git a/dts/Bindings/misc/arm-charlcd.txt b/dts/Bindings/misc/arm-charlcd.txt deleted file mode 100644 index e28e2aac47..0000000000 --- a/dts/Bindings/misc/arm-charlcd.txt +++ /dev/null @@ -1,18 +0,0 @@ -ARM Versatile Character LCD ------------------------------------------------------ -This binding defines the character LCD interface found on ARM Versatile AB -and PB reference platforms. - -Required properties: -- compatible : "arm,versatile-clcd" -- reg : Location and size of character LCD registers - -Optional properties: -- interrupts - single interrupt for character LCD. The character LCD can - operate in polled mode without an interrupt. - -Example: - lcd@10008000 { - compatible = "arm,versatile-lcd"; - reg = <0x10008000 0x1000>; - }; diff --git a/dts/Bindings/power/wakeup-source.txt b/dts/Bindings/power/wakeup-source.txt index 3c81f78b5c..5d254ab13e 100644 --- a/dts/Bindings/power/wakeup-source.txt +++ b/dts/Bindings/power/wakeup-source.txt @@ -60,7 +60,7 @@ Examples #size-cells = <0>; button@1 { - debounce_interval = <50>; + debounce-interval = <50>; wakeup-source; linux,code = <116>; label = "POWER"; diff --git a/dts/Bindings/thermal/imx-thermal.txt b/dts/Bindings/thermal/imx-thermal.txt index 28be51afdb..379eb76307 100644 --- a/dts/Bindings/thermal/imx-thermal.txt +++ b/dts/Bindings/thermal/imx-thermal.txt @@ -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 = ; + 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>; -- cgit v1.2.3