From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 21 Dec 2017 16:20:49 +0000 (+0100)
Subject: Merge tag 'omap-for-v4.16/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.16-rc1~100^2~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce541f0419fdac1f76ac5385eebb1f43efef24fc;p=thirdparty%2Fkernel%2Flinux.git

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

Pull "Dts related changes for omaps for v4.16 merge window" from Tony
Lindgren:

These changes are mostly improvments for various devices.
Note that these are based on my earlier fixes branch
omap-for-v4.15/fixes-dt to avoid a pointless merge conflict
between a fix and removal. The summary of changes is:

- Fix audio codec reset pin for am335x-pepper and n900, this
  has been always broken and won't get fixed until the related
  driver changes are also merged in for v4.16, so not urgent

- Fix tps65917 powerhold property for dra76-evm

- Changes to logicpd boards to remove MTD partition information
  and to add support for omap35xx variants by setting up common
  dts files for the logicpd boards

- Disable dra7 USB metastability workaround, this won't do
  anything until the related driver changes are also merged
  into v4.16, so not urgent

* tag 'omap-for-v4.16/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Move move WiFi bindings to logicpd-torpedo-37xx-devkit
  ARM: dts: Add minimal support for LogicPD OMAP35xx Torpedo devkit
  ARM: dts: Move most of logicpd-torpedo-37xx-devkit to logicpd-torpedo-baseboard
  ARM: dts: Add minimal support for LogicPD OMAP35xx SOM-LV devkit
  ARM: dts: Move most of logicpd-som-lv-37xx-devkit.dts to logicpd-som-lv-baseboard.dtsi
  ARM: dts: dra7: Add missing hdmi audio DMA channel information
  ARM: dts: dra7: Disable USB metastability workaround for USB2
  ARM: dts: omap3: logicpd kits: Remove partition information
  ARM: dts: DRA76-EVM: Set powerhold property for tps65917
  ARM: dts: omap3-n900: Fix the audio CODEC's reset pin
  ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
---

ce541f0419fdac1f76ac5385eebb1f43efef24fc
diff --cc arch/arm/boot/dts/dra7.dtsi
index a1d7178a3966e,0ed9fb239ad64..3c8c0d743dd0e
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -1926,9 -1906,10 +1927,11 @@@
  				interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
  				status = "disabled";
  				ti,hwmods = "dss_hdmi";
 -				clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>;
 +				clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
 +					 <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>;
  				clock-names = "fck", "sys_clk";
+ 				dmas = <&sdma_xbar 76>;
+ 				dma-names = "audio_tx";
  			};
  		};