aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-02-25Merge tag 'mvebu-watchdog-3.15' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann8-86/+322
next/drivers mvebu watchdog driver changes for v3.15 - orion watchdog - cleanup and extend driver to support Armada 370 and Armada XP Depends: - tags/irqchip-mvebu-fixes-3.14 (already pulled by tglx) - both are based on v3.14-rc1 * tag 'mvebu-watchdog-3.15' of git://git.infradead.org/linux-mvebu: watchdog: orion: Enable the build on ARCH_MVEBU watchdog: orion: Add support for Armada 370 and Armada XP SoC watchdog: orion: Add per-compatible watchdog start implementation watchdog: orion: Add per-compatible clock initialization watchdog: orion: Introduce per-compatible of_device_id data watchdog: orion: Introduce an orion_watchdog device structure watchdog: orion: Remove unneeded BRIDGE_CAUSE clear watchdog: orion: Make RSTOUT register a separate resource watchdog: orion: Handle the interrupt so it's properly acked watchdog: orion: Make sure the watchdog is initially stopped watchdog: orion: Remove unused macros watchdog: orion: Use atomic access for shared registers watchdog: orion: Add clock error handling Signed-off-by: Arnd Bergmann <[email protected]>
2014-02-25Merge tag 'irqchip-mvebu-fixes-3.14' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann1-3/+19
into next/drivers irqchip mvebu fixes for v3.14 - orion: - fixes for clearing bridge cause register, and clearing stale interrupts * tag 'irqchip-mvebu-fixes-3.14' of git://git.infradead.org/linux-mvebu: irqchip: orion: Fix getting generic chip pointer. irqchip: orion: clear stale interrupts in irq_startup irqchip: orion: use handle_edge_irq on bridge irqs irqchip: orion: clear bridge cause register on init This is a dependency for the mvebu watchdog changes. Signed-off-by: Arnd Bergmann <[email protected]>
2014-02-25Merge tag 'davinci-for-v3.15/nand' of ↵Arnd Bergmann8-35/+117
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers A patch to break dependency of DaVinci NAND driver with mach-davinci. Required for reuse of driver on other platforms (keystone). * tag 'davinci-for-v3.15/nand' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: aemif: get rid of davinci-nand driver dependency on aemif Signed-off-by: Arnd Bergmann <[email protected]>
2014-02-25gpio: msm: switch Kconfig to ARCH_QCOM dependsKumar Gala1-1/+1
We've split Qualcomm MSM support into legacy and multiplatform. The gpio msm-v2 driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Linus Walleij <[email protected]> Acked-by: Alexandre Courbot <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2014-02-24clk: bcm281xx: don't disable unused peripheral clocksAlex Elder1-1/+1
Add the CLK_IGNORE_UNUSED flag when setting up a peripheral clock. This prevents unused clocks from getting disabled, and by doing this we can use the common clock code even before we've resolved all the spots that need to get a reference to their clock. Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Matt Porter <[email protected]> Acked-by: Mike Turquette <[email protected]> Signed-off-by: Matt Porter <[email protected]>
2014-02-24clk: bcm281xx: add initial clock framework supportAlex Elder9-0/+2707
Add code for device tree support of clocks in the BCM281xx family of SoCs. Machines in this family use peripheral clocks implemented by "Kona" clock control units (CCUs). (Other Broadcom SoC families use Kona style CCUs as well, but support for them is not yet upstream.) A BCM281xx SoC has multiple CCUs, each of which manages a set of clocks on the SoC. A Kona peripheral clock is composite clock that may include a gate, a parent clock multiplexor, and zero, one or two dividers. There is a variety of gate types, and many gates implement hardware-managed gating (often called "auto-gating"). Most dividers divide their input clock signal by an integer value (one or more). There are also "fractional" dividers which allow division by non-integer values. To accomodate such dividers, clock rates and dividers are generally maintained by the code in "scaled" form, which allows integer and fractional dividers to be handled in a uniform way. If present, the gate for a Kona peripheral clock must be enabled when a change is made to its multiplexor or one of its dividers. Additionally, dividers and multiplexors have trigger registers which must be used whenever the divider value or selected parent clock is changed. The same trigger is often used for a divider and multiplexor, and a BCM281xx peripheral clock occasionally has two triggers. The gate, dividers, and parent clock selector are treated in this code as "components" of a peripheral clock. Their functionality is implemented directly--e.g. the common clock framework gate implementation is not used for a Kona peripheral clock gate. (This has being considered though, and the intention is to evolve this code to leverage common code as much as possible.) The source code is divided into three general portions: drivers/clk/bcm/clk-kona.h drivers/clk/bcm/clk-kona.c These implement the basic Kona clock functionality, including the clk_ops methods and various routines to manipulate registers and interpret their values. This includes some functions used to set clocks to a desired initial state (though this feature is only partially implemented here). drivers/clk/bcm/clk-kona-setup.c This contains generic run-time initialization code for data structures representing Kona CCUs and clocks. This encapsulates the clock structure initialization that can't be done statically. Note that there is a great deal of validity-checking code here, making explicit certain assumptions in the code. This is mostly useful for adding new clock definitions and could possibly be disabled for production use. drivers/clk/bcm/clk-bcm281xx.c This file defines the specific CCUs used by BCM281XX family SoCs, as well as the specific clocks implemented by each. It declares a device tree clock match entry for each CCU defined. include/dt-bindings/clock/bcm281xx.h This file defines the selector (index) values used to identify a particular clock provided by a CCU. It consists entirely of C preprocessor constants, to be used by both the C source and device tree source files. Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Tim Kryger <[email protected]> Reviewed-by: Matt Porter <[email protected]> Acked-by: Mike Turquette <[email protected]> Signed-off-by: Matt Porter <[email protected]>
2014-02-24drivers: Enable building of Kirkwood drivers for mach-mvebuAndrew Lunn6-7/+7
With the move of kirkwood into mach-mvebu, drivers Kconfig need tweeking to allow the kirkwood specific drivers to be built. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Kishon Vijay Abraham I <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Acked-by: Viresh Kumar <[email protected]> Tested-by: Jason Gunthorpe <[email protected]> Cc: Viresh Kumar <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Bryan Wu <[email protected]> Cc: Zhang Rui <[email protected]> Cc: Eduardo Valentin <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-24ARM: shmobile: r8a7790: add sound SCU clock supportKuninori Morimoto1-0/+25
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 <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devicesLaurent Pinchart1-1/+0
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 <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: Remove legacy r8a7790 DT clocksMagnus Damm1-11/+0
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 <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: Add r8a7791 legacy SDHI clocksMagnus Damm1-2/+49
Add legacy r8a7791 SDHI clocks. This to allow the SDHI devices to be used by legacy Koelsch board support. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r8a7790: Correct SYS DMAC clock definesSimon Horman1-2/+2
This brings the implementation into line with the documentation. This problem was introduced when SYS DMAC clock defines were added by ac991dce6498b5fc ("ARM: shmobile: r8a7790: Add clock index macros for DT sources") in v3.13-rc2. I do not believe this results in any problems as these defines do not appear to be used anywhere yet. Acked-by: Laurent Pinchart <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r7s72100: Add clock for r7s72100-etherSimon Horman1-0/+4
Acked-by: Sergei Shtylyov <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r8a7791 clock: add QSPI clocksGeert Uytterhoeven1-0/+11
The QSPI clock divider value depends on the MD1, MD2, and MD3 mode switches. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r7s72100 clock: Add RSPI clocks for DTGeert Uytterhoeven1-0/+5
Add DT-style ("%08x.spi") clocks, as Genmai doesn't use the common clock framework yet. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r7s72100 clock: Add RSPI clocksGeert Uytterhoeven1-3/+18
Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r8a7790: add audio clockKuninori Morimoto2-0/+43
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 <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-24ARM: shmobile: r8a7778: add audio clock in new styleKuninori Morimoto1-0/+4
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 <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-02-23ARM: davinci: aemif: get rid of davinci-nand driver dependency on aemifIvan Khoronzhuk8-35/+117
The problem that the set timings code contains the call of Davinci platform function davinci_aemif_setup_timing() which is not accessible if kernel is built for another platform like Keystone. The Keysone platform is going to use TI AEMIF driver. If TI AEMIF is used we don't need to set timings and bus width. It is done by AEMIF driver. To get rid of davinci-nand driver dependency on aemif platform code we moved aemif code to davinci platform. The platform AEMIF code (aemif.c) has to be removed once Davinci will be converted to DT and use ti-aemif.c driver. Acked-by: Brian Norris <[email protected]> Signed-off-by: Ivan Khoronzhuk <[email protected]> [[email protected]: fixed checkpatch error and a build breakage due to missing include, rebased onto l2-mtd/master] Signed-off-by: Sekhar Nori <[email protected]>
2014-02-22watchdog: orion: Enable the build on ARCH_MVEBUEzequiel Garcia1-1/+1
After adding support for Armada 370/XP SoC let's enable the build on these platforms. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Add support for Armada 370 and Armada XP SoCEzequiel Garcia2-2/+107
Using the added infrastructure for handling SoC differences, this commit adds support for the watchdog controller available in Armada 370 and Armada XP SoCs. Also, and because the AXP clock initialization uses of_clk_get_by_name, this commit changes the orion clock initialization to use clk_get() and adds a proper clk_put() on the common exit/error paths. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Add per-compatible watchdog start implementationEzequiel Garcia1-1/+11
To handle differences between SoCs this commit adds per-compatible string start() function for the watchdog kick-off. This is preparation work and makes no functionality changes to the current driver. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Add per-compatible clock initializationEzequiel Garcia1-21/+32
Following the introduction of the compatible-data field, it's now possible to further abstract the clock initialization. This will allow to support SoC with a different clock setup. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Introduce per-compatible of_device_id dataEzequiel Garcia1-19/+43
This commit adds an orion_watchdog_data structure to hold compatible-data information. This allows to remove the driver-wide definition and to be able to add support for multiple compatible-strings in the future. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Introduce an orion_watchdog device structureEzequiel Garcia1-45/+69
In order to prepare to support multiple compatible-strings, this commit adds a device structure to hold the driver's state. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Remove unneeded BRIDGE_CAUSE clearEzequiel Garcia1-5/+0
After adding the IRQ request, the BRIDGE_CAUSE bit should be cleared by the bridge interrupt controller. There's no longer a need to do it in the watchdog driver, so we can simply remove it. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Make RSTOUT register a separate resourceEzequiel Garcia7-9/+58
In order to support other SoC, it's required to distinguish the 'control' timer register, from the 'rstout' register that enables system reset on watchdog expiration. To prevent a compatibility break, this commit adds a fallback to a hardcoded RSTOUT address. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Handle the interrupt so it's properly ackedEzequiel Garcia2-1/+25
DT-enabled plaforms, where the irqchip driver for the brigde interrupt controller is available, can handle the watchdog IRQ properly. Therefore, request the interrupt and add a dummy handler that merely calls panic(). This is done in order to have an initial 'ack' of the interruption, which clears the watchdog state. Furthermore, since some platforms don't have such IRQ, this commit makes the interrupt specification optional. Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Make sure the watchdog is initially stoppedEzequiel Garcia1-0/+19
Having the watchdog initially fully stopped is important to avoid any spurious watchdog triggers, in case the registers are not in its reset state. If the watchdog rstout is enabled and the watchdog counter running, this initial stop is not performed, to comply with the 'nowayout' parameter. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Remove unused macrosEzequiel Garcia1-2/+0
These are not used anywhere so it's safe to remove them. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Use atomic access for shared registersEzequiel Garcia1-37/+5
Since the timer control register is shared with the clocksource driver, use the recently introduced atomic_io_clear_set() to access such register. Given the watchdog core already provides serialization for all the watchdog ops, this commit allows to remove the spinlock entirely. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-22watchdog: orion: Add clock error handlingEzequiel Garcia1-10/+19
This commit adds a check for clk_prepare_enable success and introduces an error path to disable the clock properly. Reviewed-by: Guenter Roeck <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Wim Van Sebroeck <[email protected]> Tested-By: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-21rtc: mv: reset date if after year 2038Thomas Petazzoni1-0/+12
Dates after January, 19th 2038 are badly handled by userspace due to the time being stored on 32 bits. This causes issues on some Marvell platform on which the RTC is initialized by default to a date that's beyond 2038, causing a really weird behavior of the RTC. In order to avoid that, reset the date to a sane value if the RTC is beyond 2038. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-21Merge tag 'integrator-for-v3.15-1' of ↵Olof Johansson17-118/+353
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/drivers Merge "Integrator/Versatile base patch stack for the v3.15 series" from Linus Walleij: "this is a set of patches I have sent for review and failed to get ACKs from the proper subsystem maintainers after repeated pings. However I now need to have this rotated in linux-next as a base for multiplatform, so please pull it in, it is all ARM drivers anyway. Russell pointed out some things and these have been fixed and iterated in this series." - Move integrator clock definitions to the device tree, alter clock and timer drivers accordingly. - Alter the VIC irqchip driver to support cascaded VICs off a parent IRQ controller. - Update the IM-PD1 plugin code to use managed resources. - Register the VIC on the IM-PD1. - Select the PL061 GPIO block for the IM-PD1 on the Integrator/AP. * tag 'integrator-for-v3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: select GPIO block ARM: integrator: register the IM-PD1 VIC ARM: integrator: use managed resources for the IM-PD1 irqchip: support cascaded VICs irqchip: vic: update the base IRQ member correctly clk: versatile: respect parent rate in ICST clock clk: versatile: pass a parent to the ICST clock ARM: integrator: switch to fetch clocks from device tree ARM: SP804: make Integrator/CP timer pick clock from DT ARM: integrator: define clocks in the device trees Signed-off-by: Olof Johansson <[email protected]>
2014-02-21irqchip: orion: Fix getting generic chip pointer.Andrew Lunn1-1/+2
Enabling SPARSE_IRQ shows up a bug in the irq-orion bridge interrupt handler. The bridge interrupt is implemented using a single generic chip. Thus the parameter passed to irq_get_domain_generic_chip() should always be zero. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Sebastian Hesselbarth <[email protected]> Fixes: 9dbd90f17e4f ("irqchip: Add support for Marvell Orion SoCs") Cc: <[email protected]> # v3.11+ Signed-off-by: Jason Cooper <[email protected]>
2014-02-21hwrng: msm: switch Kconfig to ARCH_QCOM dependsKumar Gala1-3/+3
We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. Acked-by: Herbert Xu <[email protected]> CC: Stanimir Varbanov <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2014-02-20Merge tag 'renesas-soc-for-v3.15' of ↵Olof Johansson8-92/+325
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Renesas ARM Based SoC Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) - Add i2c clocks (portion missing from previous patch due to miss-merge) * r8a7791 (R-Car M2) - Add SATA clocks - Add ZS clock - Wait for status on all MSTP clocks -- Add I2C and VIN clocks * r8a7790 (R-Car H2) - Add PCI USB host clock support - Add Audio DMAC, SATA and VIN clocks - Add Audio DMAC support * r8a7779 (R-Car H1) - Wait for status on selected MSTP clocks * tag 'renesas-soc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: Add PCI USB host clock support ARM: shmobile: r7s72100: really add i2c clocks ARM: shmobile: r8a7791: Add SATA clocks ARM: shmobile: r8a7791: Add ZS clock ARM: shmobile: r8a7790: Add SATA clocks ARM: shmobile: r8a7790: Add VIN clock support ARM: shmobile: r8a7790: add Audio DMAC support ARM: shmobile: r8a7790: add Audio DMAC clock ARM: shmobile: r8a7791: Wait for status on all MSTP clocks ARM: shmobile: r8a7791: Add VIN clocks ARM: shmobile: r8a7791: Add I2C clocks ARM: shmobile: r8a7790: Wait for status on all MSTP clocks ARM: shmobile: r8a7779: Wait for status on selected MSTP clocks ARM: shmobile: wait for MSTP clock status to toggle, when enabling it
2014-02-19ARM: virt: select ARM_AMBARob Herring1-1/+2
Guests can use AMBA bus devices such as the PL011 uart, so enable the AMBA bus for mach-virt. Signed-off-by: Rob Herring <[email protected]> Cc: Russell King <[email protected]>
2014-02-19ARM: virt: make mach-virt just a kconfig optionRob Herring5-55/+6
The mach code for mach-virt is no longer needed, so we can remove all of mach-virt except the kconfig entry. Signed-off-by: Rob Herring <[email protected]> Cc: Russell King <[email protected]> Acked-by: Marc Zyngier <[email protected]>
2014-02-19ARM: vt8500: enable V6K instead of plain V6Rob Herring1-1/+0
The wm8750 is an ARM1176 which has all the V6K extensions except for SMP, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K. Signed-off-by: Rob Herring <[email protected]> Cc: Tony Prisk <[email protected]>
2014-02-19ARM: cns3xxx: enable V6K instead of plain V6Rob Herring1-1/+0
The cns3xxx is an ARM11MPCore which has all the V6K extensions, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K. Signed-off-by: Rob Herring <[email protected]> Cc: Anton Vorontsov <[email protected]>
2014-02-19ARM: bcm2835: enable V6K instead of plain V6Rob Herring1-1/+0
The bcm2835 is an ARM1176 which has all the V6K extensions except for SMP, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K. Signed-off-by: Rob Herring <[email protected]> Tested-by: Stephen Warren <[email protected]>
2014-02-19ARM: Select V6K instead of V6 by default for multi-platformRob Herring4-4/+2
MULTI_V6 should default to V6K as it is more optimal than V6. Any platform which is not V6K should select CPU_V6 which will enable the less optimal code paths. Signed-off-by: Rob Herring <[email protected]> Cc: Anton Vorontsov <[email protected]> Acked-by: Shawn Guo <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Jamie Iles <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2014-02-19ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platformRob Herring11-10/+1
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 <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2014-02-19ARM: select HAVE_SMP for V7 multi-platformRob Herring19-19/+1
All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for V7 multi-platform builds. Signed-off-by: Rob Herring <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2014-02-19ARM: centralize common multi-platform kconfig optionsRob Herring30-138/+2
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually. Signed-off-by: Rob Herring <[email protected]> Acked-by: Linus Walleij <[email protected]> Cc: Russell King <[email protected]> Acked-by: Stephen Warren <[email protected]> Tested-by: Stephen Warren <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2014-02-18Merge tag 'ext4_for_linus_stable' of ↵Linus Torvalds6-23/+43
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Pull ext4 fixes from Ted Ts'o: "Miscellaneous ext4 bug fixes for v3.14" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: jbd2: fix use after free in jbd2_journal_start_reserved() ext4: don't leave i_crtime.tv_sec uninitialized ext4: fix online resize with a non-standard blocks per group setting ext4: fix online resize with very large inode tables ext4: don't try to modify s_flags if the the file system is read-only ext4: fix error paths in swap_inode_boot_loader() ext4: fix xfstest generic/299 block validity failures
2014-02-18rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warningsFengguang Wu1-4/+1
drivers/rtc/rtc-isl12057.c:278:1-3: WARNING: PTR_RET can be used Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: coccinelle/api/ptr_ret.cocci CC: Arnaud Ebalard <[email protected]> CC: Jason Cooper <[email protected]> Signed-off-by: Fengguang Wu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2014-02-17jbd2: fix use after free in jbd2_journal_start_reserved()Dan Carpenter1-2/+4
If start_this_handle() fails then it leads to a use after free of "handle". Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Cc: [email protected]
2014-02-17Merge branch 'for-linus' of ↵Linus Torvalds7-37/+96
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client Pull Ceph fixes from Sage Weil: "We have some patches fixing up ACL support issues from Zheng and Guangliang and a mount option to enable/disable this support. (These fixes were somewhat delayed by the Chinese holiday.) There is also a small fix for cached readdir handling when directories are fragmented" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix __dcache_readdir() ceph: add acl, noacl options for cephfs mount ceph: make ceph_forget_all_cached_acls() static inline ceph: add missing init_acl() for mkdir() and atomic_open() ceph: fix ceph_set_acl() ceph: fix ceph_removexattr() ceph: remove xattr when null value is given to setxattr() ceph: properly handle XATTR_CREATE and XATTR_REPLACE
Powered by cgit, Gruvboxed by Blaster4385.