From: Olof Johansson <olof@lixom.net>
Date: Sat, 14 Jul 2018 21:16:58 +0000 (-0700)
Subject: Merge tag 'davinci-for-v4.19/dt' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7b6be6435727021b245779205ac63a051023394;p=linux.git

Merge tag 'davinci-for-v4.19/dt' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/dt

DaVinci Device-Tree updates for v4.19
-------------------------------------

* DA850 now uses clocks from device-tree
* DA850 EVM gains LCD (with backlight) and SATA support
* Lego Mindstorms gains bluetooth support
* DSP reset control support on DA850

* tag 'davinci-for-v4.19/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: Add power-domains to CPPI 4.1 node
  ARM: davinci: dts: add a reset control to the dsp node
  ARM: davinci: dts: make psc0 a reset provider
  ARM: dts: da850-lego-ev3: Add Bluetooth nodes
  ARM: dts: da850: Add power-domains to PWM nodes
  ARM: dts: da850: Add clocks
  dt-bindings: timer: new bindings for TI DaVinci timer
  ARM: dts: da850-evm: Enable LCD and backlight
  ARM: dts: da850-evm: Enable SATA port

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b7b6be6435727021b245779205ac63a051023394
diff --cc arch/arm/boot/dts/da850.dtsi
index 0f4f817a9e229,ab976aa91fae7..47aa53ba6b922
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@@ -549,9 -705,15 +705,11 @@@
  			gpio-controller;
  			#gpio-cells = <2>;
  			reg = <0x226000 0x1000>;
 -			interrupts = <42 IRQ_TYPE_EDGE_BOTH
 -				43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
 -				45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
 -				47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
 -				49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
 +			interrupts = <42 43 44 45 46 47 48 49 50>;
  			ti,ngpio = <144>;
  			ti,davinci-gpio-unbanked = <0>;
+ 			clocks = <&psc1 3>;
+ 			clock-names = "gpio";
  			status = "disabled";
  			interrupt-controller;
  			#interrupt-cells = <2>;