summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-17ARM: fix duplicate symbols in multi_v5_defconfigArnd Bergmann1-4/+0
A couple of lines in multi_v5_defconfig appear twice, causing a harmless Kconfig warning. This removes one of the two copies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann2-0/+375
into next/boards Merge "mvebu defconfig changes for v3.15 (incremental pull #2)" from Jason Cooper - add multi_v5_defconfig - add mvebu_v5_defconfig - kirkwood: add HP T5325 devices * tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig ARM: config: Add mvebu_v5_defconfig ARM: config: Add a multi_v5_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'renesas-defconfig3-for-v3.15' of ↵Olof Johansson5-92/+145
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from Simon Horman: * r7s72100 (RZ/A1H) based Genmai board - update defconfig for I2C usage * r8a7791 (R-Car M2) based Koelsch board - Enable SDHI, GPIO and regulators in defconfig * r8a7790 (R-Car H2) based Lager board - Enable RSPI and MTD_M25P80 * emev2 (Emma Mobile) based KZM9D board - Remove legacy KZM9D defconfig * Multiplatform - Add defconfig for shmobile multiplatform * tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: update defconfig for I2C usage ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfig ARM: shmobile: Get rid of legacy KZM9D defconfig ARM: shmobile: Add defconfig for shmobile multiplatform ARM: shmobile: lager defconfig: Enable RSPI and MTD_M25P80 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-boards3-for-v3.15' of ↵Olof Johansson10-113/+506
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) based Genmai board - Set proper DMA masks for Ether device * r8a7791 (R-Car M2) based Koelsch board - Remove Koelsch DT reference legacy clock bits - Set proper DMA masks for Ether device - Add DU device to koelsch-reference - Refactor clock lookup hack in koelsch-reference - Add SDHI devices * r8a7790 (R-Car H2) based Lager board - Remove Lager DT reference legacy clock bits - Set proper DMA masks for Ether device - Add internal USB PCI support - Add QSPI pinmux - Sdd SDHI0/2 support * emev2 (Emma Mobile EV2) based kzm9d board - Remove KZM9D board code * r8a7778 (R-Car M1) based bock-w board - Set proper DMA masks for Ether device * r8a7740 (R-Mobile A1) based Armadillo 800 EVA board - Set proper DMA masks for Ether device * tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove Lager DT reference legacy clock bits ARM: shmobile: Remove Koelsch DT reference legacy clock bits ARM: shmobile: Remove KZM9D board code ARM: shmobile: Genmai: set proper DMA masks for Ether device ARM: shmobile: Koelsch: set proper DMA masks for Ether device ARM: shmobile: Lager: set proper DMA masks for Ether device ARM: shmobile: BOCK-W: set proper DMA masks for Ether device ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device ARM: shmobile: koelsch-reference: Add DU device ARM: shmobile: koelsch-reference: Refactor clock lookup hack ARM: shmobile: lager-reference: Add DU device ARM: shmobile: lager-reference: Refactor clock lookup hack ARM: shmobile: lager: Add internal USB PCI support ARM: shmobile: lager legacy: Add QSPI pinmux ARM: shmobile: lager: add SDHI0/2 support ARM: shmobile: Add SDHI devices for legacy Koelsch Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-12Merge tag 'keystone-soc' of ↵Olof Johansson1-0/+15
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/boards Keystone SOC updates for 3.15 - Enable Watchdog and GPIO config - Enable LED driver config - Enable NAND and EMIF driver config * tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: config: keystone: enable AEMIF/NAND support ARM: config: keystone: enable led support ARM: config: keystone: enable gpio support ARM: config: keystone: enable watchdog support
2014-03-09Merge tag 'pxa' of ↵Olof Johansson1-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>
2014-03-04ARM: pxa: add gpio keys informationDmitry Eremin-Solenikov1-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>
2014-03-01ARM: config: keystone: enable AEMIF/NAND supportIvan Khoronzhuk1-0/+2
Keystone SoC uses the same NAND driver as Davinci, so enable Davinci NAND and AEIMF that provides interface for it. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-27ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfigKumar Gala1-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>
2014-02-26ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfigAndrew Lunn2-0/+18
The HP T5325 has a PCI based VGA controller. Add the frame buffer driver, and frame buffer support to the defconfig's. Additionally add the soc audio framework and the necessary codec. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-23ARM: config: Add mvebu_v5_defconfigAndrew Lunn1-0/+172
Now that there is both v5 and v7 systems in mach-mvebu, the mvebu_defconfig is not sufficient, since these systems cannot be combined. Add a v5 defconfig which is based on kirkwood_defconfig, but purely DT. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-23ARM: config: Add a multi_v5_defconfigAndrew Lunn1-0/+185
To allow regression build testing of multi v5 systems, add a multi_v5_defconfig, similar to the multi_v7_defconfig. This is based on kirkwood_defconfig, but with a few other boards added which claim to be MULTI_v5. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-22Merge tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson3-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>
2014-02-20Merge tag 'renesas-defconfig2-for-v3.15' of ↵Olof Johansson3-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>
2014-02-20Merge tag 'renesas-boards2-for-v3.15' of ↵Olof Johansson5-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
2014-02-20Merge tag 'renesas-defconfig-for-v3.15' of ↵Olof Johansson10-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>
2014-02-20Merge tag 'renesas-boards-for-v3.15' of ↵Olof Johansson10-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>
2014-02-18ARM: shmobile: r7s72100: update defconfig for I2C usageWolfram Sang1-1/+3
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>
2014-02-18ARM: shmobile: Remove Lager DT reference legacy clock bitsMagnus Damm1-4/+0
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>
2014-02-18ARM: shmobile: Remove Koelsch DT reference legacy clock bitsMagnus Damm1-4/+1
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>
2014-02-18ARM: shmobile: Remove KZM9D board codeMagnus Damm3-54/+0
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>
2014-02-18ARM: mvebu: update defconfigs for Armada 375 and 38xThomas Petazzoni2-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>
2014-02-18ARM: dove: Enable watchdog support in the defconfigEzequiel Garcia1-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>
2014-02-18ARM: mvebu: Enable watchdog support in defconfigEzequiel Garcia2-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>
2014-02-17ARM: config: keystone: enable led supportGrygorii Strashko1-0/+8
The Keystone GPIO functionality is ready for use, so LED support can be enabled in config. Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17ARM: config: keystone: enable gpio supportGrygorii Strashko1-0/+3
Enable enable GPIO support for Keystone by setting CONFIG_GPIOLIB and CONFIG_GPIO_DAVINCI options in keystone_defconfig. Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17ARM: config: keystone: enable watchdog supportIvan Khoronzhuk1-0/+2
Keystone SoC uses the same watchdog driver as Davinci, so enable WDT and core used by it. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-17ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfigSimon Horman1-0/+9
Enable the following: * regulators (needed for SDHI) * SDHI * GPIO * GPIO keys * GPIO LEDs Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-02-17ARM: shmobile: Get rid of legacy KZM9D defconfigMagnus Damm1-91/+0
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>
2014-02-17ARM: shmobile: Genmai: set proper DMA masks for Ether deviceSergei Shtylyov1-5/+14
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>
2014-02-17ARM: shmobile: Koelsch: set proper DMA masks for Ether deviceSergei Shtylyov1-5/+14
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>
2014-02-17ARM: shmobile: Lager: set proper DMA masks for Ether deviceSergei Shtylyov1-5/+14
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>
2014-02-17ARM: shmobile: BOCK-W: set proper DMA masks for Ether deviceSergei Shtylyov1-7/+14
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>
2014-02-17ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether deviceSergei Shtylyov1-0/+2
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>
2014-02-17ARM: shmobile: koelsch-reference: Add DU deviceLaurent Pinchart1-0/+59
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>
2014-02-17ARM: shmobile: koelsch-reference: Refactor clock lookup hackLaurent Pinchart1-15/+27
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>
2014-02-17ARM: shmobile: lager-reference: Add DU deviceLaurent Pinchart1-0/+66
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>
2014-02-17ARM: shmobile: lager-reference: Refactor clock lookup hackLaurent Pinchart1-15/+22
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>
2014-02-17ARM: shmobile: lager: Add internal USB PCI supportValentine Barshak1-0/+50
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>
2014-02-17ARM: mvebu: enable audio options in mvebu_defconfigThomas Petazzoni1-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>
2014-02-17ARM: shmobile: Add defconfig for shmobile multiplatformSimon Horman1-0/+129
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>
2014-02-17Linux 3.14-rc3v3.14-rc3Linus Torvalds1-1/+1
2014-02-16Merge branch 'for-linus' of ↵Linus Torvalds7-23/+28
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "We have a small collection of fixes in my for-linus branch. The big thing that stands out is a revert of a new ioctl. Users haven't shipped yet in btrfs-progs, and Dave Sterba found a better way to export the information" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use right clone root offset for compressed extents btrfs: fix null pointer deference at btrfs_sysfs_add_one+0x105 Btrfs: unset DCACHE_DISCONNECTED when mounting default subvol Btrfs: fix max_inline mount option Btrfs: fix a lockdep warning when cleaning up aborted transaction Revert "btrfs: add ioctl to export size of global metadata reservation"
2014-02-16Merge tag 'dt-fixes-for-3.14' of ↵Linus Torvalds1-34/+54
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull devicetree fixes from Rob Herring: "Fix booting on PPC boards. Changes to of_match_node matching caused the serial port on some PPC boards to stop working. Reverted the change and reimplement to split matching between new style compatible only matching and fallback to old matching algorithm" * tag 'dt-fixes-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of: search the best compatible match first in __of_match_node() Revert "OF: base: match each node compatible against all given matches first"
2014-02-16of: search the best compatible match first in __of_match_node()Kevin Hao1-1/+42
Currently, of_match_node compares each given match against all node's compatible strings with of_device_is_compatible. To achieve multiple compatible strings per node with ordering from specific to generic, this requires given matches to be ordered from specific to generic. For most of the drivers this is not true and also an alphabetical ordering is more sane there. Therefore, this patch introduces a function to match each of the node's compatible strings against all given compatible matches without type and name first, before checking the next compatible string. This implies that node's compatibles are ordered from specific to generic while given matches can be in any order. If we fail to find such a match entry, then fall-back to the old method in order to keep compatibility. Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Kevin Hao <haokexin@gmail.com> Tested-by: Stephen Chivers <schivers@csc.com> Signed-off-by: Rob Herring <robh@kernel.org>
2014-02-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds11-23/+30
Pull SCSI target fixes from Nicholas Bellinger: "Mostly minor fixes this time to v3.14-rc1 related changes. Also included is one fix for a free after use regression in persistent reservations UNREGISTER logic that is CC'ed to >= v3.11.y stable" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: Target/sbc: Fix protection copy routine IB/srpt: replace strict_strtoul() with kstrtoul() target: Simplify command completion by removing CMD_T_FAILED flag iser-target: Fix leak on failure in isert_conn_create_fastreg_pool iscsi-target: Fix SNACK Type 1 + BegRun=0 handling target: Fix missing length check in spc_emulate_evpd_83() qla2xxx: Remove last vestiges of qla_tgt_cmd.cmd_list target: Fix 32-bit + CONFIG_LBDAF=n link error w/ sector_div target: Fix free-after-use regression in PR unregister
2014-02-16Merge branch 'i2c/for-current' of ↵Linus Torvalds2-21/+53
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "i2c has a bugfix and documentation improvements for you" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: Documentation: i2c: mention ACPI method for instantiating devices Documentation: i2c: describe devicetree method for instantiating devices i2c: mv64xxx: refactor message start to ensure proper initialization
2014-02-16Merge branches 'irq-urgent-for-linus' and 'irq-core-for-linus' of ↵Linus Torvalds3-0/+51
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull irq update from Thomas Gleixner: "Fix from the urgent branch: a trivial oneliner adding the missing Kconfig dependency curing build failures which have been discovered by several build robots. The update in the irq-core branch provides a new function in the irq/devres code, which is a prerequisite for driver developers to get rid of boilerplate code all over the place. Not a bugfix, but it has zero impact on the current kernel due to the lack of users. It's simpler to provide the infrastructure to interested parties via your tree than fulfilling the wishlist of driver maintainers on which particular commit or tag this should be based on" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Add missing irq_to_desc export for CONFIG_SPARSE_IRQ=n * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Add devm_request_any_context_irq()
2014-02-16Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds3-26/+35
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fixes from Thomas Gleixner: "The following trilogy of patches brings you: - fix for a long standing math overflow issue with HZ < 60 - an onliner fix for a corner case in the dreaded tick broadcast mechanism affecting a certain range of AMD machines which are infested with the infamous automagic C1E power control misfeature - a fix for one of the ARM platforms which allows the kernel to proceed and boot instead of stupidly panicing for no good reason. The patch is slightly larger than necessary, but it's less ugly than the alternative 5 liner" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick: Clear broadcast pending bit when switching to oneshot clocksource: Kona: Print warning rather than panic time: Fix overflow when HZ is smaller than 60
2014-02-16Merge tag 'trace-fixes-v3.14-rc2' of ↵Linus Torvalds2-36/+54
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull twi tracing fixes from Steven Rostedt: "Two urgent fixes in the tracing utility. The first is a fix for the way the ring buffer stores timestamps. After a restructure of the code was done, the ring buffer timestamp logic missed the fact that the first event on a sub buffer is to have a zero delta, as the full timestamp is stored on the sub buffer itself. But because the delta was not cleared to zero, the timestamp for that event will be calculated as the real timestamp + the delta from the last timestamp. This can skew the timestamps of the events and have them say they happened when they didn't really happen. That's bad. The second fix is for modifying the function graph caller site. When the stop machine was removed from updating the function tracing code, it missed updating the function graph call site location. It is still modified as if it is being done via stop machine. But it's not. This can lead to a GPF and kernel crash if the function graph call site happens to lie between cache lines and one CPU is executing it while another CPU is doing the update. It would be a very hard condition to hit, but the result is severe enough to have it fixed ASAP" * tag 'trace-fixes-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: ftrace/x86: Use breakpoints for converting function graph caller ring-buffer: Fix first commit on sub-buffer having non-zero delta
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-15 03:42:47 +0300