profile/common/kernel-common.git
9 years agoi2c: rcar: fix MNR interrupt handling
Sergei Shtylyov [Mon, 1 Sep 2014 21:15:26 +0000 (01:15 +0400)]
i2c: rcar: fix MNR interrupt handling

Sometimes the MNR and MST interrupts happen simultaneously  (stop  automatically
follows NACK, according to the manuals) and in such case the ID_NACK flag  isn't
set since the MST interrupt handling precedes MNR and all interrupts are cleared
and disabled then, so that MNR interrupt is never noticed -- this causes NACK'ed
transfers to be falsely reported as successful. Exchanging MNR and  MST handlers
fixes this issue, however the MNR bit  somehow  gets set again even after  being
explicitly cleared, so I decided to completely suppress handling of all disabled
interrupts (which is a good thing anyway)...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: stable@vger.kernel.org
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit dd318b0df27c582ac0d72a346fd6e693700be23c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoASoC: ak4642: Make of_device_id array const
Kiran Padwal [Mon, 28 Jul 2014 06:11:04 +0000 (11:41 +0530)]
ASoC: ak4642: Make of_device_id array const

Make of_device_id array const, because all OF functions handle it as const

Signed-off-by: Kiran Padwal <kiran.padwal21@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 27204ca8b981160c3b65cdc226c9070f76cbbd36)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agousb: host: xhci-plat: add support for the R-Car H2 and M2 xHCI controllers
Yoshihiro Shimoda [Wed, 9 Jul 2014 01:08:52 +0000 (10:08 +0900)]
usb: host: xhci-plat: add support for the R-Car H2 and M2 xHCI controllers

The R-Car H2 and M2 SoCs come with an xHCI controller that requires
some specific initializations related to the firmware downloading and
some specific registers. This patch adds the support for this special
configuration as an xHCI quirk executed during probe and start.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: "mathias.nyman@intel.com" <mathias.nyman@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4ac8918f3a737c21d81e250e4194c12ea2b7eb04)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agousb: host: xhci-plat: use devm_functions
Himangi Saraogi [Fri, 20 Jun 2014 17:41:23 +0000 (23:11 +0530)]
usb: host: xhci-plat: use devm_functions

This patch introduces the use of managed interface devm_ioremap_resource
for ioremap_nocache and request_mem_region and removes the corresponding
free functions in the probe and remove functions.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit fd666348c51f6ab66410c98a149e0418b9a258f0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoxhci: Platform: Set xhci lpm support quirk based on platform data
Pratyush Anand [Fri, 4 Jul 2014 14:01:25 +0000 (17:01 +0300)]
xhci: Platform: Set xhci lpm support quirk based on platform data

If an xhci platform supports USB3 LPM capability then enable
XHCI_LPM_SUPPORT quirk flag.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 20f6fdd01c2c0de9cc1109083222edded24c5350)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoxhci: Platform: Add (en/dis)able_usb3_lpm_timeout
Pratyush Anand [Fri, 4 Jul 2014 14:01:24 +0000 (17:01 +0300)]
xhci: Platform: Add (en/dis)able_usb3_lpm_timeout

To use auto U0-U1/U2 transition by xhci platform device add
(en/dis)able_usb3_lpm_timeout function to the xhci_plat_xhci_driver struct.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Tested-by: Aymen Bouattay <aymen.bouattay@st.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 94ef3d50426240a5402688e8d43a079df5ae21be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: koelsch: Remove non-existent i2c6 pinmux
Geert Uytterhoeven [Thu, 14 Aug 2014 22:19:10 +0000 (07:19 +0900)]
ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux

On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts
refers to non-existent pinmux configuration data:

pinmux core: sh-pfc does not support function i2c6
sh-pfc e6060000.pfc: invalid function i2c6 in map table

Remove it to fix this.

Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile:
       koelsch dts: Add VDD MPU regulator for DVFS")

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Olof Johansson <olof@lixom.net>
(cherry picked from commit 12266db732ff3845eaa9ba9354c4938249787aaf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
Kuninori Morimoto [Wed, 6 Aug 2014 01:24:51 +0000 (18:24 -0700)]
ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR

4bfb358b1d6cdeff8c6a13677f01ed78e9696b98
(ARM: shmobile: Add r8a7791 legacy SDHI clocks)
added r8a7791 SDHI clock support.

But, it is missing
"0x0100: x 1/8" division ratio.
This patch fixes hidden bug.
It is based on R-Car H2 v0.7, R-Car M2 v0.9.

Reported-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 58b80ad6472c0fa12926dfa1f9103d3a326bdf18)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR
Kuninori Morimoto [Wed, 6 Aug 2014 01:24:30 +0000 (18:24 -0700)]
ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR

9f13ee6f83c52065112d3e396e42e3780911ef53
(ARM: shmobile: r8a7790: add div4 clocks)
added r8a7790 DIV4 clock support.

But, it is missing
"0x0100: x 1/8" division ratio.
This patch fixes hidden bug.
It is based on R-Car H2 v0.7, R-Car M2 v0.9.

