clocksource: sh_cmt: Rename mapbase/mapbase_str to mapbase_ch/mapbase

The mapbase variable points to the mapped base address of the channel,
rename it to mapbase_sh. mapbase_str points to the mapped base address
of the CMT device, rename it to mapbase.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 36f1ac982d94cd3cce8ae24abd0676b79dec6126)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

clocksource: sh_cmt: Constify name argument to sh_cmt_register()

The name argument is assigned to const structure fields only, constify
it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 1d053e1d8eb28f42b7ec57d1c11ce70b8fba45ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

clocksource: sh_cmt: Split channel setup to separate function

Move the channel setup code from sh_cmt_setup to a new
sh_cmt_setup_channel function and call it from sh_cmt_setup.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit b882e7b13bc12b3d6b00e4ea2fe374413ddcdd2d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

clocksource: sh_cmt: Rename struct sh_cmt_priv to sh_cmt_device

Channel data is private as well, rename priv to device to make the
distrinction between the core device and the channels clearer.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 2653caf4381f9adeec8c18dfec21ec3c855d801c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

clocksource: sh_cmt: Split channel fields from sh_cmt_priv

Create a new sh_cmt_channel structure to hold the channel-specific
field in preparation for multiple channels per device support.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 7269f9333292586f2378c5321b40a8d3779c4653)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

clocksource: sh_cmt: Use request_irq() instead of setup_irq()

The driver claims it needs to register an interrupt handler too early
for request_irq(). This might have been true in the past, but the only
meaningful difference between request_irq() and setup_irq() today is an
additional kzalloc() call in request_irq(). As the driver calls
kmalloc() itself we know that the slab allocator is available, we can
thus switch to request_irq().

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit dc2eadece70089430f12e4ed6bb1a4421cf3d6f4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers

This patch fixes host drivers to use CONFIG_PM_SLEEP instead of CONFIG_PM
where applicable.  Benefits of this change:

* unused code is not being compiled in for CONFIG_PM=y, CONFIG_PM_SLEEP=n
  and CONFIG_PM_RUNTIME=y configurations

* easier transition to use struct dev_pm_ops and SIMPLE_DEV_PM_OPS() in
  the future

* more consistent code (there are host drivers which are using the correct
  CONFIG_PM_SLEEP checks already)

The patch leaves the core libata code and ->port_[suspend,resume] support
in sata_[inic162x,nv,sil24].c alone for now.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
(cherry picked from commit 58eb8cd565af4a104395e3c10443951c1f73dafe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

thermal: rcar: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
(cherry picked from commit b0a60d88d60b92c769ec589796403937f6e5243e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

thermal: rcar: Use pm_runtime_put() i.s.o. pm_runtime_put_sync()

There's no need for this to be synchronous

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
(cherry picked from commit 09be511cdab813c2971c9f9af0cb40f6583cf80d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

pinctrl: Enable "power-source" to be extracted from DT files

Add "power-source" property to generic options used for DT parsing files.
This  enables drivers, which use generic pin configurations, to get the
value passed to this property.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit ca6c55189a631f3380ff0a28f90d920a84e60d7b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

pinctrl: pinconf-generic: Use kmemdup instead of kmalloc + memcpy

This issue was reported by coccicheck using the semantic patch
at scripts/coccinelle/api/memdup.cocci

Signed-off-by: Benoit Taine <benoit.taine@lip6.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit db388dfb90368638ad238c27b045b6c9bf1f6c17)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

pinctrl: allows not to define the get_group_pins operation

When using a group only pinctrl driver, which does not have any
information on the pins it is useless to define a get_group_pins
always returning an empty list of pins.

When not using get_group_pin[1], a driver must implement it so
pins = NULL and num_pins = 0. This patch makes it the default
behaviour if not defined in the pinctrl driver when used in
pinmux enable and disable funtions and in pinctrl_groups_show.

It also adds a check in pinctrl_get_group_pins and return -EINVAL if
not defined. This function is called in the gpiolib when adding when
pingroup range. It cannot be used if no group is defined, so this seams
reasonable.

[1] get_group_pin(struct pinctrl_dev *pctldev,
  unsigned selector,
  const unsigned **pins,
  unsigned *num_pins);

Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit e5b3b2d9ed202697a937c282f9c4d93b1e3e0848)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: add compatibles for additional SoC

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 90104d06372e41b2a844950f6648322b09f9b8b9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: fix clock calculation for newer SoCs

Newer SoCs have so fast input clocks that the ICCL/H registers only
count every second clock to have a meaningful 9-bit range. The driver
was already prepared for that happening, but didn't use it so far.
Add the proper DT configuration for SoCs that need it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 67240dfcb8dcf756cc00fb37f5cb7e3ee2fa6190)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: check timing parameters for valid range

