aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-10-04 11:20:12 -0400
committerArnd Bergmann <arnd@arndb.de>2018-10-04 11:20:47 -0400
commit38764692af2ce6e4d1620169d95b2f26149dbe48 (patch)
tree04c0c0701169a0dff9acd926bb92f9b22acda18e
parentb062e5b79cc4b2e45f637b4f98361320e57ff676 (diff)
parentaea4762fb46e048c059ff49565ee33da07c8aeb3 (diff)
Merge tag 'davinci-for-v4.20/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
DaVinci DT updates for v4.20 ---------------------------- - A non-critical fix to reduce errors on A/DC on Lego Mindstorms EV3 - Support for GPIO expander on DA850 EVM * tag 'davinci-for-v4.20/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: da850-lego-ev3: slow down A/DC as much as possible ARM: dts: da850-evm: Enable tca6416 on baseboard Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/boot/dts/da850-evm.dts6
-rw-r--r--arch/arm/boot/dts/da850-lego-ev3.dts3
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index f9b757905845..a3c9b346721d 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -221,6 +221,12 @@
221 gpio-controller; 221 gpio-controller;
222 #gpio-cells = <2>; 222 #gpio-cells = <2>;
223 }; 223 };
224 tca6416_bb: gpio@21 {
225 compatible = "ti,tca6416";
226 reg = <0x21>;
227 gpio-controller;
228 #gpio-cells = <2>;
229 };
224}; 230};
225 231
226&wdt { 232&wdt {
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
index c4729d0e6c19..66fcadf0ba91 100644
--- a/arch/arm/boot/dts/da850-lego-ev3.dts
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
@@ -352,7 +352,8 @@
352 compatible = "ti,ads7957"; 352 compatible = "ti,ads7957";
353 reg = <3>; 353 reg = <3>;
354 #io-channel-cells = <1>; 354 #io-channel-cells = <1>;
355 spi-max-frequency = <10000000>; 355 spi-max-frequency = <1000000>;
356 ti,spi-wdelay = <63>;
356 vref-supply = <&adc_ref>; 357 vref-supply = <&adc_ref>;
357 }; 358 };
358}; 359};