Reported-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4fb12fe9c34928c1d2bed817e144aec3f44540e9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: defconfig: Remove MACH_GENMAI
Laurent Pinchart [Wed, 16 Jul 2014 12:02:56 +0000 (14:02 +0200)]
ARM: shmobile: defconfig: Remove MACH_GENMAI

The CONFIG_MACH_GENMAI is scheduled for removal so remove it from
shmobile_defconfig.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: revised changelog for updated commit order]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 92db2b7af591d3c3212183a34856b4cb190b6999)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name
Simon Horman [Wed, 16 Jul 2014 00:11:21 +0000 (09:11 +0900)]
ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name

A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1
clock support for DT"). This  patch removes it.

This change should not have any run-time affect at this time as
the clock in question is used by a SCIF device that is not enabled by
default.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2c3758b01aa6f11382d2b018614b5d48ecf30350)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: genmai: remove defconfig
Simon Horman [Tue, 15 Jul 2014 07:29:24 +0000 (16:29 +0900)]
ARM: shmobile: genmai: remove defconfig

The genmai board code is scheduled for removal and once
that occurs the defconfig will be of no use. Remove it.

Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 3ed27bd90d6d0c8b4d686a2468b6d50cc1ef74e4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: add CMT1 clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:53 +0000 (09:54 +0200)]
ARM: shmobile: sh73a0: add CMT1 clock support for DT

This will be used when initialising CMT1 device using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a0f7e7496d56ac2da7c684e2035815318c17973a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: add CMT1 clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:46 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: add CMT1 clock support for DT

This will be used when initialising CMT1 device using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2e11179da78a56c2a44fc3fe097f2af8dc18f9d6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a73a4: add CMT1 clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:35 +0000 (09:54 +0200)]
ARM: shmobile: r8a73a4: add CMT1 clock support for DT

This will be used when initialising CMT1 device using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit aad64dc31954dbbb84cd8fcfaf1bc028f3bc2616)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: add TMU clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:43 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: add TMU clock support for DT

This will be used when initialising TMU devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ef9cb75ca70c8d31b2493d1fd6cbf8b3dd1dec95)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7778: add TMU clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:29 +0000 (09:54 +0200)]
ARM: shmobile: r8a7778: add TMU clock support for DT

This will be used when initialising TMU devices using DT
until common clock framework support is added.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0985f38d1379291c8701572e761c809f0d5f6476)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
Simon Horman [Mon, 7 Jul 2014 07:54:52 +0000 (09:54 +0200)]
ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT

Initialise SCIF device using DT when booting armadillo800eva
using DT reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 700ce7c2bb2a4963472d95eba1436d6b0945918e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: Add SCIF nodes
Simon Horman [Mon, 7 Jul 2014 07:54:51 +0000 (09:54 +0200)]
ARM: shmobile: sh73a0: Add SCIF nodes

This describes all of the SCIF hardware of the sh73a0.
Each node is disabled and may be enabled as necessary
by board DTS files.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2131421b85c9f25082a2b0ec371c7ad0c47cc943)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
Simon Horman [Mon, 7 Jul 2014 07:54:42 +0000 (09:54 +0200)]
ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT

Initialise SCIF device using DT when booting armadillo800eva
using DT reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c4fac6f2f92331fa5788811357f8b8c3352e5ad8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: Add SCIF nodes
Simon Horman [Mon, 7 Jul 2014 07:54:41 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: Add SCIF nodes

This describes all of the SCIF hardware of the r8a7740.
Each node is disabled and may be enabled as necessary
by board DTS files.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit fa12355b24a430729f34c349473b9c0a3d125679)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
Simon Horman [Mon, 7 Jul 2014 07:54:34 +0000 (09:54 +0200)]
ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT

Initialise SCIF device using DT when booting ape6evm
using DT reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 27bc82353a3f214a383d7f3b1ccaefdb70d6c94f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a73a4: Add SCIF nodes
Simon Horman [Mon, 7 Jul 2014 07:54:33 +0000 (09:54 +0200)]
ARM: shmobile: r8a73a4: Add SCIF nodes

This describes all of the SCIF hardware of the r8a73a4.
Each node is disabled and may be enabled as necessary
by board DTS files.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 94f1a03db6988c64601dc84eaf6c8ef1b956d9e7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: bockw-reference: Initialise SCIF device using DT
Simon Horman [Mon, 7 Jul 2014 07:54:28 +0000 (09:54 +0200)]
ARM: shmobile: bockw-reference: Initialise SCIF device using DT

Initialise SCIF device using DT when booting bockw
using DT reference.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5be97ca4a4f6e11c4a839ec3c08dea25589dfeb4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7778: Add SCIF nodes
Simon Horman [Mon, 7 Jul 2014 07:54:27 +0000 (09:54 +0200)]
ARM: shmobile: r8a7778: Add SCIF nodes

