From a9c5f6b9ec883ee9dafd6d393600acc6fd263043 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 27 Feb 2018 09:40:19 +0100 Subject: dts: update to v4.16-rc1 Also includeded: ARM: dts: am33xx: do not delete no longer existing clocks Several clocks are removed from the am33xx dts files with v4.16-rc1. Remove the corresponding /delete-node/ directives aswell to avoid dtc breakage. Also included: ARM: dts: imx6qdl: SolidRun: Fix upstream include Upstream dts file way renamed, so change include name accordingly. Signed-off-by: Sascha Hauer --- dts/Bindings/reset/amlogic,meson-reset.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dts/Bindings/reset') diff --git a/dts/Bindings/reset/amlogic,meson-reset.txt b/dts/Bindings/reset/amlogic,meson-reset.txt index e746b63179..28ef6c295c 100644 --- a/dts/Bindings/reset/amlogic,meson-reset.txt +++ b/dts/Bindings/reset/amlogic,meson-reset.txt @@ -5,7 +5,8 @@ Please also refer to reset.txt in this directory for common reset controller binding usage. Required properties: -- compatible: Should be "amlogic,meson8b-reset" or "amlogic,meson-gxbb-reset" +- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset" or + "amlogic,meson-axg-reset". - reg: should contain the register address base - #reset-cells: 1, see below -- cgit v1.2.3