Simon Horman [Fri, 5 Dec 2014 08:48:48 +0000 (17:48 +0900)]
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
This is the 3.14.25 stable release
Conflicts:
Makefile
Simon Horman [Fri, 5 Dec 2014 01:59:06 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-thermal-to-v3.18-rc4' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:05 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/i2c-sh-mobile-to-v3.18-rc4' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:05 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/xhci-plat-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:04 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-mobile-sdhi-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:04 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/pm-runtime-
20141105' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:03 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/mmc-
20141105' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:03 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/usbhs-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:02 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-tmu-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:02 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-sci-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:01 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-pfc-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:01 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-mtu2-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:00 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-msiof-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:59:00 +0000 (10:59 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-drivers-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:59 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-cmt-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:59 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rspi-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:58 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-snd-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:56 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-du-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Conflicts:
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
Simon Horman [Fri, 5 Dec 2014 01:58:51 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/of-
20141105' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:51 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/pinctrl-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:50 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:50 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/i2c-rcar-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:49 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/da9210-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Simon Horman [Fri, 5 Dec 2014 01:58:49 +0000 (10:58 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/cpg-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
Laurent Pinchart [Tue, 21 Jan 2014 14:57:26 +0000 (15:57 +0100)]
drm/rcar-du: Add OF support
Implement support for the R-Car DU DT bindings in the rcar-du DRM
driver.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit
96c026911890ceacee238da00a0b140ad634cc43)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Tue, 26 Aug 2014 22:42:56 +0000 (00:42 +0200)]
drm/rcar-du: Use struct videomode in platform data
In preparation for DT support where panel timings will be described by a
DRM-agnostic video mode, replace the struct drm_mode_modeinfo instance
in the panel platform data with a struct videomode.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit
1d46fea7d091f9dc2d4fd3fcb9f0117ca288f9a5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Thu, 6 Feb 2014 17:13:52 +0000 (18:13 +0100)]
drm/rcar-du: Update copyright notice
The "Renesas Corporation" listed in the copyright notice doesn't exist.
Replace it with "Renesas Electronics Corporation" and update the
copyright years.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit
36d50464e05f498fa4024270e091b306af5de898)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 28 Aug 2014 08:10:19 +0000 (10:10 +0200)]
spi: rspi: Add support for new R-Car Gen2 SoCs
Add support for QSPI in:
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
6089af775a4b4ea5237648de650dda548cb841c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/spi/spi-rspi.txt
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:02 +0000 (14:59 +0200)]
spi: rspi: Add DT support to DMA setup
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
e825b8dd2b363e9134006fb141825518a11b2bf4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/spi/spi-rspi.txt
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:01 +0000 (14:59 +0200)]
spi: rspi: Configure DMA slave bus width to 8 bit
The new Renesas R-Car Gen2 DMA Controller driver (rcar-dmac) requires
explicit configuration of the DMA slave bus width.
Hardcode the DMA transfer size to 1 byte for both directions, as that's
the only supported configuration (16-bit DMA support was removed in
commit
9c5de2c1754c2bb3c69c4d7bf0d0edc0a61d8232 ("spi: rspi: Remove
unused 16-bit DMA support")).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
a30b95a7d81cfc3442beb5a9635f22b19c97bbfc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:00 +0000 (14:59 +0200)]
spi: rspi: Use devm_kasprintf()
Use the devm_kasprintf() helper function instead of open coding
error-prone buffer handling and string formatting.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
43937455c9bf294cffc2f25c4a4d0a1b9bbd88e6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:58:59 +0000 (14:58 +0200)]
spi: rspi: Remove unneeded semicolon
Introduced by commit
426ef76dd8a394a0e04d096941cd9acb49539a3e ("spi:
rspi: Add DT support").
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
d64b472678e17ef9afb251577f4f544793483fa9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 13:26:35 +0000 (15:26 +0200)]
devres: Improve devm_kasprintf()/kvasprintf() support
- Add devm_kasprintf()/kvasprintf(), introduced by commit
75f2a4ead5d5890ada9c2663a70fb58613c0d9f2 ("devres: Add
devm_kasprintf and devm_kvasprintf API"), to
Documentation/driver-model/devres.txt,
- Improve kernel doc: the string is not an existing formatted string,
but is formatted into the newly-allocated buffer,
- Add a __printf() annotation to devm_kasprintf(), so the compiler
will verify the format string argument types.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
bef59c5024be687ef4f228915af9961307a779ab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/driver-model/devres.txt
drivers/base/devres.c
Himangi Saraogi [Wed, 16 Jul 2014 20:57:52 +0000 (02:27 +0530)]
devres: Add devm_kasprintf and devm_kvasprintf API
devm_kasprintf() and devm_kvasprintf() are the managed counterparts
for kasprintf() and kvasprintf().
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
75f2a4ead5d5890ada9c2663a70fb58613c0d9f2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
drivers/base/devres.c
Sergei Shtylyov [Thu, 18 Sep 2014 19:33:49 +0000 (23:33 +0400)]
mmc: tmio: prevent endless loop in tmio_mmc_set_clock()
I spent a couple of days with the driver just hanging due to me forgetting to
specify the external crystal frequency, so that clk_get_rate() returned 0 and
thus the loop in tmio_mmc_set_clock() never ended. I don't think that's an
acceptable behavior, so I suggest that the minimum frequency is checked for 0
in tmio_mmc_host_probe().
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Ian Molton <ian.molton@codethink.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
bb98d9d1d2e791f368295c9c09c9a03fe3ac0e62)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Wed, 10 Sep 2014 07:23:24 +0000 (00:23 -0700)]
mmc: tmio: enable odd number size access
Current tmio is using sd_ctrl_read16/write16_rep()
for data transfer.
It works if transfer size was even number,
but, last 1 byte will be ignored if
transfer size was odd number.
This patch adds new tmio_mmc_transfer_data()
and solve this issue.
Tested-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
b9bd7ff8069a7125da897de657da421c497d4f15)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 9 Sep 2014 06:45:46 +0000 (23:45 -0700)]
mmc: use .multi_io_quirk on sh_mobile
Now, sh_mobile_sdhi can use .multi_io_quirk callback
instead of MMC_CAP2_NO_MULTI_READ flags.
let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
8b4efe2f58b1699a57f6c30d17345b801ab4213b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 9 Sep 2014 06:45:25 +0000 (23:45 -0700)]
mmc: use .multi_io_quirk on tmio_mmc
Now, tmio_mmc can use .multi_io_quirk callback
instead of MMC_CAP2_NO_MULTI_READ flags.
let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
bbf0208d39121bd8873b032459cb2b5f35e14593)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 28 Aug 2014 08:07:19 +0000 (10:07 +0200)]
mmc: tmio-mmc: Add support for SDHI on new R-Car Gen2 SoCs
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
a638640335d86549da2b7d38f82d584294333512)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Mon, 25 Aug 2014 03:03:00 +0000 (20:03 -0700)]
mmc: tmio: add actual clock support as option
Some controller is supporting actual clock on SD_CLK_CTRL :: DIV[7:0].
Renesas SH-Mobile SDHI doesn't support,
but, Renesas R-Car SDHI supports it.
This patch adds new TMIO_MMC_CLK_ACTUAL flag for it.
[Kuninori Morimoto: tidyuped for upstreaming]
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
da29fe2bf573f0ae56fdc2e790387cb73fc8c6f8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 25 Aug 2014 03:02:16 +0000 (20:02 -0700)]
mmc: tmio: remove SCLKEN bit setting from tmio_mmc_set_clock()
TMIO clock is set via tmio_mmc_set_clock() -> tmio_mmc_clk_start(),
and SCLKEN bit will be set on tmio_mmc_clk_start().
It is not needed on tmio_mmc_set_clock() function.
The required clock setting will not be able to set
in some clocks without this patch.
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
b30d6958a014812158d9729a3e0b6d448f6e8968)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 25 Aug 2014 03:01:54 +0000 (20:01 -0700)]
mmc: tmio: remove Renesas specific #ifdef
This patch adds new TMIO_MMC_HAVE_CTL_DMA_REG flag,
and remove Renesas specific #ifdef from tmio driver
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
e85dd04ea8c8d32ba8eae278959d28df34338e9d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Mon, 25 Aug 2014 03:01:32 +0000 (20:01 -0700)]
mmc: tmio: check ILL_FUNC instead of CBSY
Some controllers need to check SD bus status when writing data.
Then, it checks ILL_FUNC bit on SD_INFO2 register,
and this method is controlled via TMIO_MMC_HAS_IDLE_WAIT flags.
Same method is required on tmio_mmc_data_irq() which will
be called after writing data.
Current driver is checking CBSY bit for this purpose,
but, some controllers doesn't have CBSY bit.
This patch checks ILL_FUNC bit instead of CBSY bit
if it has TMIO_MMC_HAS_IDLE_WAIT flags
[Kuninori Morimoto: tidyuped for upstreaming]
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
81e888daab027e05130b0459e5d8e0b42dac4323)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Mon, 25 Aug 2014 03:00:52 +0000 (20:00 -0700)]
mmc: tmio: add TMIO_MMC_SDIO_STATUS_QUIRK
Renesas R-Car SDHI should set reserved bits
on CTL_SDIO_STATUS register when writing.
This patch adds new TMIO_MMC_SDIO_STATUS_QUIRK flags
for this purpose
[Kuninori Morimoto: tidyuped for upstreaming
enabled this flags for all SH-Mobile/R-Car]
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
6b98757e53cb0e93b02db4067c14afcb32c90615)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Mon, 25 Aug 2014 03:00:25 +0000 (20:00 -0700)]
mmc: tmio: control multiple block transfer mode
Renesas SDHI has "Multiple Block Transfer Mode" settings
on SD_CMD register which controls CMD12 automatically.
This patch cares it, because
CMD12 is not needed when CMD53 (= SD_IO_RW_EXTENDED)
[Kuninori Morimoto: tidyuped for upstreaming
enabled this flags for all SH-Mobile/R-Car]
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
b8d11962c2d83c984d5afd091e5b725ad2fd5607)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Mon, 25 Aug 2014 02:59:22 +0000 (19:59 -0700)]
mmc: tmio: clear error IRQ status
Next card access will be always
error if it didn't clear error status
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
f83bfa751babb521924f6d8c93055215d2eb33cc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 25 Aug 2014 02:58:48 +0000 (19:58 -0700)]
mmc: tmio: care about DMA tx/rx addr offset
Basically, SD_BUF0 Tx/Rx addresses are same
in normal TMIO controller,
but, it is different on Renesas R-Car SDHI controller
if it uses DMAC
(Rx address needs to add 0x2000 to Tx address)
This patch adds new .dma_rx_offset and cares it
Tested-by: Nguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
384b2cbd56a02efb16358ed7c0c039e4afca5ed0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 11:22:51 +0000 (13:22 +0200)]
mmc: tmio: Remove library functions for system PM
These library functions aren't used and nor needed, let's remove them.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
341eb6a4e7beea5730faf55610ef60584bcfffcf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 10:28:20 +0000 (12:28 +0200)]
mmc: tmio_mmc: Fixup system PM suspend lock-up
At system PM suspend, the tmio core accessed the internal registers of
the controller without first moving the device into active state. This
caused a lock-up in system PM suspend phase.
The reason for the register access were masking of IRQs. Since that is
managed via the runtime PM suspend path, let's just re-use that path
for system PM suspend.
In other words force the device into runtime PM suspend state at system
PM suspend and restore it to active state at system PM resume.
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
70a15e1a3c58ee841415c84170b80a3859027686)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 10:18:26 +0000 (12:18 +0200)]
mmc: sdhi: Fixup system PM suspend lock-up
At system PM suspend, the tmio core accessed the internal registers of
the controller without first moving the device into active state. This
caused a lock-up in system PM suspend phase.
The reason for the register access were masking of IRQs. Since that is
managed via the runtime PM suspend path, let's just re-use that path
for system PM suspend.
In other words force the device into runtime PM suspend state at system
PM suspend and restore it to active state at system PM resume.
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
753a688c9f28ad3198611bbbd39f3b226c35ab98)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 10:12:02 +0000 (12:12 +0200)]
mmc: tmio_mmc: Enable runtime PM support
To take advantage of the clock gating support, use the runtime PM
callbacks provided by the tmio core.
Additionally, we make use of the SET_PM_RUNTIME_PM_OPS, which is a
preparation needed to simplify system PM.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
78f76df60926f7853df9ee2b707ea9254129775c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 10:06:55 +0000 (12:06 +0200)]
mmc: sdhi: Make runtime PM callbacks available for CONFIG_PM
To be able to simplify system PM, let's re-use the runtime PM callbacks
by converting to the SET_PM_RUNTIME_PM_OPS macro.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
f74f1e38206df93b9e11d5a8b84743e61c0768a6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 10:03:20 +0000 (12:03 +0200)]
mmc: tmio: Make runtime PM callbacks available for CONFIG_PM
To give the option for tmio hosts to use the runtime PM callbacks for
CONFIG_PM_SLEEP as well as CONFIG_PM_RUNTIME, move them to CONFIG_PM.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
9ade7dbf20e8fc73d9784b772e320239de2acf08)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Mon, 25 Aug 2014 09:55:57 +0000 (11:55 +0200)]
mmc: tmio: Mask all IRQs when inactive
To make sure we don't receive any spurious IRQs while we are inactive,
mask the IRQs from within the ->runtime_suspend() callback.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
20e955c3c746f434a2f97ab08ac6bd71f63c6afa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Tue, 29 Oct 2013 23:16:17 +0000 (00:16 +0100)]
mmc: tmio: Handle clock gating from runtime PM functions
Add clock gating control as a part of the tmio library functions for
runtime PM.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
ae12d25053fa20d67b16e568917b956006d5dc01)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Thu, 24 Oct 2013 15:53:15 +0000 (17:53 +0200)]
mmc: tmio: Restructure ->set_ios() and adapt ->probe() to it
An internal power state machine were beeing used to keep ->probe() and
->set_ios() in sync. Especially for handling specific scenarios while
using CONFIG_MMC_CLKGATE. Moreover dependency to CONFIG_MMC_CLKGATE
existed to handle runtime PM properly, which we moves away from here.
By removing the state machine and instead make ->set_ios() rely on the
information provided through the function's in-parameters, the code
becomes significantly simplier.
Additonally as a part of this rework we prepares for making the runtime
PM callbacks responsible of clock gating.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
3b292bb0e99018c448e0f5a26c29c68113a1b7bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Thu, 24 Oct 2013 15:42:53 +0000 (17:42 +0200)]
mmc: tmio: Extract bus_width modifications to a separate function
Move code for bus_width modification, out of the ->set_ios() callback
and into a separate function, to simplify code.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
9ae4ed7d30f433873351d5ba14ae000d10e10430)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Thu, 24 Oct 2013 14:42:33 +0000 (16:42 +0200)]
mmc: tmio: Keep host active while serving requests
Use runtime PM to keep the host active during I/O operations and other
requests which requires the tmio hardware to be powered.
Additionally make use of the runtime PM autosuspend feature with a
default timeout of 50 ms.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
0369483efc1719f47249fa94329aa94155edf69d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Thu, 24 Oct 2013 13:58:45 +0000 (15:58 +0200)]
mmc: tmio: Keep host active while SDIO IRQ is enabled
The host must be kept active to be able to serve SDIO IRQs, thus let's
prevent it from going inactive while SDIO IRQ is enabled.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
(cherry picked from commit
7501c4315faf46b088ed4de4d8695a91d7d63869)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Fri, 5 Dec 2014 01:38:07 +0000 (10:38 +0900)]
Merge tag 'backport/v3.14.24-ltsi-rc1/pm-runtime-
20141105' into backport/v3.14.24-ltsi-rc1/mach-shmobile.base
Geert Uytterhoeven [Thu, 28 Aug 2014 08:12:32 +0000 (10:12 +0200)]
thermal: rcar: Add binding docs for new R-Car Gen2 SoCs
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit
689bd24c5e5046b5e5d0aeff9c0b6abf1093fed6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Tue, 4 Nov 2014 22:46:27 +0000 (23:46 +0100)]
i2c: remove FSF address
We have a central copy of the GPL for that. Some addresses were already
outdated.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
(cherry picked from commit
ca1f8da9ac5ce6e63d8f6933f83fabc1f3f961f4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Andrew Bresticker [Fri, 3 Oct 2014 08:35:26 +0000 (11:35 +0300)]
xhci: Introduce xhci_init_driver()
Since the struct hc_driver is mostly the same across the xhci-pci,
xhci-plat, and the upcoming xhci-tegra driver, introduce the function
xhci_init_driver() which will populate the hc_driver with the default
xHCI operations. The caller must supply a setup function which will
be used as the hc_driver's reset callback.
Note that xhci-plat also overrides the default ->start() callback so
that it can do rcar-specific initialization.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
1885d9a33753b73cbbe3f8efde4a852ecca08674)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Sat, 1 Mar 2014 10:56:05 +0000 (11:56 +0100)]
PM: Add pm_runtime_suspend|resume_force functions
This patch provides two new runtime PM helper functions which intend to
be used from system suspend/resume callbacks, to make sure devices are
put into low power state during system suspend and brought back to full
power at system resume.
The prerequisite is to have all levels of a device's runtime PM
callbacks to be defined through the SET_PM_RUNTIME_PM_OPS macro, which
means these are available for CONFIG_PM.
By using the new runtime PM helper functions especially the two
scenarios below will be addressed.
1) The PM core prevents .runtime_suspend callbacks from being invoked
during system suspend. That means even for a runtime PM centric
subsystem and driver, the device needs to be put into low power state
from a system suspend callback. Otherwise it may very well be left in
full power state (runtime resumed) while the system is suspended. By
using the new helper functions, we make sure to walk the hierarchy of
a device's power domain, subsystem and driver.
2) Subsystems and drivers need to cope with all the combinations of
CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME. The two new helper functions
smothly addresses this.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit
37f204164dfb0186a0caf20bc3e3120080bcd788)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Sat, 1 Mar 2014 10:56:04 +0000 (11:56 +0100)]
PM / runtime: Fetch runtime PM callbacks using a macro
While fetching the proper runtime PM callback, we walk the hierarchy of
device's power domains, subsystems and drivers.
This is common for rpm_suspend(), rpm_idle() and rpm_resume(). Let's
clean up the code by using a macro that handles this.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit
5f59df79837bb809f3945613aba5519cd9755a53)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Wed, 3 Sep 2014 02:08:53 +0000 (19:08 -0700)]
mmc: Add .multi_io_quirk callback for multi I/O HW bug
Historically, we have been using MMC_CAP* to handle host HW issues and
currently the block layer uses MMC_CAP2_NO_MULTI_READ flag for a multi
I/O HW bug workaround.
There are a few tweaks needed to make MMC_CAP2_NO_MULTI_READ suite all
situations. Therefore let's add an optional host ops callback to enable
host drivers to return the number of blocks it allows per request.
In a future patch and when host drivers have converted to the new
callback, MMC_CAP2_NO_MULTI_READ shall be removed.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
2e47e84245adcb1b3872210678b6146f674fb3ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Bartlomiej Zolnierkiewicz [Mon, 1 Sep 2014 14:24:40 +0000 (16:24 +0200)]
usb: renesas_usbhs: fix driver dependencies
Renesas USBHS controller support should be available only on
Renesas ARM SoCs and SuperH architecture.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
2b6127ddefb33c339b4f1effcefc788fdd3d7679)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Yoshihiro Shimoda [Wed, 3 Sep 2014 05:25:56 +0000 (14:25 +0900)]
usb: renesas_usbhs: Add device tree support for R-Car H2 and M2
This driver supports other SoCs, but they need boards/Soc depend code.
So, this patch adds device tree support for R-Car H2 and M2 initially.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry picked from commit
b854100eda59a1df9eaf7454cc7c297910055f42)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 27 Aug 2014 04:36:51 +0000 (13:36 +0900)]
clocksource: sh_tmu: Document r8a7779 binding
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings
for a number of drivers for Renesas hardware. The purpose of this patch is
to update the Renesas R-Car Timer Unit (TMU) driver to follow this
convention.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
* I plan to follow up with a patch patch to use the new binding in the
dtsi files for the r8a7779 SoC.
commit
471269b790aec03385dc4fb127ed7094ff83c16d
v2
* Suggestions by Mark Rutland and Sergei Shtylyov
- Compatible strings should be "one or more" not "one" of those listed
- Describe the generic binding as covering any MTU2 device
- Re-order compat strings from most to least specific
v3
* Suggested by Laurent Pinchart
- Reword in keeping with a similar though more extensive patch for CMT
(cherry picked from commit
fb0eee2f141976b5d7f31e477a71556d312f7dc3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Vinod Koul [Sat, 11 Oct 2014 15:40:37 +0000 (21:10 +0530)]
serial: sh-sci: use dmaengine_terminate_all() API
The drivers should use dmaengine_terminate_all() API instead of
accessing the device_control which will be deprecated soon
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit
2bcd90d56c6025189be98bed47c80c5261855a7e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 10 Sep 2014 21:55:55 +0000 (00:55 +0300)]
pinctrl: sh-pfc: sh73a0: Remove unnecessary SoC data allocation
The SoC data structure allocated at init time only holds a regulator
pointer that is only used in the init function. Replace it with a local
variable and get rid of the SoC data structure allocation altogether.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit
0a332c96c29c84cd9205c29dfa1add4667456059)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Linus Walleij [Wed, 3 Sep 2014 11:46:26 +0000 (13:46 +0200)]
pinctrl: sh-pfc: rename confusing pinmux ops variable
The vtable named *pinmux_ops in the affected files are not really
about pin multiplexing, but a struct related to some PFC-specific
operations, inclusing pin config (bias setting). Rename the variable
so as to avoid confusions.
Acked-by: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit
51128e8ac839495e0f2c8287cfe65f9277494a98)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 27 Aug 2014 04:36:51 +0000 (13:36 +0900)]
clocksource: sh_mtu2: Document r7s72100 binding
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings
for a number of drivers for Renesas hardware. The purpose of this patch is
to update the Renesas R-Car Multi-Function Timer Pulse Unit 2 (MTU2) driver
to follow this convention.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
* I plan to follow up with a patch patch to use the new binding in the
dtsi files for the r7s72100 SoC.
v2
* Suggestions by Mark Rutland and Sergei Shtylyov
- Compatible strings should be "one or more" not "one" of those listed
- Describe the generic binding as covering any MTU2 device
- Re-order compat strings from most to least specific
v3
* Suggested by Laurent Pinchart
- Reword compat documentation for consistency with a more extensive
CMT change
(cherry picked from commit
ffd24a543afe4c693d5c611ecfa01cc48e97f97d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 28 Aug 2014 08:11:03 +0000 (10:11 +0200)]
spi: sh-msiof: Add support for new R-Car Gen2 SoCs
Add support for MSIOF in:
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
e221cc99bee4494a99aa8d8525cd7776092ced05)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 7 Aug 2014 12:07:42 +0000 (14:07 +0200)]
spi: sh-msiof: Return early in sh_msiof_dma_once() where possible
Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
a5e7c719fe257214aeda3dadb502a4cf58209a61)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:05 +0000 (14:59 +0200)]
spi: sh-msiof: Add DT support to DMA setup
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
a6be4de6a24cbef6209e3a0fcddaee9e312a1f63)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:04 +0000 (14:59 +0200)]
spi: sh-msiof: Configure DMA slave bus width
The new Renesas R-Car Gen2 DMA Controller driver (rcar-dmac) requires
explicit configuration of the DMA slave bus width.
Hardcode the DMA transfer size to 4 bytes, as MSIOF DMA is limited to
32-bit words.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
52fba2b85d30075490db023642632032371505c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Wed, 3 Sep 2014 10:52:29 +0000 (12:52 +0200)]
drivers: sh: Leave disabling of unused PM domains to genpd
Since genpd at late init, will try to disable unused PM domains we
don't need to do it from here as well.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit
f1bf45c70ffdcf048d046da4ad4611315f1a15bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 27 Aug 2014 04:36:51 +0000 (13:36 +0900)]
clocksource: sh_cmt: Document SoC specific bindings
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
update the Renesas R-Car Compare Match Timer (CMT) driver to follow this
convention.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
* I plan to follow up with patches to use these new bindings in the
dtsi files for the affected SoCs.
v2
* Reorder compat entries so more-specific entries and their fallbacks
are grouped with the fallback entry coming last.
* Explicitly document fallback
v3
* Avoid circular dependency in documentation of fallback
behaviour of renesas,cmt-48-gen2
* Use consistent case for SoC names in compat string descriptions
(cherry picked from commit
01fe3aaa3abd3379788173e0017a6299b5b438db)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Julia Lawall [Fri, 8 Aug 2014 10:07:49 +0000 (12:07 +0200)]
ASoC: rsnd: delete unneeded test before of_node_put
Of_node_put supports NULL as its argument, so the initial test is not
necessary.
Suggested by Uwe Kleine-König.
The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression e;
@@
-if (e)
of_node_put(e);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
a493b6a637e9d8e828d7ed4be4bdf24dfd1f9250)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Philipp Zabel [Fri, 14 Feb 2014 10:53:56 +0000 (11:53 +0100)]
[media] of: move common endpoint parsing to drivers/of
This patch adds a new struct of_endpoint which is then embedded in struct
v4l2_of_endpoint and contains the endpoint properties that are not V4L2
(or even media) specific: the port number, endpoint id, local device tree
node and remote endpoint phandle. of_graph_parse_endpoint parses those
properties and is used by v4l2_of_parse_endpoint, which just adds the
V4L2 MBUS information to the containing v4l2_of_endpoint structure.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
(cherry picked from commit
f2a575f67695dcba9062acd666ae5aab2380b95c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 3 Sep 2014 18:01:55 +0000 (20:01 +0200)]
pinctrl: generic: Fix PIN_CONFIG_DRIVE_OPEN_SOURCE source/drain doc mismatch
PIN_CONFIG_DRIVE_OPEN_SOURCE enables open source, not open drain.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit
0d37899363b0e5486f8800231b7edd75e8b60942)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Peter Foley [Thu, 25 Sep 2014 18:23:37 +0000 (11:23 -0700)]
Documentation: update .gitignore files
Add some missing files to .gitignore.
Push Documentation/.gitignore down into subdirectories.
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
c5e2a7e01269cd9839fef8a5c5ac258277b3b08f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Peter Foley [Thu, 25 Sep 2014 18:23:15 +0000 (11:23 -0700)]
Documentation: make functions static to avoid prototype warnings
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
0421fc837c822e86c76884a30a9155e512a5a66a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 16 Sep 2014 19:58:03 +0000 (21:58 +0200)]
ARM: shmobile: r8a7740 legacy: Fix copied bug in comment
The corresponding bug in pm-sh7372.c was fixed in commit
70fe7b24672a988f ("ARM: shmobile: Do not access sh7372 A4S domain
internals directly").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 15 Sep 2014 13:35:36 +0000 (22:35 +0900)]
ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs
Other R-Car Gen2 SoCs such as r8a7790 and r8a7791 reserve
the top 256 MiB of memory for use with CMA. Adjust the
board-less r8a7794 code to do the same.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
299e14734c22994e69c913e66ab1f4bb56423f5d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 15 Sep 2014 10:21:17 +0000 (12:21 +0200)]
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
The interrupt controller used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
34abee398119acaed0b1fb4318eca5b364cf74e2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Tue, 26 Aug 2014 22:42:56 +0000 (00:42 +0200)]
drm/rcar-du: Use struct videomode in platform data
In preparation for DT support where panel timings will be described by a
DRM-agnostic video mode, replace the struct drm_mode_modeinfo instance
in the panel platform data with a struct videomode.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit
1d46fea7d091f9dc2d4fd3fcb9f0117ca288f9a5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 10 Sep 2014 00:43:31 +0000 (09:43 +0900)]
ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF
The r8a7794 support is always compiled using ARCH_MULTIPLATFORM which
selects USE_OF. So #ifdef CONFIG_USE_OF is unnecessary.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1370078db37de2aa5e906ae2b5dbbb6ba289adb4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 10 Sep 2014 00:44:47 +0000 (09:44 +0900)]
ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
Support for the r8a7794 was recently added.
Enable it in the shmobile_defconfig to increase build coverage.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7d984c95723725d26f3961c1655c20256f0affdf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 9 Sep 2014 06:46:32 +0000 (23:46 -0700)]
ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from lager
sh_mobile_sdhi cares multiblock read bug.
remove MMC_CAP2_NO_MULTI_READ flag from board code
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
9674e9545382153d6a78bb97915ba8e64c1fdf9f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 9 Sep 2014 06:46:10 +0000 (23:46 -0700)]
ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from koelsch
sh_mobile_sdhi cares multiblock read bug.
remove MMC_CAP2_NO_MULTI_READ flag from board code
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
b9409687a8dad8b7207f05c62b9c87d2a766473b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Mon, 8 Sep 2014 00:57:08 +0000 (09:57 +0900)]
ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
48a0d1e07d99ecfd1e5922dd22986d5813f17207)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Mon, 8 Sep 2014 00:57:06 +0000 (09:57 +0900)]
ARM: shmobile: sh73a0: Add CMT1 device to DT
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6a5336a77c2caa9b0f8b3aa5c70310291ce2679d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 8 Sep 2014 00:27:44 +0000 (09:27 +0900)]
ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7740 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a2ffcf87f5ae83dcd02f5b87bf477ce7e474601e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 8 Sep 2014 00:27:48 +0000 (09:27 +0900)]
ARM: shmobile: r8a7779: Use SoC-specific TMU compat string
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7779 TMU
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a51b7b38182918d54813b572d6c28d43082d94ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 8 Sep 2014 00:27:46 +0000 (09:27 +0900)]
ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7791 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4217f323206c50f4a035338c9a09bd24e5bb263a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 8 Sep 2014 00:27:47 +0000 (09:27 +0900)]
ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r7s72100 MTU2
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f401ce481082de6327d12a8dc5528d2f7a4a4445)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Mon, 8 Sep 2014 00:27:45 +0000 (09:27 +0900)]
ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7790 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
37757030b0f9f107cd428ae7dcb34a778a8e5d57)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Fri, 5 Sep 2014 10:23:49 +0000 (12:23 +0200)]
ARM: shmobile: Initial Alt board device tree
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
[uli: reduced to minimum, added cmt, enabled scif2, split off from SoC]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a742795be9ceae2853ca71f216193f29da151da8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>