#
e13cef8d |
| 17-Oct-2013 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge tag 'iio-fixes-for-3.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus
Jonathan writes:
Third set of IIO fixes for the 3.12 cycle.
Two little ones this tim
Merge tag 'iio-fixes-for-3.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus
Jonathan writes:
Third set of IIO fixes for the 3.12 cycle.
Two little ones this time:
1) A missing clk_unprepare in adf4350. 2) A missing free of the active_scan_mask when iio_disable_all_buffers is called during an unexpected device removal. This leak was introduced by the fix a87c82e454f184a9473f8cdfd4d304205f585f65 iio: Stop sampling when the device is removed and hence is a regression fix.
show more ...
|
#
13acfd57 |
| 17-Oct-2013 |
Gleb Natapov <gleb@redhat.com> |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts: arch/arm/kvm/reset.c
|
#
381bd951 |
| 16-Oct-2013 |
Mark Brown <broonie@linaro.org> |
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
Conflicts (trivial overlapping cleanups): drivers/spi/spi-atmel.c
|
#
263c43a4 |
| 16-Oct-2013 |
Linus Walleij <linus.walleij@linaro.org> |
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
|
#
426ee9e3 |
| 15-Oct-2013 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.12-rc5' into perf/core
Merge Linux v3.12-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
5b5bbc20 |
| 15-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'omap-for-v3.13/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren: Platform data changes for omaps for the display subsys
Merge tag 'omap-for-v3.13/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren: Platform data changes for omaps for the display subsystem and n900 secure mode changes. Note that the n900 secure mode changes will still be needed for device tree based booting also.
* tag 'omap-for-v3.13/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (508 commits) ARM: OMAP2+: display: Create omap_vout device inside omap_display_init ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init ARM: OMAP2+: display: Create omapdrm device inside omap_display_init ARM: OMAP2+: drm: Don't build device for DMM RX-51: Add support for OMAP3 ROM Random Number Generator ARM: OMAP3: RX-51: ARM errata 430973 workaround ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1 +Linux 3.12-rc4
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
fd781337 |
| 15-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren: omap device tree related changes via Benoit Cousson <bcousson
Merge tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren: omap device tree related changes via Benoit Cousson <bcousson@baylibre.com>:
Add the minimal DTS support for DRA7xx based SoC core. Add the initial support for N900 and gta04 phones. Enable USB3 on OMAP5 evm board. Add support for cryto accelerators Add new IGEP AQUILA board Add AM33XX EDMA support Update HSUSB node to use the reset-gpios fmwk
* tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (58 commits) ARM: dts: dra7-evm: Add mmc2 node for eMMC support ARM: dts: dra7-evm: Add mmc1 node for micro-sd support ARM: dts: omap5-uevm: mark TWL6037 as system-power-controller ARM: dts: omap3-igep0020: use standard constant for IRQ flags ARM: dts: omap3-igep0020: Add HS USB Host support ARM: dts: omap3-igep: Add USB OTG support ARM: dts: AM33XX beagle black: add pinmux and hdmi node to enable display ARM: dts: AM33XX: Add LCDC info into am335x-evm ARM: dts: AM437X: Add DES node ARM: dts: AM437X: Add AES node ARM: dts: AM33XX: Fix AES interrupt number ARM: dts: AM33XX: Add AES data and documentation ARM: dts: AM33XX: Add SHAM data and documentation ARM: dts: OMAP4: Add DES3DES node ARM: dts: OMAP4: Add AES node ARM: dts: am335x-evm[sdk]: switch mmc1 to 4-bit mode ARM: dts: am335x-bone-common: correct mux mode for cmd line ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board. ARM: dts: AM33XX: Add support for IGEP COM AQUILA ARM: dts: am335x-boneblack: move fixed regulator to board level ...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
7587b596 |
| 15-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren: Changes needed to prepare for making omap3 device tree onl
Merge tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren: Changes needed to prepare for making omap3 device tree only:
- Always build in board-generic, and add pdata quirks and auxdata support for it so we have all the pdata related quirks in the same place.
- Merge of the drivers/pinctrl changes that are needed for PM to continue working on omap3 and also needed for other omaps eventually. The three pinctrl related patches have been acked by Linus Walleij and are pulled into both the pinctrl tree and this branch.
- Few defconfig related changes for drivers needed.
* tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (523 commits) ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies ARM: OMAP2+: Add WLAN modules and of_serial to omap2plus_defconfig ARM: OMAP2+: Run make savedefconfig on omap2plus_defconfig to shrink it ARM: OMAP2+: Add minimal 8250 support for GPMC ARM: OMAP2+: Use pdata quirks for wl12xx for omap3 evm and zoom3 ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap ARM: OMAP2+: Add support for auxdata pinctrl: single: Add support for auxdata pinctrl: single: Add support for wake-up interrupts pinctrl: single: Prepare for supporting SoC specific features ARM: OMAP2+: igep0020: use display init from dss-common ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board +Linux 3.12-rc4
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
6a9d10d5 |
| 15-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next into next/dt
From Dinh Nguyen: Updates to dts file structure for Altera's SOCFPGA
* Does not include any n
Merge tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next into next/dt
From Dinh Nguyen: Updates to dts file structure for Altera's SOCFPGA
* Does not include any new bindings or bindings change * Add dts file for a SOCFPGA with an Arria V FPGA * Add a clocks property for the TWD timer * Add support for Terasic SocKit Board which has Cyclone5 FPGA * From Steffen Trumtrar: "This series includes some minor cleanups (indentation and clock labels) and reorders the socfpga dts hierarchy from: socfpga.dtsi -> socfpga_$board.dts -> socfpga_$otherboard.dts to socfpga.dtsi -> socfpga_cyclone5.dtsi --> socfpga_cyclone5_$board.dts --> socfpga_cyclone5_$otherboard.dts "
* tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next: dts: socfpga: Add support for Altera's SOCFPGA Arria V board ARM: socfpga: dts: fix s2f_* clock name ARM: socfpga: dts: cleanup indentation ARM: socfpga: dts: Add support for terasic SoCkit ARM: socfpga: dts: Move common nodes to cyclone5 dtsi arm: socfpga: Add clock for smp_twd timer
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
4fd03763 |
| 14-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge branch 'renesas/boards2' into next/boards
From Simon Horman: * renesas/boards2: (64 commits) ARM: shmobile: marzen: enable INTC IRQ ARM: shmobile: bockw: add SMSC support on reference AR
Merge branch 'renesas/boards2' into next/boards
From Simon Horman: * renesas/boards2: (64 commits) ARM: shmobile: marzen: enable INTC IRQ ARM: shmobile: bockw: add SMSC support on reference ARM: shmobile: Use SMP on Koelsch ARM: shmobile: Remove KZM9D reference DTS ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB ARM: shmobile: Remove non-multiplatform KZM9D reference support ARM: shmobile: Use KZM9D without reference for multiplatform ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS ARM: shmobile: Use arch timer on Koelsch ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch ARM: shmobile: Genmai support ARM: shmobile: marzen: enable DMA for SDHI0 ARM: shmobile: bockw: enable DMA for SDHI0 ARM: shmobile: ape6evm: add DMA support to MMCIF ARM: shmobile: r8a7791 SMP support ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT ARM: shmobile: r8a7778: split r8a7778_init_irq_extpin() for DT ARM: shmobile: r7s72100 SCIF support ARM: shmobile: Initial r7s72100 SoC support ARM: shmobile: r8a7791 Arch timer workaround ...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
5992234b |
| 14-Oct-2013 |
Tony Lindgren <tony@atomide.com> |
ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
I've tested the serial, MMC, smsc911x, wl12xx, and off-idle support with the pinctrl patches, so it probably works better than the
ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
I've tested the serial, MMC, smsc911x, wl12xx, and off-idle support with the pinctrl patches, so it probably works better than the board-*.c files ever did. Also the board-omap3evm.c file is broken for the DSS, and has been for a while. Patches are welcome to fix it in this .dts file, let's just drop the board-*.c file for this.
Note that off-idle currently requires doing request_irq() on the wake-up pin from pinctrl-single IRQ domain until we can handle that in some Linux generic way.
[tony@atomide.com: updated for make dtbs build fix] Signed-off-by: Tony Lindgren <tony@atomide.com>
show more ...
|
#
f41509ad |
| 14-Oct-2013 |
Tony Lindgren <tony@atomide.com> |
Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal
We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and the platform data quirk changes
Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal
We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and the platform data quirk changes in omap-for-v3.13/quirk to start removing omap3 board files without breaking things.
show more ...
|
#
c49f4984 |
| 12-Oct-2013 |
Tony Lindgren <tony@atomide.com> |
Merge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add the minimal DTS support for DRA7xx based SoC core. Add the initial
Merge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add the minimal DTS support for DRA7xx based SoC core. Add the initial support for N900 and gta04 phones. Enable USB3 on OMAP5 evm board. Add support for cryto accelerators Add new IGEP AQUILA board Add AM33XX EDMA support Update HSUSB node to use the reset-gpios fmwk
show more ...
|
#
f797bd4a |
| 12-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
From Santosh Shilimkar: SOC updates for Keystone II devices:
- Clock tree
Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
From Santosh Shilimkar: SOC updates for Keystone II devices:
- Clock tree support - Clock management support using PM core - Keystone config update for EMDA with ack from Vinod - Enable SPI and I2C drivers
* tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: (510 commits) ARM: keystone: Enable I2C and SPI bus support ARM: keystone: Select TI_EDMA to be able to enable SPI driver dma: Allow TI_EDMA selectable for ARCH_KEYSTONE ARM: dts: keystone: Add the SPI nodes ARM: dts: keystone: Add i2c device nodes ARM: keystone: add PM domain support for clock management ARM: keystone: Enable clock drivers ARM: dts: keystone: Add clock phandle to UART nodes ARM: dts: keystone: Add clock tree data to devicetree +Linux 3.12-rc4
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
5cda1620 |
| 10-Sep-2013 |
Enric Balletbo i Serra <eballetbo@gmail.com> |
ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board.
The IGEP AQUILA EXPANSION board is a development platform for the IGEP COM AQUILA AM335x boards.
The board adds the following connecti
ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board.
The IGEP AQUILA EXPANSION board is a development platform for the IGEP COM AQUILA AM335x boards.
The board adds the following connectivity:
o USB OTG o USB HOST o HDMI o Ethernet o Serial Debug (3.3V) o 2x46 pin headers o EEPROM
Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
show more ...
|
#
f1ca2218 |
| 11-Oct-2013 |
Tony Lindgren <tony@atomide.com> |
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up interrupts that most omaps have in each pinctrl register.
As
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up interrupts that most omaps have in each pinctrl register.
As I need these merged also into the omap tree, it was agreed that I set them up into a separate branch for both pinctrl tree and linux-omap tree to merge as needed.
show more ...
|
#
163a0364 |
| 25-Sep-2013 |
Dinh Nguyen <dinguyen@altera.com> |
dts: socfpga: Add support for Altera's SOCFPGA Arria V board
Add support for a new SOCFPGA board that has an Arria V FPGA along with dual ARM Cortex-A9 cores.
Signed-off-by: Dinh Nguyen <dinguyen@a
dts: socfpga: Add support for Altera's SOCFPGA Arria V board
Add support for a new SOCFPGA board that has an Arria V FPGA along with dual ARM Cortex-A9 cores.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Cc: Pavel Machek <pavel@denx.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: devicetree@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org
show more ...
|
#
47ba5c81 |
| 07-Oct-2013 |
Steffen Trumtrar <s.trumtrar@pengutronix.de> |
ARM: socfpga: dts: Add support for terasic SoCkit
This adds basic support for the terasic SoCkit board. The board includes an Altera Cyclone 5 SoC.
[Dinh Nguyen] - Changed to 115200 for baudrate in
ARM: socfpga: dts: Add support for terasic SoCkit
This adds basic support for the terasic SoCkit board. The board includes an Altera Cyclone 5 SoC.
[Dinh Nguyen] - Changed to 115200 for baudrate in dts bootargs
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
show more ...
|
#
071fb4cb |
| 07-Oct-2013 |
Steffen Trumtrar <s.trumtrar@pengutronix.de> |
ARM: socfpga: dts: Move common nodes to cyclone5 dtsi
The current socfpga_cyclone5.dts describes the Altera Cyclone5 SoC Development Kit. The Cyclone5 includes a SoCFPGA, which itself can be include
ARM: socfpga: dts: Move common nodes to cyclone5 dtsi
The current socfpga_cyclone5.dts describes the Altera Cyclone5 SoC Development Kit. The Cyclone5 includes a SoCFPGA, which itself can be included in other SoC+FPGA combinations.
Instead of having to describe all Cyclone5 common nodes in every board specific dts, move socfpga_cyclone5.dts to a dtsi and include this in a new dts for the Development Kit.
[Dinh Nguyen] - Changed to 115200 for baudrate in dts bootargs
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
show more ...
|
#
03984365 |
| 09-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu dt changes for v3.13 (round 2)
- kirkwood - use MBus DT binding for setting up the windows
Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu dt changes for v3.13 (round 2)
- kirkwood - use MBus DT binding for setting up the windows - move crypto and nand underneath the mbus node - ib62x0 has a u-boot env partition
- mvebu - add the Armada XP matrix board
* tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu: arm: mvebu: add support for the Armada XP Matrix board ARM: kirkwood: ib62x0: add u-boot environment partition ARM: kirkwood: Move the nand node under the mbus node ARM: kirkwood: Move the crypto node under the mbus node ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
3197e4a1 |
| 09-Oct-2013 |
Kevin Hilman <khilman@linaro.org> |
Merge tag 'dt-3.13' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu dt changes for v3.13
- mvebu - add MSI - new compatible string for mv64xxx-i2c
- dove
Merge tag 'dt-3.13' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu dt changes for v3.13
- mvebu - add MSI - new compatible string for mv64xxx-i2c
- dove - use the pre-processor - define the MBus nodes - add PCIe controllers - add Globalscale D3Plug - relocate internal registers nodes
* tag 'dt-3.13' of git://git.infradead.org/linux-mvebu: ARM: dove: add initial DT file for Globalscale D3Plug ARM: dove: add PCIe controllers to SoC DT ARM: dove: relocate internal registers device nodes ARM: dove: add MBus DT node ARM: dove: add MBUS_ID macro to Dove DT ARM: dove: use preprocessor on device tree files ARM: mvebu: link PCIe controllers to the MSI controller ARM: mvebu: the MPIC now provides MSI controller features ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c
Signed-off-by: Kevin Hilman <khilman@linaro.org>
show more ...
|
#
37bf0637 |
| 09-Oct-2013 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.12-rc4' into sched/core
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree before applying more scheduler patches.
Conflicts: arch/avr32/include/asm/Kbuild
Signed-
Merge tag 'v3.12-rc4' into sched/core
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree before applying more scheduler patches.
Conflicts: arch/avr32/include/asm/Kbuild
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
#
a1425d42 |
| 08-Oct-2013 |
Joseph Lo <josephl@nvidia.com> |
ARM: tegra: add Venice2 board support
Add support for the Tegra124 based Venice2 reference board.
Signed-off-by: Joseph Lo <josephl@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
Revision tags: v3.11, v3.11-rc7, v3.11-rc6 |
|
#
adfe1473 |
| 15-Aug-2013 |
Marek Belisko <marek@goldelico.com> |
ARM: dts: Add devicetree for gta04 board.
This adds devicetree for gta04 (Openmoko next generation board) with necessary support for mmc, usb, leds and button.
Signed-off-by: Marek Belisko <marek@g
ARM: dts: Add devicetree for gta04 board.
This adds devicetree for gta04 (Openmoko next generation board) with necessary support for mmc, usb, leds and button.
Signed-off-by: Marek Belisko <marek@goldelico.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
show more ...
|
#
6e58b8f1 |
| 14-Aug-2013 |
R Sricharan <r.sricharan@ti.com> |
ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm board
Add minimal device tree source needed for DRA7 based SoCs. Also add a board dts file for the dra7-evm (based on dra752) which contai
ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm board
Add minimal device tree source needed for DRA7 based SoCs. Also add a board dts file for the dra7-evm (based on dra752) which contains 1.5G of memory with 1G interleaved and 512MB non-interleaved. Also added in the board file are pin configuration details for i2c, mcspi and uart devices on board.
Signed-off-by: R Sricharan <r.sricharan@ti.com> Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
show more ...
|