Due to misconfiguration, it can happen that the calculated timing
parameters are out of range. Bail out if that happens. We can also
simplify some logic later because of the verified value. Also, make the
printouts of the values more precise by adding the hex-prefixes.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 7663ebefca8079ef0fd2fff1047d3d10af654c78)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: bail out on errors when initializing

sh_mobile_i2c_init() could detect wrong settings, but didn't bail out,
so it would continue unconfigured. Fix this.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 6ed7053c2255c34886297b995c6a18607b36d668)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: remove superfluous offset parameter

Following the KISS principle, remove unneeded stuff.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit ed4121e129ae46615ab570318b5b8f31494ced98)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: devm conversion, irq setup

This is what devm was made for. No rollback mechanism needed, remove the
hook parameter from the irq setup function and simplify it. While we are
here change some variables to proper types.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 7fe8a9993337e4d1957737b4468fc574af8fb957)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: devm conversion, low hanging fruits

Convert the easy parts to devm. irqs will be converted in a seperate
patch to keep diffs readable.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 4fd31c2eb7bf19927524bca1c5c17e6bb0f4f6eb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: honor DT bus speed settings

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 88c289ec28dfb0f383dcdbadd2c759f910585815)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: improve error handling

Use standard i2c error codes for i2c failures. Also, don't print
something on timeout since it happens regularly with i2c. Simplify some,
logic, too.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 5a72b25e7896e6358b62b590ce5b3a457516ae40)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: sh_mobile: replace magic hex values with constants

No functional change, binaries are identical.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit a78f6a4140f95cbedc0b28c4c883e8aa9ba044f1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message. For example,
k.alloc and v.alloc failures use dump_stack().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 46797a2adbf0cdc3be17707dc64e872eeed86a8a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
drivers/i2c/busses/i2c-efm32.c

i2c: rcar: update copyright and license information

Make clear that the driver is GPL v2 only. Remove FSF address. Remove
filename in comment. Update copyright information.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 3d99beabf17506b9d48461d1677a61a430000ad7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: janitorial cleanup after refactoring

Remove some obvious comments, remove some superfluous debug output (the
error code carries the same information), some white space fixing...

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 51371cdc86403d9f643efe3d4a4febd11f084c74)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: reuse status bits as enable bits

Status register and enable register are identical regarding their
layout. Use the bit definitions for both.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 3e3aabac443e25712a3788cf88cc188e13ca8b0e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: remove spinlock

The i2c core has per-adapter locks, so no need to protect again.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 150b8be3cda54412ad7b54f5392b513b25c0aaa7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: refactor status bit handling

The old macros made it harder to see what was actually happening.
Replace them with something more readable.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 3c95de674496e08d3b373f85af4aa59c23ddb8d6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: refactor setting up msg

Setting up a read or write message is similar enough to be done in one
function. Also, move a helper function into the new function since it is
only used here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 386babf8e2f7dd483f88e5c0c4c761346b750185)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: check bus free before first message

We should always check if the bus is free, independently if it is a read
or write. It should be done before the first message, though. After
that, we ourselves keep the bus busy. Remove a 'ret' assignment which
only silenced a build warning.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 3f7de22eb28244fc79bc744d9f51d018da343962)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: refactor irq state machine

Remove the seperate functions and use designated constants. As readable
but less overhead. Actually, this is even more readable since the old
function used a mix of "=" and "|=".

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit f2382249b27d1589a1ae495a1df84d890982a3e1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: refactor bus state machine