This describes all of the SCIF hardware of the r8a7778.
Each node is disabled and may be enabled as necessary
by board DTS files.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9930dc8ee1f59271a54ed4b4922c9c944625a8d6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: sh73a0: add SCI clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:50 +0000 (09:54 +0200)]
ARM: shmobile: sh73a0: add SCI clock support for DT

This will be used when initialising SCI devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ff4ce48e1f163d945c037c1c90ce12950961d91d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7740: correct SCI clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:40 +0000 (09:54 +0200)]
ARM: shmobile: r8a7740: correct SCI clock support for DT

When initialising SCI devices their names will be .serial
not .sci.

This will be used when initialising SCI devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d1ec90f2875471df2c954f7cbd45b2389ff86aa2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a73a4: add SCI clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:32 +0000 (09:54 +0200)]
ARM: shmobile: r8a73a4: add SCI clock support for DT

This will be used when initialising SCI devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9947efaac0545fd833b0ff5147578aba79d297bc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7778: add SCI clock support for DT
Simon Horman [Mon, 7 Jul 2014 07:54:26 +0000 (09:54 +0200)]
ARM: shmobile: r8a7778: add SCI clock support for DT

This will be used when initialising SCI devices using DT
until common clock framework support is added.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7a0c99478dca80f862912be02bf8ec240a9098d1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: lager: use iic cores instead of i2c
Wolfram Sang [Thu, 10 Jul 2014 10:50:56 +0000 (12:50 +0200)]
ARM: shmobile: r8a7790: lager: use iic cores instead of i2c

On Lager board, i2c and iic cores can be interchanged since they can be
muxed to the same wires. Commit e489c2a9bc82713167d9f721ca764f4b0d37e543
("ARM: shmobile: lager: enable i2c devices") activated the i2c cores,
yet the iic cores should be default since they have the more interesting
features for generic use cases, i.e. SMBUS_QUICK and DMA (yet to be
supported).

Reported-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit cb9a2b12e0cb524022c9a81d8ed29f2453ec240d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Lager: Correct I2C bus for VDD MPU regulator
Khiem Nguyen [Fri, 4 Jul 2014 00:19:51 +0000 (09:19 +0900)]
ARM: shmobile: Lager: Correct I2C bus for VDD MPU regulator

I2C bus for VDD MPU regulator is IIC3, not I2C3.

Signed-off-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
Reviewed-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5179ffd099446e65a1e094b9cb17cc7edab45583)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Remove opps table check for cpufreq
Gaku Inami [Wed, 25 Jun 2014 07:58:40 +0000 (16:58 +0900)]
ARM: shmobile: Remove opps table check for cpufreq

This patch is based on feedback from Viresh Kumar.
Since cpufreq-cpu0 driver has already check opp table, there is no
need to same check in mach-shmobile.

Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit e423d12cbcb9576785e891617888f627f1f57bf4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig
Simon Horman [Mon, 7 Jul 2014 13:23:52 +0000 (15:23 +0200)]
ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig

The R-Car Gen 2 PCIe driver provides PCIe host support for
Renesas R-Car Gen2 platforms. To increase hardware support enable
the driver in the shmobile_defconfig multiplatform configuration.

Cc: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 8cbf869a0a278c4d39e50daa4f4101b394a72a93)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: marzen: Consistently use tabs for indentation
Simon Horman [Mon, 7 Jul 2014 06:47:37 +0000 (08:47 +0200)]
ARM: shmobile: marzen: Consistently use tabs for indentation

Unify white space usage by consistently using tabs for indentation.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 08af64097d4c5cb17f9df4dadf80ed5f508db743)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: kzm9g-reference: Remove early_printk from command line
Simon Horman [Mon, 7 Jul 2014 06:50:09 +0000 (08:50 +0200)]
ARM: shmobile: kzm9g-reference: Remove early_printk from command line

As early printk is not supported when devices are initialised
using DT, so remove it from the command line.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0b7324706ea24489a0ddcbd9d472e232520aad80)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: armadillo800eva-reference: Remove early_printk from command line
Simon Horman [Mon, 7 Jul 2014 06:50:08 +0000 (08:50 +0200)]
ARM: shmobile: armadillo800eva-reference: Remove early_printk from command line

As early printk is not supported when devices are initialised
using DT, so remove it from the command line.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit b2386fa51696ffcae82f27ebbdc667b037be5048)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779: Consistently use tabs for indentation
Simon Horman [Mon, 7 Jul 2014 06:47:38 +0000 (08:47 +0200)]
ARM: shmobile: r8a7779: Consistently use tabs for indentation

Unify white space usage by consistently using tabs for indentation.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit cc703a59c0f8769456a7eb0d53a8d709e5c19387)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: henninger: Consistently use tabs for indentation
Simon Horman [Mon, 7 Jul 2014 06:47:36 +0000 (08:47 +0200)]
ARM: shmobile: henninger: Consistently use tabs for indentation

