From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 7 Mar 2018 15:26:43 +0000 (+0100)
Subject: Merge tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.19~1282^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bf5c70d06ce1d91cc73cee68bc6c4f850192cb0;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc

Pull "Driver changes for ti-sysc for v4.17" from Tony Lindgren:

This series of changes enables the use device tree based sysconfig
data for ti-sysc driver. As we already have SmartReflex data configured,
we use that as the first driver to enable. To do that in a way where
SmartReflex is not probed twice, we need to prepare the SmartReflex
driver before flipping dts data on for it in the last patch of the
series.

To avoid regressions, we are checking the passed dts data against
existing platform data since we still have it available. Then after the
dts files are converted, we can simply drop the related platform data
at some point in the future.

* tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Enable ti-sysc to use device tree data for smartreflex
  PM / AVS: SmartReflex: Prepare to use device tree based probing
  ARM: OMAP2+: Try to parse earlycon from parent too
  ARM: OMAP2+: Add checks for device tree based sysconfig data
  ARM: OMAP2+: Add functions to allocate module data from device tree
  bus: ti-sysc: Handle some devices in omap_device compatible way
  bus: ti-sysc: Add support for platform data callbacks
  bus: ti-sysc: Remove unnecessary debugging statements
  bus: ti-sysc: Improve handling for no-reset-on-init and no-idle-on-init
  bus: ti-sysc: Handle stdout-path for debug console
  bus: ti-sysc: Add suspend and resume handling
  bus: ti-sysc: Add fck clock alias for children with notifier_block
  ARM: OMAP2+: Prepare to pass auxdata for smartreflex
---

3bf5c70d06ce1d91cc73cee68bc6c4f850192cb0
diff --cc arch/arm/mach-omap2/pdata-quirks.c
index e7d7fc7,67e2fcd..6459816
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -23,9 -24,12 +24,10 @@@
  #include <linux/platform_data/pinctrl-single.h>
  #include <linux/platform_data/hsmmc-omap.h>
  #include <linux/platform_data/iommu-omap.h>
+ #include <linux/platform_data/ti-sysc.h>
  #include <linux/platform_data/wkup_m3.h>
 -#include <linux/platform_data/pwm_omap_dmtimer.h>
  #include <linux/platform_data/media/ir-rx51.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
 -#include <plat/dmtimer.h>
  
  #include "common.h"
  #include "common-board-devices.h"