diff options
Diffstat (limited to 'dts/Bindings')
| -rw-r--r-- | dts/Bindings/auxdisplay/arm-charlcd.txt (renamed from dts/Bindings/misc/arm-charlcd.txt) | 0 | ||||
| -rw-r--r-- | dts/Bindings/eeprom/at24.txt | 2 | ||||
| -rw-r--r-- | dts/Bindings/interrupt-controller/renesas,irqc.txt | 1 | ||||
| -rw-r--r-- | dts/Bindings/power/wakeup-source.txt | 2 | ||||
| -rw-r--r-- | dts/Bindings/thermal/imx-thermal.txt | 25 |
5 files changed, 28 insertions, 2 deletions
diff --git a/dts/Bindings/misc/arm-charlcd.txt b/dts/Bindings/auxdisplay/arm-charlcd.txt index e28e2aac47..e28e2aac47 100644 --- a/dts/Bindings/misc/arm-charlcd.txt +++ b/dts/Bindings/auxdisplay/arm-charlcd.txt 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/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 = <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>; |