Unify white space usage by consistently using tabs for indentation.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit eb0f12e24f357f1663b4da8c571214d5a11eb011)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: henninger: enable internal PCI
Sergei Shtylyov [Tue, 24 Jun 2014 18:13:38 +0000 (22:13 +0400)]
ARM: shmobile: henninger: enable internal PCI

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 83ccfa8d0c6a734720ed8cd23b97256ffcae156a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: koelsch: enable internal PCI
Sergei Shtylyov [Tue, 24 Jun 2014 18:11:44 +0000 (22:11 +0400)]
ARM: shmobile: koelsch: enable internal PCI

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7540aeb0dd2c830ed490e7227d51bc3050ac798c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add internal PCI bridge nodes
Sergei Shtylyov [Tue, 24 Jun 2014 18:10:05 +0000 (22:10 +0400)]
ARM: shmobile: r8a7791: add internal PCI bridge nodes

Add device nodes for the R8A7791 internal PCI bridge devices.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[horms+renesas@verge.net.au: minor witespace changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit aace0809e9bbbfe1570a298a3284d9802fbf2d1a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND
Arnd Bergmann [Thu, 3 Jul 2014 14:08:30 +0000 (16:08 +0200)]
ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND

Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for
Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init
and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a
build failure when both are present, so this patch removes the one in the .c
file and keeps the inline version.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d358c99838f3cf63ad7536124be4318cc84b11fa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: genmai reference dts: Add RSPI node
Geert Uytterhoeven [Thu, 3 Jul 2014 12:02:45 +0000 (14:02 +0200)]
ARM: shmobile: genmai reference dts: Add RSPI node

Add SPI device for RSPI on Genmai.

On this board, only rspi4 is in use. Its bus contains a single device
(a wm8978 audio codec), for which no bindings are defined yet.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ae6b61840bfa36d4f1d89703a312ce29a52c3a76)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: Fix whitespace errors in pci nodes
Geert Uytterhoeven [Mon, 30 Jun 2014 09:49:53 +0000 (11:49 +0200)]
ARM: shmobile: r8a7790: Fix whitespace errors in pci nodes

Remove spaces in between tabs.

Introduced by commit ff4f3eb8b3386208944fe60b85e6cba4d338198e ("ARM:
shmobile: r8a7790: add internal PCI bridge nodes").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 517ec80a3321e01fd07eeb6098c3d7b455fcca68)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoASoC: fsi: use SNDRV_DMA_TYPE_DEV for sound buffer
Kuninori Morimoto [Mon, 23 Jun 2014 00:55:18 +0000 (17:55 -0700)]
ASoC: fsi: use SNDRV_DMA_TYPE_DEV for sound buffer

Current fsi driver is using SNDRV_DMA_TYPE_CONTINUOUS
for snd_pcm_lib_preallocate_pages_for_all().
But, it came from original dma-sh7760.c,
and no longer needed.
This patch exchange its parameter, and removed
original dma mapping and un-needed
dma_sync_single_xxx() from driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit ffb83e8cb14cace1b08ceb56695b580c808d8a41)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add DVC support for sound node on DTSI
Kuninori Morimoto [Thu, 26 Jun 2014 00:52:33 +0000 (17:52 -0700)]
ARM: shmobile: r8a7791: add DVC support for sound node on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 150c8ad40808189423002ea9fc6a858a3a59e6dc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add DVC support for sound node on DTSI
Kuninori Morimoto [Thu, 26 Jun 2014 00:52:17 +0000 (17:52 -0700)]
ARM: shmobile: r8a7790: add DVC support for sound node on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 334d69a23b177a4ed38e654912444dc48ac46765)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: enable internal PCI
Ben Dooks [Tue, 24 Jun 2014 18:02:21 +0000 (22:02 +0400)]
ARM: shmobile: lager: enable internal PCI

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
[Sergei: enabled PCI0]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d8584660676e00157735abcb34b09d690d96ee16)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add internal PCI bridge nodes
Ben Dooks [Tue, 24 Jun 2014 17:59:54 +0000 (21:59 +0400)]
ARM: shmobile: r8a7790: add internal PCI bridge nodes

Add device nodes for the R8A7790 internal PCI bridge devices.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
[Sergei: added several properties to the PCI bridge nodes]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ff4f3eb8b3386208944fe60b85e6cba4d338198e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Allow r8a7791 to build non-SMP APMU code
Magnus Damm [Fri, 6 Jun 2014 07:21:19 +0000 (16:21 +0900)]
ARM: shmobile: Allow r8a7791 to build non-SMP APMU code

Build the APMU for r8a7791 even though SMP is
disabled in the kernel config. Also initialize
Suspend-to-RAM from pm-r8a7791.c to in the future
cover both UP and SMP use cases of the APMU.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit bfe4cfa8ae21628267f2b879b4396ee17ea4fd3a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c
Magnus Damm [Fri, 6 Jun 2014 07:21:11 +0000 (16:21 +0900)]
ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c

Move r8a7791 specific reset vector setup code from the
SMP glue code to PM code. This makes the code one step
closer to allow PM operations such as Suspend-to-RAM
in the case when SMP is disabled in the kernel config.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: updated for recent header file changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 8e26118d44c4877fa52dc8117692f3cc9af3c769)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Allow r8a7790 to build non-SMP APMU code
Magnus Damm [Fri, 6 Jun 2014 07:21:03 +0000 (16:21 +0900)]
ARM: shmobile: Allow r8a7790 to build non-SMP APMU code