Remove the seperate functions and use designated constants. As readable
but less overhead.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 4f443a8a611d0cb3c40e95e0d90e9d7e4740eda6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: no need to store irq number

We use devm, so irq number is only needed during probe.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 93e953d3785fa6fc7fda4b64bd38d003f1dcb1d2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: not everything needs to be a function

Very basic operations, just called once, can also go to the caller.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 1c176d534f81c350f67dd4dc6d0330a45c11c9a6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

i2c: rcar: add compatibles for additional SoC

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit 819a39510ed8e7f473309d071ede0fb02f0d0e79)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

gpio: rcar: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 41893360afb9d49181ce9714286de61ee50c48b0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

gpio: rcar: Add minimal runtime PM support

This is just enough to automatically enable the functional clock, if
present. Clock management during suspend/resume is still to be added.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-gpio@vger.kernel.org
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit df0c6c80232f2ad442dcf79a3a420eb8ac624e42)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

gpio: rcar: Add optional functional clock to bindings

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-gpio@vger.kernel.org
Cc: devicetree@vger.kernel.org
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 370a4516e401af82dcd89c34a99346c5869a879c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: ak4642: Add support for extended sysclk frequencies of the ak4648

Additionally to the ak4642 pll frequencies the ak4648 also supports 13MHz,
19.2MHz and 26MHz. This adds support for these frequencies.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 5cd15e29a45a18b9a744af61a7d90f26f730eb97)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: ak4642: Add driver data and driver private struct

Currently unused, this is done to let the driver distinguish between
the different supported codec types in later patches.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit d815c703cedbc783ae09ac65eef5c4aa18e06128)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: ak4642: Add ALC controls

ALC and ALC Zero crossing detection has been enabled unconditionally.
Add controls for this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 370f83a156e42d6c6997c65dbceb4bb7118e915a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

v4l: vsp1: Add DT support

Implement support for the VSP1 DT bindings in the VSP1 driver. The
driver now first retrieves platform data either from the platform data
pointer or by reading the device tree node, and then validates it
regardless of the platform data source.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit 0b82fb95d9edf7bdfc6486c67a42dbf9b1e97765)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

v4l: vsp1: Add BRU support

The Blend ROP Unit performs blending and ROP operations for up to four
sources.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit 629bb6d4b38fe62d36ab52ad22c3ab726f6ce6e8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

v4l: vsp1: Support multi-input entities

Rework the route configuration code to support entities with multiple
sink pads.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit d9b45ed3d8b75e8cf38c8cd1563c29217eecba27)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

v4l: vsp1: uds: Enable scaling of alpha layer

Scaling of the alpha layer is disabled as both the RPF and WPF are
configured to hardcode the alpha value to 255. This results in a 0 alpha
value at the UDS output, making the image invisible when alpha blended
in the BRU. Fix it by enabling scaling of the alpha layer.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit 6051f5f860671577b0759a0d054781b3e599d1cd)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

v4l: vsp1: Remove unexisting rt clocks

The VSP1 has no rt clock. Remove them from the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit 4fc7878401f9980a5f1c24caae9b19adf61ea3f8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790: Correct SYS DMAC clock defines

This brings the implementation into line with the documentation.

This problem was introduced when SYS DMAC clock defines were added by
ac991dce6498b5fc ("ARM: shmobile: r8a7790: Add clock index macros for DT
sources") in v3.13-rc2. I do not believe this results in any problems as
these defines do not appear to be used anywhere yet.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit b998da0541e64da5bd857c09347c0fa954c03432)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: rcar: subnode tidyup for renesas,rsnd.txt

rcar_sound,ssi/src/dai subnode documentation
become more cleaner

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 8bab0dd58037623b723b768ee2eb1f7dd1ad0416)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

xhci-platform: Change compatible string from xhci-platform to generic-xhci

This brings the xhci-platform bindings in sync with what we've done for
the ohci- and ehci-platform drivers. As discussed there using platform as a
postfix is a bit weird as the platform bus is a Linux specific thing and
the bindings are supposed to be OS agnostic.

Note that the old xhci-platform compatible string is kept around for, well,
compatibility reasons.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 0f94388b27c599015b74eedf1a32126a3f5fc0f9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: koelsch: correct renesas,gpios to renesas,groups in sd[012] pfc

