diff options
author | Maxime Ripard <maxime@cerno.tech> | 2022-04-05 11:37:03 +0200 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2022-04-05 11:37:03 +0200 |
commit | cf5c5763eb531ff5120111ad300126e926fb5a56 (patch) | |
tree | 41e3d49ad46f08fd6025264451390c7dc204303a /Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml | |
parent | 8047f98c8958d0f0c29882298ec293ff09ffea92 (diff) | |
parent | 3123109284176b1532874591f7c81f3837bbdc17 (diff) | |
download | lwn-cf5c5763eb531ff5120111ad300126e926fb5a56.tar.gz lwn-cf5c5763eb531ff5120111ad300126e926fb5a56.zip |
Merge drm/drm-fixes into drm-misc-fixes
Let's start the 5.18 fixes cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml index fb603a20e396..4ca8a31359a5 100644 --- a/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml @@ -29,12 +29,6 @@ properties: clocks: maxItems: 1 - assigned-clocks: - maxItems: 1 - - assigned-clocks-parents: - maxItems: 1 - timeout-sec: true required: @@ -56,7 +50,7 @@ examples: interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pcc2 IMX7ULP_CLK_WDG1>; assigned-clocks = <&pcc2 IMX7ULP_CLK_WDG1>; - assigned-clocks-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>; + assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>; timeout-sec = <40>; }; |