From 3279ae4ddcef811273f74f58f0214c4575fa9703 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 6 Jun 2017 08:07:37 +0200 Subject: dts: update to v4.12-rc3 Signed-off-by: Sascha Hauer --- dts/Bindings/input/touchscreen/edt-ft5x06.txt | 2 +- dts/Bindings/mfd/hisilicon,hi655x.txt | 6 ++++++ dts/Bindings/mmc/mmc-pwrseq-simple.txt | 2 ++ dts/Bindings/net/fsl-fec.txt | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'dts/Bindings') diff --git a/dts/Bindings/input/touchscreen/edt-ft5x06.txt b/dts/Bindings/input/touchscreen/edt-ft5x06.txt index 6db22103e2..025cf8c932 100644 --- a/dts/Bindings/input/touchscreen/edt-ft5x06.txt +++ b/dts/Bindings/input/touchscreen/edt-ft5x06.txt @@ -36,7 +36,7 @@ Optional properties: control gpios - threshold: allows setting the "click"-threshold in the range - from 20 to 80. + from 0 to 80. - gain: allows setting the sensitivity in the range from 0 to 31. Note that lower values indicate higher diff --git a/dts/Bindings/mfd/hisilicon,hi655x.txt b/dts/Bindings/mfd/hisilicon,hi655x.txt index 05485699d7..9630ac0e4b 100644 --- a/dts/Bindings/mfd/hisilicon,hi655x.txt +++ b/dts/Bindings/mfd/hisilicon,hi655x.txt @@ -16,6 +16,11 @@ Required properties: - reg: Base address of PMIC on Hi6220 SoC. - interrupt-controller: Hi655x has internal IRQs (has own IRQ domain). - pmic-gpios: The GPIO used by PMIC IRQ. +- #clock-cells: From common clock binding; shall be set to 0 + +Optional properties: +- clock-output-names: From common clock binding to override the + default output clock name Example: pmic: pmic@f8000000 { @@ -24,4 +29,5 @@ Example: interrupt-controller; #interrupt-cells = <2>; pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + #clock-cells = <0>; } diff --git a/dts/Bindings/mmc/mmc-pwrseq-simple.txt b/dts/Bindings/mmc/mmc-pwrseq-simple.txt index e254368618..9029b45b8a 100644 --- a/dts/Bindings/mmc/mmc-pwrseq-simple.txt +++ b/dts/Bindings/mmc/mmc-pwrseq-simple.txt @@ -18,6 +18,8 @@ Optional properties: "ext_clock" (External clock provided to the card). - post-power-on-delay-ms : Delay in ms after powering the card and de-asserting the reset-gpios (if any) +- power-off-delay-us : Delay in us after asserting the reset-gpios (if any) + during power off of the card. Example: diff --git a/dts/Bindings/net/fsl-fec.txt b/dts/Bindings/net/fsl-fec.txt index a1e3693cca..6f55bdd52f 100644 --- a/dts/Bindings/net/fsl-fec.txt +++ b/dts/Bindings/net/fsl-fec.txt @@ -15,6 +15,10 @@ Optional properties: - phy-reset-active-high : If present then the reset sequence using the GPIO specified in the "phy-reset-gpios" property is reversed (H=reset state, L=operation state). +- phy-reset-post-delay : Post reset delay in milliseconds. If present then + a delay of phy-reset-post-delay milliseconds will be observed after the + phy-reset-gpios has been toggled. Can be omitted thus no delay is + observed. Delay is in range of 1ms to 1000ms. Other delays are invalid. - phy-supply : regulator that powers the Ethernet PHY. - phy-handle : phandle to the PHY device connected to this device. - fixed-link : Assume a fixed link. See fixed-link.txt in the same directory. -- cgit v1.2.3