Fix typo of renesas,groups in the koeslch dt. The kernel has no
renesas,gpios but this should match renesas,groups.

Noticed thanks to similar fix for Lager by Rob Taylor and Ben Dooks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d5dda0381f826326071b027f288372f682c24d55)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7740: drop address cells from GIC node

This is likely a copy-and-paste error from the
ARM GIC documentation, that has already been fixed.

address-cells should have been set to 0, as with the size
cells. As having those properties set to 0 is the
same thing as not specifying them, drop them completely.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 64c04a79c377e23449c59060727fcd34cc798eb6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: sh73a0: drop address cells from GIC node

This is likely a copy-and-paste error from the
ARM GIC documentation, that has already been fixed.

address-cells should have been set to 0, as with the size
cells. As having those properties set to 0 is the
same thing as not specifying them, drop them completely.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit de66b584042b8f2cfe4c34ef4faa804dcd8d5843)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7778: Use clks as MSTP007 parent

According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 3dedc5f5b11c567dbe2f31adb5119d1dfb8f51c9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags

c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
exchanged sound flags, but armadillo800eva flags needs IB_NF.
The recorded sound will be noise without this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7b707277e734c553a8043e9b4d530eb47f4d60c8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags

e1508289404ab6ca28e0dc931612600f0441c417
(ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags)
corrected SND_SOC_DAIFMT_CBx_CFx definition.
But then, Lager board was maintenanced other branch.
This patch correct SND_SOC_DAIFMT_CBx_CFx flag for lager

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9f85ff849c21b429c1e2137f2646f9cc667d8ded)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc

Fix probable typo of renesas,groups in the lager dt. The kernel has no
renesas,gpios but this should match renesas,groups.

Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
[ben.dooks@codethink.co.uk: fixup description]
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit b08eed0c4d7d70eae2f4f1ff518cc33643722a07)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

If the renamed symbol is defined lib/iomap.c implements ioport_map and
ioport_unmap and currently (nearly) all platforms define the port
accessor functions outb/inb and friend unconditionally.  So
HAS_IOPORT_MAP is the better name for this.

Consequently NO_IOPORT is renamed to NO_IOPORT_MAP.

The motivation for this change is to reintroduce a symbol HAS_IOPORT
that signals if outb/int et al are available.  I will address that at
least one merge window later though to keep surprises to a minimum and
catch new introductions of (HAS|NO)_IOPORT.

The changes in this commit were done using:

$ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/'

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit ce816fa88cca083c47ab9000b2138a83043a78be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: bockw: fixup SND_SOC_DAIFMT_CBx_CFx flags

SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode.
Then, rcar will be master mode if it was SND_SOC_DAIFMT_CBS_CFS.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 6fa387b2ed268952d50940b0e24c573063a1dcfe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: fsi: fixup compile error for simple-card

This patches fixes
c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
commit's compie error

arch/arm/mach-shmobile/board-mackerel.c:512:2: \
  error: unknown field 'fmt' specified in initializer

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 313c84b2736b26c77af7c7637e7dd72afde1b6cd)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags

SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode.
Then, FSI will be master mode if it was SND_SOC_DAIFMT_CBS_CFS.

This patch fixup platform settings too.
Then, it tidyups SND_SOC_DAIFMT_INV settings.

Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit c7a507eea1db1430476289f525f9c853d5d485e8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks

The MSTP clocks for SCIFA3-5 are MSTP1106-1108, not MSTP1105-1107

Also reinsert them at the correct position to preserve sort order.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a51a9d67ba061c1263d078c27e8a3020d61fe236)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Remove CMT, TMU and STI Kconfig entries

Now when drivers/clocksource/Kconfig has been
updated with entires for CMT, TMU, MTU2, and STI
it is safe to remove these from mach-shmobile.

Also select timers per SoC via SYS_SUPPORTS_xxx.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
(cherry picked from commit aeb8fb7910fc7344d0ee0c9306eb45f11327c600)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/Kconfig

ARM: shmobile: r7s72100: fix bus clock calculation

