Sergei Shtylyov [Wed, 19 Feb 2014 23:20:43 +0000 (02:20 +0300)]
ARM: shmobile: r8a7790: add Ether DT support
Define the generic R8A7790 part of the Ether device node.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d8913c6799ed776d096a7f41d83afce815f93819)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Wed, 19 Feb 2014 03:28:11 +0000 (19:28 -0800)]
ARM: shmobile: r8a7790: add sound SCU clock support
This is needed to use SRC (= Sampling Rate Converter).
MSTP1017 is defined top of MSTPxxx list to avoid runtime error,
since it is parent clock of MSTP1031 - MSTP1022
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9ced1d47719b5f32e4231338dd362c136518ed08)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 19 Feb 2014 17:03:31 +0000 (18:03 +0100)]
ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices
Now that the r8a7791 DT platforms use the common clock framework,
there's no need to manually create clock aliases for devices
instantiated through DT, as those devices will reference their clocks
directly in the device tree. Remove those aliases.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a8a8266229787241e1dfdb075a416e31da2fa1d7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 17 Feb 2014 06:35:10 +0000 (15:35 +0900)]
ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins()
Remove __init from rcar_gen2_read_mode_pins() to allow
it to be used after boot. For instance the R-Car Gen2
MD21 check is needed even in the case of CPU Hotplug.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e7509f6eca10cff3933f8a71f4ca9d8be8447ec3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Keita Kobayashi [Wed, 15 Jan 2014 12:26:13 +0000 (21:26 +0900)]
ARM: shmobile: r8a7790 CA15-SCU enablement
Power on CA15 SCU in case of booting from a CA7 core.
Signed-off-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c2c97ec513b503b9e0d28ffd98d54c9e9bf3ea3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Gaku Inami [Wed, 15 Jan 2014 12:26:04 +0000 (21:26 +0900)]
ARM: shmobile: r8a7790 CA7-SCU enablement
Power on CA7 SCU in case of booting from a CA15 core.
Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0445ded61aac0c1a6f43b4be1a2ca2ca47b77eb8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Hisashi Nakamura [Wed, 15 Jan 2014 12:25:49 +0000 (21:25 +0900)]
ARM: shmobile: r8a7790 SYSC setup code
Add r8a7790 SYSC power management support.
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
[damm@opensource.se: Converted to use broken out SYSC code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a48f165509c18d47f1505888a21918e8a06d590f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 15 Jan 2014 07:43:08 +0000 (16:43 +0900)]
ARM: shmobile: Break out R-Car SYSC PM code
Break out the R-Car SYSC power management code from
the r8a7779 SoC code. With this new shared R-Car SYSC
code base it is possible to hook in Generation 2 SoCs
as well.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a6557eb795edcf7832b5278a11842c4ca302f4af)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 5 Feb 2014 05:36:28 +0000 (14:36 +0900)]
ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791
Some on-chip devices on r8a7790 and r8a7791 can do
bus mastering and access more than 32-bits of address
space. Select ARCH_DMA_ADDR_T_64BIT when LPAE is set
in case of multiplatform and legacy SoC support.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4a51856b42672cfcb7d6fbab22dcf2caba2be5ab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 12 Feb 2014 04:09:37 +0000 (13:09 +0900)]
ARM: shmobile: Remove legacy r8a7790 DT clocks
The DT device case is handled by CCF these days, so get
rid of DT devices from the legacy clocks for r8a7790.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
df55f6685a04a259cf59cd3fde02212b294461cc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 12 Feb 2014 04:26:01 +0000 (13:26 +0900)]
ARM: shmobile: Add r8a7791 legacy SDHI clocks
Add legacy r8a7791 SDHI clocks. This to allow the SDHI devices
to be used by legacy Koelsch board support.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4bfb358b1d6cdeff8c6a13677f01ed78e9696b98)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Sun, 15 Dec 2013 07:24:53 +0000 (16:24 +0900)]
ARM: shmobile: r7s72100: Add clock for r7s72100-ether
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0e7ed0c1613aea101205b4e0413f75ef8141bf3d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:00 +0000 (16:24 +0100)]
ARM: shmobile: r8a7791 clock: add QSPI clocks
The QSPI clock divider value depends on the MD1, MD2, and MD3 mode
switches.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d2eec3d5251216942e1d425300686f1a18bc615d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:23:58 +0000 (16:23 +0100)]
ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT
Add DT-style ("%08x.spi") clocks, as Genmai doesn't use the common
clock framework yet.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3fc3e908d25ad04de1a01b3f659ecabefcca74c5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:23:55 +0000 (16:23 +0100)]
ARM: shmobile: r7s72100 clock: Add RSPI clocks
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d9409fb8f30437b68647613e1f0d61b332de30be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 14 Jan 2014 02:25:39 +0000 (18:25 -0800)]
ARM: shmobile: r8a7790: add audio clock
Current audio clock doesn't have dependency to device/driver,
but, it is not good design for DT support.
To avoid branch merge conflict issue,
it uses this load map, and this patch is 1) part.
1) add old/new style clock in platform
2) add new style clock method in driver
3) remove old tyle clock from platform
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c7c2ec3a1881b93c211d0754b39f08b5a75459d8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 14 Jan 2014 02:25:27 +0000 (18:25 -0800)]
ARM: shmobile: r8a7778: add audio clock in new style
Current audio clock doesn't have dependency to device/driver,
but, it is not good design for DT support.
To avoid branch merge conflict issue,
it uses this load map, and this patch is 1) part.
1) add new style clock in platform
2) add new style clock method in driver
3) remove old tyle clock from platform
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ba349c08bea1bfddddb7cfc0af140d368274f869)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Rob Herring [Fri, 31 Jan 2014 21:36:10 +0000 (15:36 -0600)]
ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform
Many V6 and V7 platforms have an L2x0 cache, so make
CONFIG_MIGHT_HAVE_CACHE_L2X0 visible for V6 and V7 multi-platform
builds.
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit
9352b05b6e4ef1aae53744cbd0adc0491fae5be0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Rob Herring [Fri, 31 Jan 2014 21:32:02 +0000 (15:32 -0600)]
ARM: select HAVE_SMP for V7 multi-platform
All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for V7
multi-platform builds.
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit
90bc8ac77dc85d2184da3d5280215b33253adffc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Rob Herring [Fri, 22 Nov 2013 15:29:37 +0000 (09:29 -0600)]
ARM: centralize common multi-platform kconfig options
Multi-platform requires various kconfig options to be selected, so
platforms don't need to select them individually.
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit
ddb902cc34593ecb88c368f6e15db3cf829c56fe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-omap2/Kconfig
arch/arm/mach-tegra/Kconfig
Paul Bolle [Sun, 16 Feb 2014 19:46:20 +0000 (20:46 +0100)]
usb: host: remove selects of USB_ARCH_HAS_?HCI
USB_ARCH_HAS_EHCI, USB_ARCH_HAS_OHCI, and USB_ARCH_HAS_XHCI were just
removed. Selecting them is a nop. The select statements for these
symbols can be removed too.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
f6723b569a67aa4042b4ddc72822bf7f4395f3d2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Mon, 17 Feb 2014 21:19:19 +0000 (22:19 +0100)]
ARM: shmobile: r7s72100: update defconfig for I2C usage
Select the correct I2C driver and activate EEPROM support to have a
slave device for testing. Also activate i2c-dev, so i2c-tools will work.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7573e89ba1fcbe492c52d5b1e72fcf5d23da21d1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Mon, 17 Feb 2014 21:19:18 +0000 (22:19 +0100)]
ARM: shmobile: genmai: adapt dts to use native i2c driver
Activate the shiny new riic driver for i2c2. Tested by accessing the
eeprom on the genmai board.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
367aaaea1d6c6496695ffd06b49590b8cfcb8aa5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Mon, 17 Feb 2014 21:19:17 +0000 (22:19 +0100)]
ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c81a4d3dfd33e097d3eef89e4eb830effb8b8d31)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Mon, 17 Feb 2014 10:44:42 +0000 (11:44 +0100)]
ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
38c53516729925d2123ed800e5f4182d77e450a6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Mon, 17 Feb 2014 10:44:41 +0000 (11:44 +0100)]
ARM: shmobile: r8a7791: add i2c master nodes to dtsi
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5bd3de7ba7b28c885d534260800693fe57e55ec8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 17 Feb 2014 07:19:45 +0000 (16:19 +0900)]
ARM: shmobile: Remove Lager DT reference legacy clock bits
Lager DT reference is these days built for multiplatform
only which means that CCF comes with the package. Remove
unused legacy code ifdefs to clean up the code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6197c08ab81cf1430cbe7346fd6ca0b5a18580bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 17 Feb 2014 07:21:28 +0000 (16:21 +0900)]
ARM: shmobile: Remove Koelsch DT reference legacy clock bits
Koelsch DT reference is these days built for multiplatform
only which means that CCF comes with the package. Remove
unused legacy code ifdefs to clean up the code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
34b6a241de1d965b1c047a97fad602687218a866)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 17 Feb 2014 07:24:19 +0000 (16:24 +0900)]
ARM: shmobile: Remove KZM9D board code
Get rid of KZM9D board code written in C. This version of the
C board code was used in the case of multiplatform, but these
days DT can be used instead, so because of that simply get rid
of the C code to simplify and save space.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1ee101d9c416823f960a4841ef81044d461034b5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Thu, 13 Feb 2014 06:39:47 +0000 (15:39 +0900)]
ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfig
Enable the following:
* regulators (needed for SDHI)
* SDHI
* GPIO
* GPIO keys
* GPIO LEDs
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
62f95adf45722e14338d80d2bcfce2e00ad86026)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Thu, 13 Feb 2014 08:26:28 +0000 (17:26 +0900)]
ARM: shmobile: Get rid of legacy KZM9D defconfig
Get rid of the kzm9d_defconfig. The KZM9D is now supported
as DT only in case of EMEV2 is selected in the kernel
configuration.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
30023bb4fae3eb30106c5f8986fc7ac87387aebc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 15 Feb 2014 01:37:32 +0000 (04:37 +0300)]
ARM: shmobile: Genmai: set proper DMA masks for Ether device
Ether MAC is a DMA-capable device and so should have 'dev.dma_mask' and
'dev.coherent_dma_mask' fields set properly, to reflect 32-bit DMA addressing
ability.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
583e2448629cc9fb3b1a0c850ddbe06819421d3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 15 Feb 2014 01:36:19 +0000 (04:36 +0300)]
ARM: shmobile: Koelsch: set proper DMA masks for Ether device
Ether MAC is a DMA-capable device and so should have 'dev.dma_mask' and
'dev.coherent_dma_mask' fields set properly, to reflect 32-bit DMA addressing
ability.
Currently, the code works without DMA masks but as we would have to enable
CONFIG_HIGHMEM to access the full board memory in the future, when support for
NETIF_F_SG would be added to the 'sh_eth' driver as well, the correct DMA masks
should start to matter...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
379bfd7134bccccf58962b39e504bd639a5e75b2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 15 Feb 2014 01:30:20 +0000 (04:30 +0300)]
ARM: shmobile: Lager: set proper DMA masks for Ether device
Ether MAC is a DMA-capable device and so should have 'dev.dma_mask' and
'dev.coherent_dma_mask' fields set properly, to reflect 32-bit DMA addressing
ability.
Currently, the code works without DMA masks but as we would have to enable
CONFIG_HIGHMEM to access the full board memory in the future, when support for
NETIF_F_SG would be added to the 'sh_eth' driver as well, the correct DMA masks
should start to matter...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5d5a87a5b6572426f8eae6e26ebcf9664d2d001a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 15 Feb 2014 01:28:43 +0000 (04:28 +0300)]
ARM: shmobile: BOCK-W: set proper DMA masks for Ether device
Ether MAC is a DMA-capable device and so should have 'dev.dma_mask' and
'dev.coherent_dma_mask' fields set properly, to reflect 32-bit DMA addressing
ability.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ca6da5319761308e38bb97af9030d16e223355d1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 15 Feb 2014 01:26:52 +0000 (04:26 +0300)]
ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device
Ether MAC is a DMA-capable device and so should have 'dev.dma_mask' and
'dev.coherent_dma_mask' fields set properly, to reflect 32-bit DMA addressing
ability.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
78060840cd2286c0e382641e60dcd4145f82f881)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Sun, 16 Feb 2014 09:40:58 +0000 (10:40 +0100)]
ARM: shmobile: r8a7790: add i2c aliases to dtsi
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6b1d7c68b255be81ef174d9621869fde5c95bc20)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Sun, 16 Feb 2014 09:40:57 +0000 (10:40 +0100)]
ARM: shmobile: r8a7790: remove superfluous interrupt-parents
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
951dc909b22afd52f57e1f74e86415941a057d31)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Sun, 16 Feb 2014 09:40:54 +0000 (10:40 +0100)]
ARM: shmobile: r8a7791: remove superfluous interrupt-parents
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9db389f29e2c9660e22e20bf53aec07c669d0eae)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:32:01 +0000 (22:32 +0100)]
ARM: shmobile: koelsch-reference: Add DU device to DTS
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: broken out of larger patch that
included board changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
afba941c18985ffd473f7bad85f89eb7c7121de4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:32:01 +0000 (22:32 +0100)]
ARM: shmobile: koelsch-reference: Add DU device
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: omitted DTS portion]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
14c5ce178ee46b205ff4e9087d5ecba298798edc)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:32:00 +0000 (22:32 +0100)]
ARM: shmobile: koelsch-reference: Refactor clock lookup hack
Make the clock lookup hack more generic to ease the addition of more
devices.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
189ef3d62df6701e58d216cf81277b88bb4ac7a8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:31:59 +0000 (22:31 +0100)]
ARM: shmobile: lager-reference: Add DU device
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: omitted DTS portion]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
433aa851d4b32dc3b3de1e84dc20b57e157b25b9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:31:59 +0000 (22:31 +0100)]
ARM: shmobile: lager: Add DU device to DTS
The DU device has no DT bindings yet, instantiate it as a platform
device for now.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: broken out of larger patch that
included board changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3024f507e1dc2b30fc64ed6106db6aea6e69cf0b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Sun, 16 Feb 2014 21:31:58 +0000 (22:31 +0100)]
ARM: shmobile: lager-reference: Refactor clock lookup hack
Make the clock lookup hack more generic to ease the addition of more
devices.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9a8c3ab9c0286a6c81012eaf9e95ec2d3e58d21f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Fri, 14 Feb 2014 03:29:48 +0000 (12:29 +0900)]
ARM: shmobile: lager: Add internal USB PCI support
This adds internal PCI USB host devices to R-Car H2 Lager board.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
[damm@opensource.se: Rebased and reworked to only include USB1 and USB2]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
849f7b6c10d8016b55e13b7ad2e9f299e2da817b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Fri, 14 Feb 2014 00:15:54 +0000 (09:15 +0900)]
ARM: shmobile: Add defconfig for shmobile multiplatform
This is intended to be a base for a defconfig to cover all
shmobile multiplatform boards. It currently includes configuration
for the following boards:
* KZM9D
* Lager
* Koelsch
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Magnus Damm <damm@opensource.se>
(cherry picked from commit
8a76f048dc7fff769aa899f5ffc7975b57de0b16)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 10 Feb 2014 13:42:19 +0000 (14:42 +0100)]
ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
"ARM: shmobile: r8a7778: add I2C support on DTSI" was applied twice:
commit
ae4273ec7b25c8b9c895a4aae31f2fced980b7bf
commit
3acb51b9215bd99da403ecf8200f8425176b1926
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
08517b212726e90b1755e3c917ba064b24e97cbe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 13 Feb 2014 05:43:19 +0000 (21:43 -0800)]
ARM: shmobile: lager: add SDHI0/2 support on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c6119944a421c416818a9ff11f8bd77aa4d683a5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 10 Feb 2014 10:47:31 +0000 (11:47 +0100)]
ARM: shmobile: lager defconfig: Enable RSPI and MTD_M25P80
This enables support for the Spansion s25fl512s SPI FLASH on QSPI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
917163578a3dcfa3bfc05cc3bfc2653e2994971b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 10 Feb 2014 10:47:30 +0000 (11:47 +0100)]
ARM: shmobile: lager dts: Add QSPI nodes
Add pinctrl and SPI devices for QSPI on Lager.
Add Spansion s25fl512s SPI FLASH and MTD partitions.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9fe7c4f810a7e82c4a1a9765017f9cb2c2b40a65)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 10 Feb 2014 10:47:29 +0000 (11:47 +0100)]
ARM: shmobile: r8a7790 dtsi: Add QSPI node
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7053e134a17d29e023dd4c55643ea4af9c534ccf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 10 Feb 2014 10:47:28 +0000 (11:47 +0100)]
ARM: shmobile: lager legacy: Add QSPI pinmux
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
248deabbd4a2f4c696338536fdaad3a01f66bee7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 13 Feb 2014 04:29:24 +0000 (20:29 -0800)]
ARM: shmobile: lager: add SDHI0/2 support
SDHI0 (CN8) needs JP/SW settings
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
40e6a51e0cf44e944eed29697eb849140bf8258f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 12 Feb 2014 04:26:21 +0000 (13:26 +0900)]
ARM: shmobile: Add SDHI devices for legacy Koelsch
Add SDHI0, SDHI1 and SDHI2 as platform devices to the
legacy Koelsch board code. Also include regulators that
are needed to control VCCQ and VDD.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d12e699f44b8277b7b72b546c69948a2f20514f8)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 4 Dec 2013 04:12:20 +0000 (13:12 +0900)]
ARM: shmobile: genmai: Enable r7s72100-ether
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
(cherry picked from commit
03fec7dee502d43114f384a1588ce84a3c9bf38d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:23:57 +0000 (16:23 +0100)]
ARM: shmobile: genmai defconfig: Enable RSPI
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
8f33d31ee270f2a6bcc661815a520f76565674c3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:02 +0000 (16:24 +0100)]
ARM: shmobile: koelsch defconfig: Enable RSPI and MTD_M25P80
This enables support for the Spansion s25fl512s SPI FLASH on QSPI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
201bd5ddcd9f11bb3942a062f0e907c3edc61f87)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:05 +0000 (16:24 +0100)]
ARM: shmobile: lager legacy: Switch QSPI to named IRQs
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a70eda7e40d09b8bf1a817488a255ce907587a71)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:04 +0000 (16:24 +0100)]
ARM: shmobile: koelsch dts: Add QSPI nodes
Add pinctrl and SPI devices for QSPI on Koelsch.
Add Spansion s25fl512s SPI FLASH and MTD partitions.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e02ee513eed4bb780848a5cedbd4b39afb395d3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:03 +0000 (16:24 +0100)]
ARM: shmobile: r8a7791 dtsi: Add QSPI node
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4d5b59cde5b900a1f4a3a07a7a7b709dac1938f9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:24:01 +0000 (16:24 +0100)]
ARM: shmobile: koelsch legacy: Add QSPI support
Enable support for the Spansion s25fl512s SPI FLASH on the Koelsch board:
- Add QSPI platform device, resources, platform data, and pinmux,
- Add FLASH data and MTD partitions.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
bcca4e8e5b6383cea9a2b310d5a964d8db18b9c7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:23:59 +0000 (16:23 +0100)]
ARM: shmobile: r7s72100 dtsi: Add RSPI nodes
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4b18e83f5d77c783d2d2092d0015ccda5fecaa8c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 4 Feb 2014 15:23:56 +0000 (16:23 +0100)]
ARM: shmobile: genmai legacy: Add RSPI support
Add RSPI platform device, resources, platform data, and SPI child.
On this board, only rspi4 is in use. Its bus contains a single device
(a wm8978 audio codec).
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
664517474c4993c5d560d0e394c36583b7c99535)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Thu, 6 Feb 2014 08:54:02 +0000 (17:54 +0900)]
Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY"
This reverts commit
317af6612ee29dfcb5ae04df9c58e9f79fc8d4ff.
This seems to prevent the board from booting now that the tree has been
rebased on v3.14-rc1.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 14 Jan 2014 02:26:00 +0000 (18:26 -0800)]
ARM: shmobile: lager: add sound support on defconfig
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
90bdadf5b05be16e7ba663ba8b9e42d20dcef861)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Tue, 14 Jan 2014 02:25:50 +0000 (18:25 -0800)]
ARM: shmobile: lager: add sound support
This patch adds sound support for Lager board.
But, it is using PIO transfer at this point.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms+renesas@verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d58922ce8cadba7e758608fef9438bc183b46b0f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 29 Jan 2014 23:10:29 +0000 (08:10 +0900)]
ARM: shmobile: Lager USB0 cable detection workaround
Add Lager board code to check the PWEN GPIO signal and refuse to
allow probe of the USBHS driver in case of DIP misconfiguration.
For correct operation Lager DIP switches SW5 and SW6 shall be
configured in 2-3 position to enable USB Function support.
If the DIP switch is configured incorrectly then the user can
simply adjust the hardware and either reboot or use the bind interface
to try to probe again:
# echo renesas_usbhs > /sys/bus/platform/drivers/renesas_usbhs/bind
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
36be7686caa05334ca8d52df157b373a41d8d9f1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 31 Jan 2014 05:39:40 +0000 (21:39 -0800)]
ARM: shmobile: bockw: use wp-gpios instead of WP pin
Latest Renesas Chip has some SDHI channels and the WP pin
availability depends on its channel or HW implementation.
Thus, this patch decides new policy whch indicates
WP is disabled as default.
But, we can use wp-gpios property to enable it as
other method.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f729dd554e9a04a55950693ea8eca0d3aaa28d22)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Tue, 4 Feb 2014 18:48:22 +0000 (22:48 +0400)]
ARM: shmobile: koelsch: Enable I2C in defconfig
This enables I2C support in koelsch_defconfig.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ab44f75f1142edde5737203a0d259853f34686fb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Tue, 4 Feb 2014 18:48:20 +0000 (22:48 +0400)]
ARM: shmobile: koelsch: Add I2C support
This adds I2C[1245] busses support to Koelsch board.
I2C[03] do not have any slave devices connected and
are not used because of the following:
* I2C0 pins are multiplexed with LBSC pins;
* I2C3 pins are multiplexed with EtherMAC and VIN0 pins.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
12c1d5a54e874f26d08fa27f13f63ef7ccf38a2a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 4 Feb 2014 15:55:32 +0000 (18:55 +0300)]
ARM: shmobile: Koelsch: pass Ether PHY IRQ
Pass Ether's PHY IRQ (which is IRQC's IRQ0) to the 'sh_eth' driver. Set the IRQ
trigger type to be low-level as per the Micrel PHY driver's setup.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
29d9f010d7103f2b83ce1c25999a6f3a1e57f5e2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 4 Feb 2014 15:53:50 +0000 (18:53 +0300)]
ARM: shmobile: Lager: pass Ether PHY IRQ
Pass Ether's PHY IRQ (which is IRQC's IRQ0) to the 'sh_eth' driver. Set the IRQ
trigger type to be low-level as per the Micrel PHY driver's setup.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5812b8b2bcc35e7928c0e5616bbe35a0e97c7749)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 29 Jan 2014 23:10:09 +0000 (08:10 +0900)]
ARM: shmobile: Remove Lager USBHS UDC ifdefs
Remove ifdefs to make the Lager USBHS device always present.
This makes it more like other devices, no need to be special.
Also, these ifdefs by themselves do not hurt much, but combined
with USB Host device ifdefs that were proposed earlier we could
basically end up with a kernel that drives VBUS incorrectly
depending on the kernel configuration - lets not do that.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
235cda29e4d5047622ff9b82b1f0b4cb6cf95f6c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Fri, 24 Jan 2014 22:28:47 +0000 (02:28 +0400)]
ARM: shmobile: lager: Add USBHS support
This adds USBHS PHY and registers USBHS device if the driver is enabled.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1eabe028f8aacd7367fbdda9596cd3d64659a49f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Tue, 14 Jan 2014 18:43:27 +0000 (18:43 +0000)]
ARM: shmobile: koelsch: fix error return code check from clk_get()
The koelsch_add_standard_devices() function calls clk_get() but then fails
to check that it returns an error pointer instead of NULL on failure.
This was added by
f31239ef ("ARM: shmobile: koelsch-reference:
Instantiate clkdevs for SCIF and CMT") in Simon Horman's
renesas-boards2-for-v3.14 tag.
The issue is not serious as it does not cause a crash and seems to not be
actually causing any issues now the other clock bugs have been fixed.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[horms+renesas@verge.net.au: tweaked changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ca1187521b78ce4f980cd1b457f8c634dd401021)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Tue, 14 Jan 2014 18:43:26 +0000 (18:43 +0000)]
ARM: shmobile: lager: fix error return code check from clk_get()
The lager_add_standard_devices() function calls clk_get() but then fails
to check that it returns an error pointer instead of NULL on failure.
This was added by
4a606af2 ("ARM: shmobile: lager-reference: Instantiate
clkdevs for SCIF and CMT") patch in Simon Horman's renesas-boards2-for-v3.14
tag.
The issue is not serious as it does not cause a crash and seems to not be
actually causing any issues now the other clock bugs have been fixed.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[horms+renesas@verge.net.au: tweaked changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7a543d8124e7e23190d36e7c57d3b9c394c4e4c1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 7 Jan 2014 06:23:47 +0000 (15:23 +0900)]
ARM: shmobile: marzen: Conditionally select SMSC_PHY
The marzen board uses has an SMSC911X ethernet controller which uses an
SMSC phy. Select SMSC_PHY for marzen if SMSC911X is enabled to make use of the
SMSC-specific phy driver rather than relying on the generic phy driver.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
317af6612ee29dfcb5ae04df9c58e9f79fc8d4ff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 7 Jan 2014 06:23:47 +0000 (15:23 +0900)]
ARM: shmobile: mackerel: Conditionally select SMSC_PHY
The mackerel board uses has an SMSC911X ethernet controller which uses an
SMSC phy. Select SMSC_PHY for mackerel if SMSC911X is enabled to make use of the
SMSC-specific phy driver rather than relying on the generic phy driver.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c5c2a294a4b24778cd3cab880bf05becee471edb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 7 Jan 2014 06:23:47 +0000 (15:23 +0900)]
ARM: shmobile: kzm9d: Conditionally select SMSC_PHY
The kzm9d board uses has an SMSC911X ethernet controller which uses an
SMSC phy. Select SMSC_PHY for kzm9d if SMSC911X is enabled to make use of the
SMSC-specific phy driver rather than relying on the generic phy driver.
This only covers the case of multiplatform kzm9d
as there is currently no Kconfig node for non-multiplatform kzm9d.
One could be added if desired.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
682100f59c0051e2b6f5af294da79df2419db157)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:57:59 +0000 (16:57 -0800)]
ARM: shmobile: ape6evm: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
0771ddff31186836f62a20c42e7958bd37f7b4ed)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:57:49 +0000 (16:57 -0800)]
ARM: shmobile: armadillo: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
a3b74d3e45f2e28e7c57d5c16a94b59c1a68dd09)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:57:39 +0000 (16:57 -0800)]
ARM: shmobile: bockw: enable CONFIG_DEVTMPFS in defconfig
This reverts commit
e14ee5deab24200e4b70fe31a8c806f0acd3d37c
("ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig").
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
[horms+renesas@verge.net.au: Added subject of reverted commit to changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f921163add46d0dd8321f9d59496bbc17fb38850)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:57:24 +0000 (16:57 -0800)]
ARM: shmobile: genmai: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
2304de6ef7479b12fa4529c12a53cac631a2c67b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:57:04 +0000 (16:57 -0800)]
ARM: shmobile: kzm9d: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
c5aa40f8485b9b6aaeae14e5bddd5e569829ac2f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:56:55 +0000 (16:56 -0800)]
ARM: shmobile: kzm9g: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
19bc39274b42052a198ae836c059652b65e2a21e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:56:33 +0000 (16:56 -0800)]
ARM: shmobile: lager: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
[horms+renesas@verge.net.au: resolved trivial conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6ea8b5ff7ca2d200875ddd774faa8ca40d990d86)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:56:17 +0000 (16:56 -0800)]
ARM: shmobile: mackerel: enable CONFIG_DEVTMPFS in defconfig
DEVTMPFS is needed for udev
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
97b3fbccfae2d1fee679073f1690e2428868754c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 30 Jan 2014 00:56:01 +0000 (16:56 -0800)]
ARM: shmobile: marzen: enable CONFIG_DEVTMPFS in defconfig
This reverts commit
41307133da4b6f242ecbb45950b9d043c0b21b96
("ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig").
DEVTMPFS is needed for udev.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
[horms+renesas@verge.net.au: Added subject of reverted patch to changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
edcde600a0bf778d98d945bd27f51c941e35bb8c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Thu, 9 Jan 2014 14:24:37 +0000 (18:24 +0400)]
ARM: shmobile: lager: Enable SATA in defconfig
This enables R-Car SATA and SCSI disk in lager_defconfig.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0e02971e4047e61edc913c997ba9124df33d5112)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Sun, 12 Jan 2014 11:15:49 +0000 (12:15 +0100)]
ARM: shmobile: koelsch: Enable DEVTMPFS_MOUNT in defconfig
Without this, a Debian jessie nfsroot hangs early in the boot process.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
[horms+renesas@verge.net.au: resolved trivial conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9a4e2a5a11efb7734dabef77a6e1515cbfdd9f42)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Thu, 9 Jan 2014 15:23:23 +0000 (19:23 +0400)]
ARM: shmobile: koelsch: Enable SATA in defconfig
This enables block layer, R-Car SATA and SCSI disk in koelsch_defconfig.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7f03e3bf2bca488e1471e00b6b8b74242b065020)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Mon, 6 Jan 2014 14:55:41 +0000 (18:55 +0400)]
ARM: shmobile: lager: Enable VIN along with ADV7180 decoder in defconfig
This enables R-Car VIN SoC camera along with ADV7180 decoder,
which can be found on Lager board, to lager_defconfig.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5d738332973d1b33cd9fb77062d3959d6c7e7a74)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Fri, 24 Jan 2014 22:28:48 +0000 (02:28 +0400)]
ARM: shmobile: r8a7790: Add PCI USB host clock support
This adds internal PCI USB host clock support.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
012a7069b5a10a0851584d71a1facdc40a972319)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Fri, 27 Dec 2013 04:15:24 +0000 (05:15 +0100)]
ARM: shmobile: r7s72100: really add i2c clocks
Due to a merge conflict, addition of the clocks was lost. Tested with
RIIC2 on a genmai board. Others untested but hopefully trivial enough to
be added.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
[horms+renesas@verge.net.au: Capitalised "ARM" in subject]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3440cb28627d7fbaf25c0d60cb9c6cf6d66d61ad)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Thu, 9 Jan 2014 15:23:21 +0000 (19:23 +0400)]
ARM: shmobile: r8a7791: Add SATA clocks
This adds SATA[01] clock support to R8A7791 SoC.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
373ababd4896d6012871f03a3f6d96083dc50610)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Thu, 9 Jan 2014 15:23:20 +0000 (19:23 +0400)]
ARM: shmobile: r8a7791: Add ZS clock
This adds fixed ratio zs_clk to R8A7791 clocks.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5a6f994abbfde8e17671541db04399dfc4aebe62)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Wed, 8 Jan 2014 16:31:25 +0000 (20:31 +0400)]
ARM: shmobile: r8a7790: Add SATA clocks
This adds SATA[01] clock support to R8A7790 SoC.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
[horms+renesas@verge.net.au: resolved trivial conflicts]
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
64b7f9aca549db8a8bbcf68c911e9bd24efe76f7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Valentine Barshak [Wed, 8 Jan 2014 16:31:23 +0000 (20:31 +0400)]
ARM: shmobile: r8a7790: Add VIN clock support
This adds VIN[0-3] clock support to R8A7790 SoC.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
[horms+renesas@verge.net.au: manually applied]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
b89dfdfad949798e1624dd2ff494bdb7ac943b04)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 6 Jan 2014 08:32:54 +0000 (00:32 -0800)]
ARM: shmobile: r8a7790: add Audio DMAC support
R-Car H2 has many DMACs
(ex SYS-DMAC, 2D-DMAC, Audio-DMAC, USB-DMAC etc)
and, these DMAEngine needs DMA slave IDs to use it.
This patch adds new DMA slave ID list for r8a7790.
There, common part has RCAR_DMA_xxx prefix,
and Audio DMAC part has AUDIO_DMAC_SLAVE_xxx prefix.
Audio DMAC can be controlled via sh-dma-engine
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2c578a1be846bde49cb0a916c20f526f27b59e89)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
projects / platform / adaptation / renesas_rcar / renesas_kernel.git / log