Build the APMU for r8a7790 even though SMP is
disabled in the kernel config. Also initialize
Suspend-to-RAM from pm-r8a7790.c to in the future
cover both UP and SMP use cases of the APMU.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 06f2c5dcc24b026872bfc9b50b47c384638d2111)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7790 reset code to pm-r8a7790.c
Magnus Damm [Fri, 6 Jun 2014 07:20:54 +0000 (16:20 +0900)]
ARM: shmobile: Move r8a7790 reset code to pm-r8a7790.c

Move r8a7790 specific reset vector setup code from the
SMP glue code to PM code. This makes the code one step
closer to allow PM operations such as Suspend-to-RAM
in the case when SMP is disabled in the kernel config.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: updated for recent #include changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 07ce9dfaf477e0d16d40faea251898d5a38d8051)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/pm-r8a7790.c

9 years agoARM: shmobile: Use __init for APMU suspend init function
Magnus Damm [Fri, 6 Jun 2014 07:20:46 +0000 (16:20 +0900)]
ARM: shmobile: Use __init for APMU suspend init function

The function shmobile_smp_apmu_suspend_init() should
be put into the init section to not trigger section
mismatch warnings.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0d77c9aa7a13a9fcfc93836188474f43394ea657)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Adjust APMU code to build for non-SMP
Magnus Damm [Fri, 6 Jun 2014 07:20:18 +0000 (16:20 +0900)]
ARM: shmobile: Adjust APMU code to build for non-SMP

Adjust the APMU code to allow build when CONFIG_SMP=n.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 784500be40a0eabcee1e48c70927aea9c9accb1e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Allow use of boot code for non-SMP case
Magnus Damm [Fri, 6 Jun 2014 07:20:10 +0000 (16:20 +0900)]
ARM: shmobile: Allow use of boot code for non-SMP case

Allow build of platsmp.c and headsmp.S even though
SMP is disabled in the kernel configuration. With
this in place it is possible to share the reset
vector setup code with power management code that
needs to be built even though SMP is disabled.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 8b438bcb9009609a15e5480ab1947acff6fb9005)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7791.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:07 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a7791.h

Change location of r8a7791.h so it can be included as "r8a7791.h"
instead of the old style <mach/r8a7791.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5201b5a792e95e3ecebe74cd3553413a67da09db)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7779.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:05 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a7779.h

Change location of r8a7779.h so it can be included as "r8a7779.h"
instead of the old style <mach/r8a7779.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1b55353c9214788b0d0797a5fd4585af1557a12c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move sh7372.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:08 +0000 (18:53 +0200)]
ARM: shmobile: Move sh7372.h

Change location of sh7372.h so it can be included as "sh7372.h"
instead of the old style <mach/sh7372.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 113522ee3034427472bcb4b8665833719809b31a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move sh73a0.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:09 +0000 (18:53 +0200)]
ARM: shmobile: Move sh73a0.h

Change location of sh73a0.h so it can be included as "sh73a0.h"
instead of the old style <mach/sh73a0.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ded59d6dfc47683d1b810c069ed637e1e60e75fd)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7790.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:06 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a7790.h

Change location of r8a7790.h so it can be included as "r8a7790.h"
instead of the old style <mach/r8a7790.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit fccae89318fda71012f96042dd971a6f9bf0904e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7778.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:04 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a7778.h

Change location of r8a7778.h so it can be included as "r8a7778.h"
instead of the old style <mach/r8a7778.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 02c94f38bf3bcdaaceb1f3486b4dbee1ab550793)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a7740.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:03 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a7740.h

Change location of r8a7740.h so it can be included as "r8a7740.h"
instead of the old style <mach/r8a7740.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 9e38b84b456ab7b2abd28257eec5caee4fb1f5ea)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r8a73a4.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:02 +0000 (18:53 +0200)]
ARM: shmobile: Move r8a73a4.h

Change location of r8a73a4.h so it can be included as "r8a73a4.h"
instead of the old style <mach/r8a73a4.h>

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit fac49568b0d19e039e216ca6d13bc534ebf12c34)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Move r7s72100.h
Geert Uytterhoeven [Fri, 20 Jun 2014 16:53:01 +0000 (18:53 +0200)]
ARM: shmobile: Move r7s72100.h

Change location of r7s72100.h so it can be included using "r7s72100.h"
instead of the old style <mach/r7s72100.h>.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 96bd090066e2150f3970b32f35895de2ab631c95)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Enable genmai board in multiplatform defconfig
Simon Horman [Mon, 16 Jun 2014 10:49:43 +0000 (19:49 +0900)]
ARM: shmobile: Enable genmai board in multiplatform defconfig

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c61010050d3baa3e1a3964bec7e62437d21107c6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add R-Car sound support on DTSI
Kuninori Morimoto [Thu, 12 Jun 2014 04:44:26 +0000 (21:44 -0700)]
ARM: shmobile: r8a7791: add R-Car sound support on DTSI

