Commit a90a6f9c authored Nov 18, 2016 by Olof Johansson

Merge tag 'omap-for-v4.10/dt-signed' of...

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>

parents f3dcae8f 7e2f8c0a

arch/arm/boot/dts/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -571,6 +571,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
		am335x-sl50.dtb \
		am335x-wega-rdk.dtb
		dtb-$(CONFIG_ARCH_OMAP4) += \
		omap4-droid4-xt894.dtb \
		omap4-duovero-parlor.dtb \
		omap4-kc1.dtb \
		omap4-panda.dtb \
		@@ -600,7 +601,8 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
		am572x-idk.dtb \
		dra7-evm.dtb \
		dra72-evm.dtb \
		dra72-evm-revc.dtb
		dra72-evm-revc.dtb \
		dra71-evm.dtb
		dtb-$(CONFIG_ARCH_ORION5X) += \
		orion5x-kuroboxpro.dtb \
		orion5x-lacie-d2-network.dtb \

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@

		&usb1 {
		status = "okay";
		dr_mode = "otg";
		dr_mode = "host";
		};

		&cpsw_emac0 {

arch/arm/boot/dts/am335x-baltos.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -406,3 +406,7 @@
		&gpio0 {
		ti,no-reset-on-init;
		};

		&gpio3 {
		ti,no-reset-on-init;
		};

arch/arm/boot/dts/am335x-bone-common.dtsi

+22 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		* published by the Free Software Foundation.
		*/

		#include <dt-bindings/mfd/tps65217.h>

		/ {
		cpus {
		cpu@0 {
		@@ -310,8 +312,23 @@
		* by the hardware problems. (Tip: double-check by performing a current
		* measurement after shutdown: it should be less than 1 mA.)
		*/

		interrupts = <7>; /* NMI */
		interrupt-parent = <&intc>;

		ti,pmic-shutdown-controller;

		charger {
		interrupts = <TPS65217_IRQ_AC>, <TPS65217_IRQ_USB>;
		interrupts-names = "AC", "USB";
		status = "okay";
		};

		pwrbutton {
		interrupts = <TPS65217_IRQ_PB>;
		status = "okay";
		};

		regulators {
		dcdc1_reg: regulator@0 {
		regulator-name = "vdds_dpr";
		@@ -393,3 +410,8 @@
		&sham {
		status = "okay";
		};

		&rtc {
		clocks = <&clk_32768_ck>, <&clkdiv32k_ick>;
		clock-names = "ext-clk", "int-clk";
		};

arch/arm/boot/dts/am335x-evm.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -783,3 +783,8 @@
		pinctrl-names = "default";
		pinctrl-0 = <&dcan1_pins_default>;
		};

		&rtc {
		clocks = <&clk_32768_ck>, <&clkdiv32k_ick>;
		clock-names = "ext-clk", "int-clk";
		};