summaryrefslogtreecommitdiffstats
path: root/arch (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'pxa' of ↵Olof Johansson2014-03-091-0/+40
|\ | | | | | | | | | | | | | | | | https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/boards * tag 'pxa' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux: ARM: pxa: add gpio keys information Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: pxa: add gpio keys informationDmitry Eremin-Solenikov2014-03-041-0/+40
| | | | | | | | | | | | | | | | | | Switching from corgikbd to matrixkbd corgi has lost support for few switches. Readd them through gpio-keys-polled device (-polled, since scoop does not provide IRQ for GPIO). Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
* | ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfigKumar Gala2014-02-271-0/+10
| | | | | | | | | | | | | | | | | | Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and serial console as part of the standard multi_v7_defconfig. Signed-off-by: Kumar Gala <galak@codeaurora.org> [khilman: removed non-qcom changes] Signed-off-by: Kevin Hilman <khilman@linaro.org>
* | Merge tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson2014-02-223-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next/boards Merge "mvebu defconfig changes for v3.15" from Jason Cooper: - dove - remove UBI support - enable watchdog - mvebu - rename mvebu_defconfig mvebu_v7_defconfig - enable audio - enable watchdog - add Armada 375 and 38x * tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu: ARM: mvebu: update defconfigs for Armada 375 and 38x ARM: dove: Enable watchdog support in the defconfig ARM: mvebu: Enable watchdog support in defconfig ARM: mvebu: enable audio options in mvebu_defconfig ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfig ARM: dove: Remove UBI support from defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| * | ARM: mvebu: update defconfigs for Armada 375 and 38xThomas Petazzoni2014-02-172-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This commit enables the Armada 375 and Armada 38x support in mvebu_defconfig and multi_v7_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | ARM: dove: Enable watchdog support in the defconfigEzequiel Garcia2014-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | Now that we have watchdog support, let's add it to the defconfig. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | ARM: mvebu: Enable watchdog support in defconfigEzequiel Garcia2014-02-172-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Now that we have proper support for Armada 370/XP watchdog let's enable it in mvebu_defconfig and multi_v7_defconfig. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | ARM: mvebu: enable audio options in mvebu_defconfigThomas Petazzoni2014-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since at least the Armada 370 SoC has audio support, it makes sense to enable the corresponding kernel configuration options in mvebu_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfigThomas Petazzoni2014-02-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the merge of the Kirkwood support into arch/arm/mach-mvebu/, the mvebu platform will no longer only contain ARMv7 compatible processors (Armada 370, Armada XP, and soon Armada 375, Armada 38x and Dove), but also ARMv5 compatible processors (Kirkwood, and hopefully Orion5x in the future). However, a single mvebu_defconfig cannot work, since it is not possible to build a kernel that supports both ARMv5 and ARMv7 platforms in the same binary. As a consequence, this commit renames mvebu_defconfig to mvebu_v7_defconfig, which is the configuration that will build a kernel that supports all ARMv7 mvebu platforms. As Kirkwood support gets merged into mach-mvebu, an additional mvebu_v5_defconfig will be added. Even though we already have a multi_v7_defconfig, the mvebu developers found it more convenient for development to have a defconfig that builds only the mvebu platforms. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | ARM: dove: Remove UBI support from defconfigEzequiel Garcia2014-02-051-1/+0
| |/ | | | | | | | | | | | | | | As NAND support is not enabled by default, it's hard to see why we'd want to have UBI support. Let's remove it. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | Merge tag 'renesas-defconfig2-for-v3.15' of ↵Olof Johansson2014-02-203-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) based Genmai board - Enable RSPI * r8a7790 (R-Car H2) based Koelsch board - Enable I2C, RSPI and MTD_M25P80 * r8a7779 (R-Car H1) based Lager board - Enable sound * tag 'renesas-defconfig2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: genmai defconfig: Enable RSPI ARM: shmobile: koelsch defconfig: Enable RSPI and MTD_M25P80 ARM: shmobile: lager: add sound support on defconfig ARM: shmobile: koelsch: Enable I2C in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| * | ARM: shmobile: genmai defconfig: Enable RSPIGeert Uytterhoeven2014-02-061-0/+2
| | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: koelsch defconfig: Enable RSPI and MTD_M25P80Geert Uytterhoeven2014-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: lager: add sound support on defconfigKuninori Morimoto2014-02-061-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| * | ARM: shmobile: koelsch: Enable I2C in defconfigValentine Barshak2014-02-061-0/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge tag 'renesas-boards2-for-v3.15' of ↵Olof Johansson2014-02-205-7/+309
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Second Round of Renesas ARM Based SoC Board Updates for v3.15" from Simon Horman: * r7s72100 (RZ/A1H) based Genmai board - Enable SH ethernet - Add RSPI support * r8a7791 (R-Car M2) based Koelsch board - Add QSPI support - Add I2C support - Pass SH ethernet PHY IRQ * r8a7790 (R-Car H2) based Lager board - Switch QSPI to named IRQs - Add sound support - Add USB0 cable detection workaround - Pass SH ethernet PHY IRQ * r8a7779 (R-Car H1) based Marzen board - Revert conditional selection of SMSC_PHY * r8a7778 (R-Car M1) based Bock-W board - Use wp-gpios instead of WP pin * tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: genmai: Enable r7s72100-ether ARM: shmobile: lager legacy: Switch QSPI to named IRQs ARM: shmobile: koelsch legacy: Add QSPI support ARM: shmobile: genmai legacy: Add RSPI support Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY" ARM: shmobile: lager: add sound support ARM: shmobile: Lager USB0 cable detection workaround ARM: shmobile: bockw: use wp-gpios instead of WP pin ARM: shmobile: koelsch: Add I2C support ARM: shmobile: Koelsch: pass Ether PHY IRQ ARM: shmobile: Lager: pass Ether PHY IRQ
| * | | ARM: shmobile: genmai: Enable r7s72100-etherSimon Horman2014-02-071-0/+20
| | | | | | | | | | | | | | | | | | | | Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms@verge.net.au>
| * | | ARM: shmobile: lager legacy: Switch QSPI to named IRQsGeert Uytterhoeven2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: koelsch legacy: Add QSPI supportGeert Uytterhoeven2014-02-061-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: genmai legacy: Add RSPI supportGeert Uytterhoeven2014-02-061-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY"Simon Horman2014-02-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: lager: add sound supportKuninori Morimoto2014-02-062-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: Lager USB0 cable detection workaroundMagnus Damm2014-02-061-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: bockw: use wp-gpios instead of WP pinKuninori Morimoto2014-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: koelsch: Add I2C supportValentine Barshak2014-02-061-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: Koelsch: pass Ether PHY IRQSergei Shtylyov2014-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: Lager: pass Ether PHY IRQSergei Shtylyov2014-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge tag 'renesas-defconfig-for-v3.15' of ↵Olof Johansson2014-02-2010-1/+34
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Renesas ARM based SoC Defconfig Updates for v3.15" from Simon Horman: * Renesas ARM based SoC boards (Global) enable CONFIG_DEVTMPFS in defconfig * r8a7791 SoC (R-Car M2) based Koelsch board - Enable SATA * r8a7790 SoC (R-Car H2) based Lager board - Enable SATA, VIN and ADV7180 decoder in defconfig * tag 'renesas-defconfig-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: ape6evm: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: armadillo: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: bockw: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: genmai: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: kzm9d: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: kzm9g: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: lager: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: mackerel: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: marzen: enable CONFIG_DEVTMPFS in defconfig ARM: shmobile: lager: Enable SATA in defconfig ARM: shmobile: koelsch: Enable DEVTMPFS_MOUNT in defconfig ARM: shmobile: koelsch: Enable SATA in defconfig ARM: shmobile: lager: Enable VIN along with ADV7180 decoder in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | ARM: shmobile: ape6evm: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: armadillo: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: bockw: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: genmai: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: kzm9d: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: kzm9g: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: lager: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: mackerel: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: marzen: enable CONFIG_DEVTMPFS in defconfigKuninori Morimoto2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: lager: Enable SATA in defconfigValentine Barshak2014-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: koelsch: Enable DEVTMPFS_MOUNT in defconfigGeert Uytterhoeven2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: koelsch: Enable SATA in defconfigValentine Barshak2014-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ARM: shmobile: lager: Enable VIN along with ADV7180 decoder in defconfigValentine Barshak2014-02-041-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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>
* | | Merge tag 'renesas-boards-for-v3.15' of ↵Olof Johansson2014-02-2010-17/+737
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Renesas ARM based SoC Board Updates for v3.15" from Simon Horman: * r8a7791 (R-Car M2) based Koelsch board - Fix error return code check from clk_get() - Add SATA0 support - Conditionally select MICREL_PHY for Multiplatform * r8a7790 (R-Car H2) based Lager board - Add USBHS support - Fix error return code check from clk_get() - Add SATA support - Make spi_flash_data const - Add VIN1 SoC camera support - Conditionally select CONFIG_MICREL_PHY * r8a7778 (R-Car M1) based Bock-W board - Add USB Func DMAEngine support - Use HPBIF DMAEngine for sound - Use SSI DMAEngine for sound * emev2 (Emma Mobile EV2) based kzm9d board - Use common clock framework * r8a773a0 (SH-Mobile AG5) based kzm9g board - Add zboot support * Many boards - Conditionally select SMSC_PHY * tag 'renesas-boards-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (21 commits) ARM: shmobile: Remove Lager USBHS UDC ifdefs ARM: shmobile: lager: Add USBHS support ARM: shmobile: koelsch: fix error return code check from clk_get() ARM: shmobile: lager: fix error return code check from clk_get() ARM: shmobile: marzen: Conditionally select SMSC_PHY ARM: shmobile: mackerel: Conditionally select SMSC_PHY ARM: shmobile: kzm9d: Conditionally select SMSC_PHY ARM: shmobile: bockw: Sort Kconfig node's selections ARM: shmobile: armadillo800eva: Conditionally select SMSC_PHY ARM: shmobile: ape6evm: Conditionally select SMSC_PHY ARM: shmobile: koelsch: Add SATA0 support ARM: shmobile: lager: Add SATA support ARM: shmobile: lager: Make spi_flash_data const ARM: shmobile: kzm9d: Use common clock framework ARM: shmobile: lager: Add VIN1 SoC camera support ARM: mach-shmobile: kzm9g: add zboot support ARM: shmobile: koelsch: Conditionally select MICREL_PHY for Multiplatform ARM: shmobile: bockw: add USB Func DMAEngine support ARM: shmobile: bockw: use HPBIF DMAEngine for sound ARM: shmobile: bockw: use SSI DMAEngine for sound ... Signed-off-by: Olof Johansson <olof@lixom.net>
| * | ARM: shmobile: Remove Lager USBHS UDC ifdefsMagnus Damm2014-02-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: lager: Add USBHS supportValentine Barshak2014-02-041-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: koelsch: fix error return code check from clk_get()Ben Dooks2014-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: lager: fix error return code check from clk_get()Ben Dooks2014-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: marzen: Conditionally select SMSC_PHYSimon Horman2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: mackerel: Conditionally select SMSC_PHYSimon Horman2014-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: kzm9d: Conditionally select SMSC_PHYSimon Horman2014-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: shmobile: bockw: Sort Kconfig node's selectionsSimon Horman2014-02-041-2/+2
| | | | | | | | | | | | Signed-off-by: Simon Horman <horms+renesas@verge.net.au>