This patch support PIO transfer only at this point

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 09abd1fd11f98d6abde9c23244234170e7e36c2f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: henninger: Enable PCIe Controller & PCIe bus clock
Phil Edworthy [Fri, 13 Jun 2014 09:37:22 +0000 (10:37 +0100)]
ARM: shmobile: henninger: Enable PCIe Controller & PCIe bus clock

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 485f3ce67c11ce086c322b2622db01d7e7c59a84)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: koelsch: Enable PCIe Controller & PCIe bus clock
Phil Edworthy [Fri, 13 Jun 2014 09:37:21 +0000 (10:37 +0100)]
ARM: shmobile: koelsch: Enable PCIe Controller & PCIe bus clock

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 998d7d64e1aeede4e03b6c67adb78fe55a278db7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: Add PCIe Controller device node
Phil Edworthy [Fri, 13 Jun 2014 09:37:20 +0000 (10:37 +0100)]
ARM: shmobile: r8a7791: Add PCIe Controller device node

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 811cdfae502137a21b91326ed6912a94d3dc7723)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: Add default PCIe bus clock
Phil Edworthy [Fri, 13 Jun 2014 09:37:19 +0000 (10:37 +0100)]
ARM: shmobile: r8a7791: Add default PCIe bus clock

This patch adds a default PCIe bus clock node.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 66c405e72bf332e59ab29461e33a4e94cb8bdd7a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: Add PCIEC clock device tree node
Phil Edworthy [Fri, 13 Jun 2014 09:37:18 +0000 (10:37 +0100)]
ARM: shmobile: r8a7791: Add PCIEC clock device tree node

This patch adds the device tree clock node for the PCIe Controller

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4bfb37675b5343798f5260adad92a67444a9fd47)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: Add PCIe Controller device node
Phil Edworthy [Fri, 13 Jun 2014 09:37:17 +0000 (10:37 +0100)]
ARM: shmobile: r8a7790: Add PCIe Controller device node

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 745329d280c8c73f00724745693658f3d4113ea8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: Add default PCIe bus clock
Phil Edworthy [Fri, 13 Jun 2014 09:37:16 +0000 (10:37 +0100)]
ARM: shmobile: r8a7790: Add default PCIe bus clock

This patch adds a default PCIe bus clock node.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 51d17918077215cd93d78a2b13a3b57090eb1f3d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: Add PCIEC clock device tree node
Phil Edworthy [Fri, 13 Jun 2014 09:37:15 +0000 (10:37 +0100)]
ARM: shmobile: r8a7790: Add PCIEC clock device tree node

This patch adds the device tree clock node for the PCIe Controller

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ecafea8cd261833d7bb857aad76cf2e721821e88)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add MSTP10 support on DTSI
Kuninori Morimoto [Thu, 12 Jun 2014 04:44:16 +0000 (21:44 -0700)]
ARM: shmobile: r8a7791: add MSTP10 support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ee9141522dcf13f861ed3cef6490c6cbfaafefb9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add audio clock on DTSI
Kuninori Morimoto [Thu, 12 Jun 2014 04:44:04 +0000 (21:44 -0700)]
ARM: shmobile: r8a7791: add audio clock on DTSI

audio_clk_a/b/c are required from sound driver

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0d3dbde84a45977cdd7d85115cd5ea1b4ede312e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add R-Car sound support on DTSI
Kuninori Morimoto [Wed, 11 Jun 2014 06:53:54 +0000 (23:53 -0700)]
ARM: shmobile: r8a7790: add R-Car sound support on DTSI

This patch support PIO transfer only at this point

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7df2fd572b9f159657a145f3fdd700d3e00760d9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add MSTP10 support on DTSI
Kuninori Morimoto [Wed, 11 Jun 2014 06:53:27 +0000 (23:53 -0700)]
ARM: shmobile: r8a7790: add MSTP10 support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit bcde37225438687231bb9510c07e60dcb8db1988)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: henninger: add I2C2 DT support
Sergei Shtylyov [Tue, 10 Jun 2014 22:45:21 +0000 (02:45 +0400)]
ARM: shmobile: henninger: add I2C2 DT support

Define the Henninger board dependent part of the I2C2 device node.

Based on the Koelsch I2C2 device tree patch by Wolfram Sang.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 29a647c396a054b087b124372ffb261f40ee9856)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: koelsch: Remove duplicate i2c6 nodes
Simon Horman [Mon, 9 Jun 2014 08:50:28 +0000 (17:50 +0900)]
ARM: shmobile: koelsch: Remove duplicate i2c6 nodes

A second i2c6 node was a added by
05e234a187058ee ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for
DVFS"). Merge this into the existing node.

Also shuffle i2c nodes so they are all together.

Cc: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 897dfdbc14603d764637dea92696fef4fc66ea3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: Remove duplicate i2c3 nodes
Simon Horman [Mon, 9 Jun 2014 02:09:44 +0000 (11:09 +0900)]
ARM: shmobile: lager: Remove duplicate i2c3 nodes