The picture in the datasheet is a little misleading, yet the divider of
the bus_clk is 1/3 and not 2/3.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d93023f81d2c79595e64e4f516f03af4e4c73c13)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: APMU: Fix warnings due to improper printk formats

Use the %pr printk specifier to print resource variables. This fixes
warnings on platforms where resource_size_t has a different size than
int.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 56ff873122c4baab43df241c7701d043b8ec8a8e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Add SDHI devices for Koelsch DTS

Add DT support for SDHI0, SDHI1 and SDHI2 on Koelsch.

The board specific handling of CD and WP pins are
using GPIOs. SDHI0 and SDHI1 are hooked up to regular
SD connectors while SDHI2 is using micro-SD which
is lacking WP signal.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2c60a7df72711fb8b4be1e6aa651ab166a8931bc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Add SDHI devices to r8a7791 DTSI

Add SDHI0, SDHI1 and SDHI2 to the r8a7791 DTSI.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit b7ed8a0dd4f1d41464c3ab050c3688c4a7fc15b3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Move SYSC base variable to inside ifdefs

Move the rcar_sysc_base variable to inside #ifdefs to avoid
triggering build warnings in case PM or SMP is not selected.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c4ca5d80e03559fd95c526ece5ce39fc732a2511)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791 dtsi: Fix typo in msiof2 clock output name

Introduced in commit cded80f869aef94853e056ab9c21e305b0c26138 ("ARM:
shmobile: r8a7791: Add MSIOF clocks in device tree").

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 0c002ef8caeff728d4015082cbe998cfdd57f1e0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: fix clock index for i2c5

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1f662dde5c287c33da84d4aaaec8a75f2aab8ee7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: koelsch: add Ether DT support

Define the Koelsch board dependent part of the Ether device node.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 08e8f0f35522bad37556a80c6df0578374f5091c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: add Ether DT support

Define the generic R8A7791 part of the Ether device node.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2e5d55ce8910afe136e0f4aa6ada6932e949c1ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: lager: add Ether DT support

Define the Lager board dependent part of the Ether device node.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit da4ea9514df42f69ec42a098142aaeac8c101da5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790: add Ether DT support

Define the generic R8A7790 part of the Ether device node.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d8913c6799ed776d096a7f41d83afce815f93819)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790: add sound SCU clock support

This is needed to use SRC (= Sampling Rate Converter).
MSTP1017 is defined top of MSTPxxx list to avoid runtime error,
since it is parent clock of MSTP1031 - MSTP1022

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9ced1d47719b5f32e4231338dd362c136518ed08)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices

Now that the r8a7791 DT platforms use the common clock framework,
there's no need to manually create clock aliases for devices
instantiated through DT, as those devices will reference their clocks
directly in the device tree. Remove those aliases.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a8a8266229787241e1dfdb075a416e31da2fa1d7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins()

Remove __init from rcar_gen2_read_mode_pins() to allow
it to be used after boot. For instance the R-Car Gen2
MD21 check is needed even in the case of CPU Hotplug.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit e7509f6eca10cff3933f8a71f4ca9d8be8447ec3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790 CA15-SCU enablement

Power on CA15 SCU in case of booting from a CA7 core.

Signed-off-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c2c97ec513b503b9e0d28ffd98d54c9e9bf3ea3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790 CA7-SCU enablement

Power on CA7 SCU in case of booting from a CA15 core.

Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0445ded61aac0c1a6f43b4be1a2ca2ca47b77eb8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790 SYSC setup code

Add r8a7790 SYSC power management support.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a48f165509c18d47f1505888a21918e8a06d590f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Break out R-Car SYSC PM code

Break out the R-Car SYSC power management code from
the r8a7779 SoC code. With this new shared R-Car SYSC
code base it is possible to hook in Generation 2 SoCs
as well.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a6557eb795edcf7832b5278a11842c4ca302f4af)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791

Some on-chip devices on r8a7790 and r8a7791 can do
bus mastering and access more than 32-bits of address
space. Select ARCH_DMA_ADDR_T_64BIT when LPAE is set
in case of multiplatform and legacy SoC support.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4a51856b42672cfcb7d6fbab22dcf2caba2be5ab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Remove legacy r8a7790 DT clocks

