Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 146d8cd9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'omap-for-v4.14/dt-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Device tree changes for omaps for v4.14 merge window" from Tony Lindgren:

- A series of changes for dra7 and am572 to use generic
  MMC vqmmc regulator

- Clean-up tps65217 internal interrupts to define them
  only in tps65217.dtsi

- Add dra7 iodelay pinctrl driver configuration

- Add buzzer support for am437x-gp-evm

- Disable HDMI CEC internal pull-ups as it seems that
  all boards have an external pull for these

- Remove unnecessary interrupt-parent for omap3

- Configure droid 4 vaudio regulator initial mode and
  add vibrator

- Enable NAND dma prefetch for am335x-evm, am437x and dra7

- Add pcie1 dt node for EP mode for am57x and dra7

- Add support for new dra76x SoCs and dra76x-evm

* tag 'omap-for-v4.14/dt-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
  ARM: dts: nokia n900: update dts with camera support
  ARM: dts: Add support for dra76-evm
  ARM: dts: Add support for dra76x family of devices
  ARM: dts: DRA7: Add pcie1 dt node for EP mode
  ARM: dts: am335x: add support for Moxa UC-8100-ME-T open platform
  ARM: dts: dra7xx: Enable NAND dma prefetch by default
  ARM: dts: am437xx: Enable NAND dma prefetch by default
  ARM: dts: am335x-evm: Enable NAND dma prefetch by default
  ARM: dts: omap4-droid4: Add vibrator
  ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio
  ARM: dts: omap3: Remove needless interrupt-parent property
  ARM: dts: Disable HDMI CEC internal pull-ups
  ARM: dts: am437x-gp-evm: Add support for buzzer
  ARM: dts: Add dra7 iodelay configuration
  ARM: dts: tps65217: Add power button interrupt to the common tps65217.dtsi file
  ARM: dts: tps65217: Add charger interrupts to the common tps65217.dtsi file
  ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
  ARM: dts: am572x-idk: Fix GPIO polarity for MMC1 card detect
  ARM: dts: am571x-idk: Fix GPIO polarity for MMC1 card detect
  ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
  ...
parents cf828ecc d510d12f

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ Boards: 
- AM335X phyCORE-AM335x: Development kit

  compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"



- AM335X UC-8100-ME-T: Communication-centric industrial computing platform

  compatible = "moxa,uc-8100-me-t", "ti,am33xx";



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"
@@ -184,6 +187,9 @@ Boards: 
- AM5718 IDK

  compatible = "ti,am5718-idk", "ti,am5718", "ti,dra7"



- DRA762 EVM:  Software Development Board for DRA762

  compatible = "ti,dra76-evm", "ti,dra762", "ti,dra7"



- DRA742 EVM:  Software Development Board for DRA742

  compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-evmsk.dtb \

	am335x-icev2.dtb \

	am335x-lxm.dtb \

	am335x-moxa-uc-8100-me-t.dtb \

	am335x-nano.dtb \

	am335x-pepper.dtb \

	am335x-phycore-rdk.dtb \
@@ -658,7 +659,8 @@ dtb-$(CONFIG_SOC_DRA7XX) += \ 
	dra7-evm.dtb \

	dra72-evm.dtb \

	dra72-evm-revc.dtb \

	dra71-evm.dtb

	dra71-evm.dtb \

	dra76-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += \

	orion5x-kuroboxpro.dtb \

	orion5x-lacie-d2-network.dtb \

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

+0 −3
Original line number Diff line number Diff line
@@ -319,13 +319,10 @@ 
	ti,pmic-shutdown-controller;



	charger {

		interrupts = <0>, <1>;

		interrupt-names = "USB", "AC";

		status = "okay";

	};



	pwrbutton {

		interrupts = <2>;

		status = "okay";

	};

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

+0 −3
Original line number Diff line number Diff line
@@ -191,13 +191,10 @@ 
	interrupts = <7>; /* NNMI */



	charger {

		interrupts = <0>, <1>;

		interrupt-names = "USB", "AC";

		status = "okay";

	};



	pwrbutton {

		interrupts = <2>;

		status = "okay";

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ 
		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

		ti,nand-xfer-type = "prefetch-dma";

		ti,nand-ecc-opt = "bch8";

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;