Due to an error when merging df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") a duplicate i2c3 node.

This patch moves the duplicate and moves to old node to
be closer to the other new i2c nodes.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit aca4ec446c646d8794fdbf617d187423a227305d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: Lager memory map update
Magnus Damm [Fri, 6 Jun 2014 06:40:26 +0000 (15:40 +0900)]
ARM: shmobile: Lager memory map update

Update the Lager DTS to make use of the new unified legacy
memory map where the legacy window on Lager and Koelsch
have the same size.

With this change in place the code gets aligned with the
documentation.

After update the Lager board has the following map:
Bank0: 1GiB RAM (Legacy 32-bit: 0x40000000->0x7fffffff)
Bank1: 3GiB RAM (LPAE area: 0x140000000->0x1ffffffff)

Before the update the old map looked like this:
Bank0: 2GiB RAM (Legacy 32-bit: 0x40000000->0xbfffffff)
Bank1: 2GiB RAM (LPAE area: 0x180000000->0x1ffffffff)

Tested with and without LPAE on r8a7790 Lager.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7b16c61a86ce41edd5c42a87f22a0a146968b62f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
Simon Horman [Fri, 6 Jun 2014 07:11:00 +0000 (16:11 +0900)]
ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node

Due to an error when resolving conflicts df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") added the i2c[12]_pins nodes to the wrong
node.

This patch moves them to their correct location in the pfc node.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit d90bf60ceaf453b59c8cd5dbfa59538e27255706)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: add i2c1, i2c2 pins
Ben Dooks [Wed, 12 Feb 2014 17:04:34 +0000 (17:04 +0000)]
ARM: shmobile: lager: add i2c1, i2c2 pins

Add pinctrl definitions for i2c1 and i2c2 busses on the Lager board
to ensure these are setup correctly at initialisation time. The i2c0
and i2c3 busses are connected to single function pins.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[horms+renesas@verge.net.au: Added shmobile to patch title]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit e1a2c4eb132018ce5b988c9ff5ba7a01e5494af5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: enable i2c devices
Ben Dooks [Wed, 12 Feb 2014 17:04:33 +0000 (17:04 +0000)]
ARM: shmobile: lager: enable i2c devices

Add i2c0, i2c1, i2c2 and i2c3 nodes to the Lager reference device tree as
these busses all have devices on them that can be probed even if they
are no drivers yet.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[horms+renesas@verge.net.au: Added shmobile to title]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit e489c2a9bc82713167d9f721ca764f4b0d37e543)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791/koelsch dts: Add DVFS parameters into cpu0 node for r8a7791
Gaku Inami [Tue, 3 Jun 2014 12:03:10 +0000 (21:03 +0900)]
ARM: shmobile: r8a7791/koelsch dts: Add DVFS parameters into cpu0 node for r8a7791

Add needed information inside CPU0 for the generic cpufreq-cpu0 driver.

- voltage-tolerance = 1%
  It reflects the tolerance for the CPU voltage defined inside the OPP
  table. Due to the lack of proper OPP definition, use an arbitrary safe
  value.
- clock-latency = 300 us
  Approximate worst-case latency to do a full DVFS transition for every
  OPPs. Due to the lack of HW information, use an arbitrary safe value.
  Note: The term transition-latency will be more accurate to define this
  value since the clock transition latency is not the only parameter that
  will define the overall DVFS transition.
- operating-points = < kHz - uV >
  List of 6 operating points. All of them are using the same voltage
  since DVS is not supported in R-CAR Gen2.
- clocks
  phandle to the CPU clock source. This clock source is used for all the
  2 CortexA15 located inside the same cluster.

Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a57004eca542428a444025847098b2af4e52a81c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: koelsch dts: Add VDD MPU regulator for DVFS
Gaku Inami [Tue, 3 Jun 2014 12:02:59 +0000 (21:02 +0900)]
ARM: shmobile: koelsch dts: Add VDD MPU regulator for DVFS

The CA15 cluster is capable of voltage scaling. Add the regulator
in the i2c6 node, to allow the generic CPUFreq driver to use it.

Enable the i2c6 pin mux and the device node as well since the
da9210 is connected to that bus.

Note: In R-CAR Gen2, each frequency is using the same voltage,
and DVS control is not used. Therefore, this patch set the
voltage(Vmin/Vmax) to 1000mv.

Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790/lager dts: Add DVFS parameters into cpu0 node for r8a7790
Benoit Cousson [Tue, 3 Jun 2014 12:02:24 +0000 (21:02 +0900)]
ARM: shmobile: r8a7790/lager dts: Add DVFS parameters into cpu0 node for r8a7790

Add needed information inside CPU0 for the generic cpufreq-cpu0 driver.

- voltage-tolerance = 1%
  It reflects the tolerance for the CPU voltage defined inside the OPP
  table. Due to the lack of proper OPP definition, use an arbitrary safe
  value.