The DT device case is handled by CCF these days, so get
rid of DT devices from the legacy clocks for r8a7790.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit df55f6685a04a259cf59cd3fde02212b294461cc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Add r8a7791 legacy SDHI clocks

Add legacy r8a7791 SDHI clocks. This to allow the SDHI devices
to be used by legacy Koelsch board support.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4bfb358b1d6cdeff8c6a13677f01ed78e9696b98)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r7s72100: Add clock for r7s72100-ether

Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0e7ed0c1613aea101205b4e0413f75ef8141bf3d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791 clock: add QSPI clocks

The QSPI clock divider value depends on the MD1, MD2, and MD3 mode
switches.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d2eec3d5251216942e1d425300686f1a18bc615d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT

Add DT-style ("%08x.spi") clocks, as Genmai doesn't use the common
clock framework yet.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 3fc3e908d25ad04de1a01b3f659ecabefcca74c5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r7s72100 clock: Add RSPI clocks

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d9409fb8f30437b68647613e1f0d61b332de30be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7790: add audio clock

Current audio clock doesn't have dependency to device/driver,
but, it is not good design for DT support.
To avoid branch merge conflict issue,
it uses this load map, and this patch is 1) part.
 1) add old/new style clock in platform
 2) add new style clock method in driver
 3) remove old tyle clock from platform

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c7c2ec3a1881b93c211d0754b39f08b5a75459d8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7778: add audio clock in new style

Current audio clock doesn't have dependency to device/driver,
but, it is not good design for DT support.
To avoid branch merge conflict issue,
it uses this load map, and this patch is 1) part.
 1) add new style clock in platform
 2) add new style clock method in driver
 3) remove old tyle clock from platform

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ba349c08bea1bfddddb7cfc0af140d368274f869)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform

Many V6 and V7 platforms have an L2x0 cache, so make
CONFIG_MIGHT_HAVE_CACHE_L2X0 visible for V6 and V7 multi-platform
builds.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit 9352b05b6e4ef1aae53744cbd0adc0491fae5be0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: select HAVE_SMP for V7 multi-platform

All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for V7
multi-platform builds.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit 90bc8ac77dc85d2184da3d5280215b33253adffc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: centralize common multi-platform kconfig options

Multi-platform requires various kconfig options to be selected, so
platforms don't need to select them individually.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit ddb902cc34593ecb88c368f6e15db3cf829c56fe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-omap2/Kconfig
arch/arm/mach-tegra/Kconfig

usb: host: remove selects of USB_ARCH_HAS_?HCI

USB_ARCH_HAS_EHCI, USB_ARCH_HAS_OHCI, and USB_ARCH_HAS_XHCI were just
removed. Selecting them is a nop. The select statements for these
symbols can be removed too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f6723b569a67aa4042b4ddc72822bf7f4395f3d2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r7s72100: update defconfig for I2C usage

Select the correct I2C driver and activate EEPROM support to have a
slave device for testing. Also activate i2c-dev, so i2c-tools will work.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7573e89ba1fcbe492c52d5b1e72fcf5d23da21d1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: genmai: adapt dts to use native i2c driver

Activate the shiny new riic driver for i2c2. Tested by accessing the
eeprom on the genmai board.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 367aaaea1d6c6496695ffd06b49590b8cfcb8aa5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c81a4d3dfd33e097d3eef89e4eb830effb8b8d31)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 38c53516729925d2123ed800e5f4182d77e450a6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: r8a7791: add i2c master nodes to dtsi

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5bd3de7ba7b28c885d534260800693fe57e55ec8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Remove Lager DT reference legacy clock bits

Lager DT reference is these days built for multiplatform
only which means that CCF comes with the package. Remove
unused legacy code ifdefs to clean up the code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 6197c08ab81cf1430cbe7346fd6ca0b5a18580bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: Remove Koelsch DT reference legacy clock bits

Koelsch DT reference is these days built for multiplatform
only which means that CCF comes with the package. Remove
unused legacy code ifdefs to clean up the code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 34b6a241de1d965b1c047a97fad602687218a866)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>