From 116ce4e9cd9d13cdeea2e7c3443a34dcad28dc34 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 14 May 2018 09:56:13 +0200 Subject: dts: update to v4.17-rc4 Signed-off-by: Sascha Hauer --- dts/Bindings/input/atmel,maxtouch.txt | 7 +++++++ dts/include/dt-bindings/clock/stm32mp1-clks.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dts/Bindings/input/atmel,maxtouch.txt b/dts/Bindings/input/atmel,maxtouch.txt index 23e3abc3fd..c88919480d 100644 --- a/dts/Bindings/input/atmel,maxtouch.txt +++ b/dts/Bindings/input/atmel,maxtouch.txt @@ -4,6 +4,13 @@ Required properties: - compatible: atmel,maxtouch + The following compatibles have been used in various products but are + deprecated: + atmel,qt602240_ts + atmel,atmel_mxt_ts + atmel,atmel_mxt_tp + atmel,mXT224 + - reg: The I2C address of the device - interrupts: The sink for the touchpad's IRQ output diff --git a/dts/include/dt-bindings/clock/stm32mp1-clks.h b/dts/include/dt-bindings/clock/stm32mp1-clks.h index 86e3ec662e..90ec780bfc 100644 --- a/dts/include/dt-bindings/clock/stm32mp1-clks.h +++ b/dts/include/dt-bindings/clock/stm32mp1-clks.h @@ -76,7 +76,7 @@ #define I2C6 63 #define USART1 64 #define RTCAPB 65 -#define TZC 66 +#define TZC1 66 #define TZPC 67 #define IWDG1 68 #define BSEC 69 @@ -123,6 +123,7 @@ #define CRC1 110 #define USBH 111 #define ETHSTP 112 +#define TZC2 113 /* Kernel clocks */ #define SDMMC1_K 118 @@ -228,7 +229,6 @@ #define CK_MCO2 212 /* TRACE & DEBUG clocks */ -#define DBG 213 #define CK_DBG 214 #define CK_TRACE 215 -- cgit v1.2.3