- clock-latency = 300 us
  Approximate worst-case latency to do a full DVFS transition for every
  OPPs. Due to the lack of HW information, use an arbitrary safe value.
  Note: The term transition-latency will be more accurate to define this
  value since the clock transition latency is not the only parameter that
  will define the overall DVFS transition.
- operating-points = < kHz - uV >
  List of 6 operating points. All of them are using the same voltage
  since the valid Vmin voltage is not documented in the HW spec.
- clocks
  phandle to the CPU clock source. This clock source is used for all the
  4 CortexA15 located inside the same cluster.

Signed-off-by: Benoit Cousson <bcousson+renesas@baylibre.com>
[gaku.inami.xw@bp.renesas.com: Change the setting of OPPs for ES2.0]
Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit b989e1386385466761f703b8a91e00468bb5ca2a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: lager: Add VDD MPU regulator for DVFS
Benoit Cousson [Tue, 3 Jun 2014 12:02:12 +0000 (21:02 +0900)]
ARM: shmobile: lager: Add VDD MPU regulator for DVFS

The CA15 cluster is capable of voltage scaling. Add the regulator
in the i2c3 node, to allow the generic CPUFreq driver to use it.

Enable the i2c3 pin mux and the device node as well since the
da9210 is connected to that bus.

Note: In R-CAR Gen2, each frequency is using the same voltage,
and DVS control is not used. Therefore, this patch set the
voltage(Vmin/Vmax) to 1000mv.

Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
[gaku.inami.xw@bp.renesas.com: Changes Vmin for disabling DVS]
Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 05f72e03b7553958609d1475c79491f90e6b50d3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks
Geert Uytterhoeven [Mon, 2 Jun 2014 13:42:07 +0000 (15:42 +0200)]
ARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks

Add clocks for the SYS-DMAC0 and SYS-DMAC1 hardware blocks.

Cfr. the r8a7790 version by Ben Dooks.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 4e074bc8114f0ba8a2e0a69fb459564814c9e966)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add USB3.0 clocks to device tree
Yoshihiro Shimoda [Tue, 3 Jun 2014 06:57:05 +0000 (15:57 +0900)]
ARM: shmobile: r8a7791: add USB3.0 clocks to device tree

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 308f306283894a0d3eeee7d1030289e4e668d49d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add USB3.0 clocks to device tree
Yoshihiro Shimoda [Tue, 3 Jun 2014 06:54:19 +0000 (15:54 +0900)]
ARM: shmobile: r8a7790: add USB3.0 clocks to device tree

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 35b5da7b0abfda695924bef011995031f4f3dcfe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: marzen: Do not use workaround for scif devices
Simon Horman [Thu, 15 May 2014 11:39:33 +0000 (20:39 +0900)]
ARM: shmobile: marzen: Do not use workaround for scif devices

Now that SCIF devices are initialised using DT it should
not be necessary to use the work around to provide clocks any more.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit c1a0f9932b66b2298163c31f8ac3f2844476e1c2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: marzen: Initialise SCIF devices using DT
Simon Horman [Thu, 15 May 2014 11:39:32 +0000 (20:39 +0900)]
ARM: shmobile: marzen: Initialise SCIF devices using DT

Initialise SCIF devices using DT when booting marzen
using multiplatform.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 6d4abd79c80742629477479b01077bb92eccdd53)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779: Add scif nodes to dtsi
Simon Horman [Thu, 15 May 2014 11:39:30 +0000 (20:39 +0900)]
ARM: shmobile: r8a7779: Add scif nodes to dtsi

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit fd953b89f44e541bc584a65ba046d1b4cf77840f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
Geert Uytterhoeven [Fri, 23 May 2014 07:46:19 +0000 (09:46 +0200)]
ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks

Warning (ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1)
Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)

As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from
"<2>" to "<1>", and update the affected "reg" properties to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 5cc8afcbc47c5f33732fb1a4b37a35841e7494e8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
Geert Uytterhoeven [Fri, 23 May 2014 07:46:20 +0000 (09:46 +0200)]
ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks

  - Correct the unit-address for the "cpg_clocks" node,
  - Add missing unit-addresses for the "mstp*_clks" nodes,
  - Rename "cpg_clocks" and "mstp*_clks" nodes to the more generic
    "clocks".

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 2909b8746d6f5534aa7714d2df110b3633a59556)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7779: Remove unused r8a7779_init_delay()
Simon Horman [Fri, 16 May 2014 04:43:01 +0000 (13:43 +0900)]
ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay()

Remove the now unused r8a7779_init_delay() function.

Based on work for the r8a7740 SoC by Magnus Damm.

Cc: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit daab540e3a2afeb8c087a67dfaee5aa50a29e844)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: marzen-reference: Use DT CPU Frequency
Simon Horman [Fri, 16 May 2014 04:43:00 +0000 (13:43 +0900)]
ARM: shmobile: marzen-reference: Use DT CPU Frequency

Convert the Marzen DT reference board support to use shmobile_init_delay()
to be able to migrate away from per-SoC delay setup functions.

Based on work for the Armadillo800 EVA board by Magnus Damm.

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