summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/am33xx.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-18 16:43:19 -0800
committerOlof Johansson <olof@lixom.net>2016-11-18 16:43:19 -0800
commita90a6f9c3dd6055d01d2cd770e68b9abe4c6d9ea (patch)
tree1f944eeda54ec383b0550ea3b7ed041557c65661 /arch/arm/boot/dts/am33xx.dtsi
parentf3dcae8f4d36c9865ef7420e846b77e425042dc0 (diff)
parent7e2f8c0ae670327cbe0348ad2f3df7d9a55a8e5d (diff)
Merge tag 'omap-for-v4.10/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Device tree changes for omaps for v4.10 merge window: - A series of patches to configure tps65217 PMIC interrupts for power button, charger and usb and use them on am335x - Configure EEPROM, LEDs and USR1 button for omap5 boards - Add tscadc DMA properites for am33xx and am4372 - Configure baltos-ir5221 both musb channels to host mode - Configure internal and external RTC clocks for am335x boards - Don't reset gpio3 block on baltos - Remove pinmux for dra72-evm for erratum i869, fix the regulators and seprate out tps65917 support - Add dra718-evm support - Add minimal droid 4 xt894 support * tag 'omap-for-v4.10/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (22 commits) ARM: dts: Add minimal support for motorola droid 4 xt894 ARM: dts: Add support for dra718-evm ARM: dts: dra72: Add separate dtsi for tps65917 ARM: dts: dra72-evm: Fix modelling of regulators ARM: dts: dra72-evm: Remove pinmux configurations for erratum i869 ARM: dts: am335x-baltos: don't reset gpio3 block ARM: dts: AM335X-evmsk: Add the internal and external clock nodes for rtc ARM: dts: AM335X-evm: Add the internal and external clock nodes for rtc ARM: dts: AM335X-bone-common: Add the internal and external clock nodes for rtc ARM: dts: am335x-baltos-ir5221: use both musb channels in host mode ARM: dts: am4372: add DMA properties for tscadc ARM: dts: am33xx: add DMA properties for tscadc ARM: dts: omap5 uevm: add USR1 button ARM: dts: omap5 uevm: add LEDs ARM: dts: omap5 uevm: add EEPROM ARM: dts: am335x: Add the power button interrupt ARM: dts: am335x: Add the charger interrupt dt-bindings: mfd: Provide human readable defines for TPS65217 interrupts ARM: dts: am335x: Support the PMIC interrupt ARM: dts: tps65217: Add the power button device ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/am33xx.dtsi')
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 3a3fde1f84c7..64c8aa9057a3 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -507,6 +507,8 @@
interrupts = <75
76>;
ti,hwmods = "rtc";
+ clocks = <&clkdiv32k_ick>;
+ clock-names = "int-clk";
};
spi0: spi@48030000 {
@@ -857,6 +859,8 @@
interrupts = <16>;
ti,hwmods = "adc_tsc";
status = "disabled";
+ dmas = <&edma 53 0>, <&edma 57 0>;
+ dma-names = "fifo0", "fifo1";
tsc {
compatible = "ti,am3359-tsc";