mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 20:33:49 -04:00
Code Issues Packages Projects Releases Wiki Activity
455,694 Commits 1 Branch 929 Tags
89d70e99fff9012fe8a38363f2c46e6ee23a6f47
Commit Graph

455694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olof Johansson
89d70e99ff Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt 
Merge "at91: dt for 3.17 #1" from Nicolas Ferre:

First DT update for 3.17:
- move of crystals DT definitions to the /clocks node
- addition of clock entries for sound for CCF enabled platforms
- addition of DMA and DMA + nand on at91sam9rl
- move to CCF for all not-converted-yet AT91 SoCs: at91rm9200, at91sam9260/9g20,
  at91sam9g45 family and at91sam9263

* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (43 commits)
  ARM: at91/dt: usb_a9263: define crystals frequencies
  ARM: at91/dt: tny_a9263: define crystals frequencies
  ARM: at91/dt: sam9263ek: define crystals frequencies
  ARM: at91: move at91sam9263 SoC to the CCF
  ARM: at91/dt: sam9263: define clocks
  ARM: at91: prepare common clk transition for sam9263
  ARM: at91/dt: cosino define crystals frequencies
  ARM: at91/dt: pm9g45: crystals frequencies
  ARM: at91/dt: sam9m10g45ek: define crystals frequencies
  ARM: at91: move at91sam9g45 SoC to the CCF
  ARM: at91/dt: sam9g45: define clocks
  ARM: at91: prepare common clk transition for sam9g45
  ARM: at91/dt: kizbox: define main crystal frequency
  ARM: at91/dt: animeo_ip: define crystals frequencies
  ARM: at91/dt: ethernut5: define crystals frequencies
  ARM: at91/dt: evk-pro3: define slow crytal frequency
  ARM: at91/dt: aks-cdu: define slow crytal frequency
  ARM: at91/dt: ge863-pro3: define main crystal frequency
  ARM: at91/dt: mpa1600: define crytals frequencies
  ARM: at91/dt: qil_a9260: define crystals frequencies
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
 2014-07-12 21:34:22 -07:00
Olof Johansson
c38114f393 Merge tag 'renesas-dt2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt 
Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.17" from Simon
Horman:

- Extend hardware coverage
  * Add DVC support for sound nodes on r8a7791 and r8a7790
  * Enable internal PCI on r8a7790/lager

* tag 'renesas-dt2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: add DVC support for sound node on DTSI
  ARM: shmobile: r8a7790: add DVC support for sound node on DTSI
  ARM: shmobile: lager: enable internal PCI
  ARM: shmobile: r8a7790: add internal PCI bridge nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
 2014-07-12 09:34:38 -07:00
Nicolas Ferre
bf4d997ab8 Merge tag 'CCF-for-3.17' of git://github.com/at91linux/linux-at91 into at91-3.17-dt 
Pull "CCF migration for 3.17" from Alexandre Belloni:
"This is the switch to CCF for all the remaining at91 SoCs and boards"
 2014-07-09 19:14:31 +02:00
Alexandre Belloni
447025e96d ARM: at91/dt: usb_a9263: define crystals frequencies 
Define Calao USB-A9263 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:23 +02:00
Alexandre Belloni
edc4a8349d ARM: at91/dt: tny_a9263: define crystals frequencies 
Define Calao TNY-A9263 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:22 +02:00
Alexandre Belloni
c8b41e005f ARM: at91/dt: sam9263ek: define crystals frequencies 
Define at91sam9263ek main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:22 +02:00
Alexandre Belloni
c2bddbd6f4 ARM: at91: move at91sam9263 SoC to the CCF 
This patch removes the selection of AT91_USE_OLD_CLK when selecting
at91sam9263 SoC support. This will automatically enable COMMON_CLK_AT91
option and add support for at91 common clock implementation.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:21 +02:00
Alexandre Belloni
c2375821c9 ARM: at91/dt: sam9263: define clocks 
Define the at91sam9263 clocks in the SoC dtsi file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:21 +02:00
Alexandre Belloni
b81ccb3293 ARM: at91: prepare common clk transition for sam9263 
Enclose the sam9263 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
 #endif"

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:21 +02:00
Alexandre Belloni
a0747caccd ARM: at91/dt: cosino define crystals frequencies 
Define Cosino boards main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:20 +02:00
Alexandre Belloni
57314956cc ARM: at91/dt: pm9g45: crystals frequencies 
Define Ronetix pm9g45 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:20 +02:00
Alexandre Belloni
4c67a1319b ARM: at91/dt: sam9m10g45ek: define crystals frequencies 
Define at91sam9m10g45ek main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:19 +02:00
Alexandre Belloni
5c5a57a45e ARM: at91: move at91sam9g45 SoC to the CCF 
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91sam9g45
SoC support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clock implementation.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:19 +02:00
Alexandre Belloni
6f368c3089 ARM: at91/dt: sam9g45: define clocks 
Define the at91sam9g45 clocks in the SoC dtsi file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:19 +02:00
Alexandre Belloni
003b45e287 ARM: at91: prepare common clk transition for sam9g45 
Enclose the sam9g45 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
 #endif"

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:18 +02:00
Alexandre Belloni
d738989f08 ARM: at91/dt: kizbox: define main crystal frequency 
Define kizbox board's main crystal frequency.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:18 +02:00
Alexandre Belloni
650defcf96 ARM: at91/dt: animeo_ip: define crystals frequencies 
Define Somfy Animeo IP main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:18 +02:00
Alexandre Belloni
b77d635007 ARM: at91/dt: ethernut5: define crystals frequencies 
Define egnite Ethernut 5 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:17 +02:00
Alexandre Belloni
2421d1c6d2 ARM: at91/dt: evk-pro3: define slow crytal frequency 
Define Telit EVK-PRO3 slow crystal frequency

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:17 +02:00
Alexandre Belloni
c544bc7a43 ARM: at91/dt: aks-cdu: define slow crytal frequency 
Define AK signal CDU slow crystal frequency

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:16 +02:00
Alexandre Belloni
cea5c34dfb ARM: at91/dt: ge863-pro3: define main crystal frequency 
Define Telit GE863-PRO3 main crystal frequency.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:16 +02:00
Alexandre Belloni
80994f0a73 ARM: at91/dt: mpa1600: define crytals frequencies 
Define Phontech MPA 1600 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:16 +02:00
Alexandre Belloni
322192640b ARM: at91/dt: qil_a9260: define crystals frequencies 
Define Calao QIL-A9260 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:15 +02:00
Alexandre Belloni
90de7ccc81 ARM: at91/dt: tny_a9260: define crystals frequencies 
Define Calao TNY-A9260 and TNY-A9G20 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:15 +02:00
Alexandre Belloni
f1e7861518 ARM: at91/dt: usb_a9260: define crystals frequencies 
Define Calao USB-A9260, USB-A9G20 and USB-A9G20-LPW main and slow crystals
frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:14 +02:00
Alexandre Belloni
32cc703a23 ARM: at91/dt: foxg20: define crystals frequencies 
Define Acme Systems srl Fox G20 main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:14 +02:00
Alexandre Belloni
f48a833534 ARM: at91/dt: at91sam9g20ek: define crystals frequencies 
Define at91sam9g20ek main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:14 +02:00
Alexandre Belloni
20183110a8 ARM: at91: move at91sam9260 SoCs to the CCF 
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91sam9260
SoCs support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clk implementation.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:13 +02:00
Alexandre Belloni
09d773cea8 ARM: at91/dt: sam9g20: define clocks 
Define the at91sam9g20 clocks that differ from at91sam9260 in the SoC dtsi file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:13 +02:00
Alexandre Belloni
684b8fb5a0 ARM: at91/dt: sam9260: define clocks 
Define the at91sam9260 clocks in the SoC dtsi file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:13 +02:00
Alexandre Belloni
57b37ed519 ARM: at91: prepare common clk transition for sam9260 
Enclose the sam9260 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
 #endif"

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:12 +02:00
Alexandre Belloni
94788118ef ARM: at91/dt: at91rm9200ek: define crystals frequencies 
Define at91rm9200ek main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:12 +02:00
Alexandre Belloni
93af052da5 ARM: at91: move at91rm9200 SoC to the CCF 
This patch removes the selection of AT91_USE_OLD_CLK when selecting at91rm9200
SoC support. This will automatically enable COMMON_CLK_AT91 option and add
support for at91 common clk implementation.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:11 +02:00
Alexandre Belloni
68580013ad ARM: at91/dt: rm9200: define clocks 
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:11 +02:00
Alexandre Belloni
36c203f1ca ARM: at91: prepare common clk transition for rm9200 
Enclose the rm9200 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
 #endif"

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:11 +02:00
Alexandre Belloni
152f3003f0 ARM: at91/dt: ariag25: define crystals frequencies 
Define Acme Systems Aria G25 board main and slow crystals frequencies.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 19:05:10 +02:00
Alexandre Belloni
ed0a3ff435 Documentation: dt: document all the atmel pmc compatibles 
Documentation for atmel-pmc only list one compatible, add the remaining
compatible strings.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
 2014-07-09 19:05:10 +02:00
Nicolas Ferre
ad7c56aa2d ARM: at91/dt: add NAND + DMA property for at91sam9rl 
Add the "atmel,nand-has-dma" property to NAND node

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
 2014-07-09 18:02:47 +02:00
Nicolas Ferre
4cd9292926 ARM: at91/dt: add DMA controller node to at91sam9rl 
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
 2014-07-09 18:02:46 +02:00
Bo Shen
38324358c5 ARM: at91: at91sam9n12ek: switch sound to CCF 
As the at91sam9n12ek has switch to CCF, so add clock for wm8904

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviwed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:46 +02:00
Bo Shen
18f44d7bd6 ARM: at91: sama5d3xek: switch sound to CCF 
As the sama5d3xek board has switch to CCF, so add clock for wm8904

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviwed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:45 +02:00
Alexandre Belloni
334394c0d8 ARM: at91/dt: sama5d3 crystals under the clocks node 
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the sama5d3 SoC and sama5d3 based boards.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:45 +02:00
Alexandre Belloni
12dde44998 ARM: at91/dt: sam9x5 crystals under the clocks node 
Having clocks grouped in a subnode is common practice, so move the crystals and
the ADC clock under a clocks node for the at91sam9x5 SoC and at91sam9x5 based
boards.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:44 +02:00
Alexandre Belloni
c2c9e78e2f ARM: at91/dt: sam9rl crystals under the clocks node 
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9rl SoC and at91sam9rl based boards.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:44 +02:00
Alexandre Belloni
6503ab5fc7 ARM: at91/dt: sam9n12 crystals under the clocks node 
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9n12 SoC and at91sam9n12 based boards.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:43 +02:00
Alexandre Belloni
73b173e5c5 ARM: at91/dt: sam9261 crystals under the clocks node 
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9261 SoC and at91sam9261 based boards.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
 2014-07-09 18:02:43 +02:00
Olof Johansson
74498a6de2 Merge tag 'berlin-dt-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt 
Merge "Berlin DT changes for v3.17" from Sebastian Hesselbarth:

- L2CC latency properties for BG2Q
- DW i2c nodes for BG2Q and corresponding dev board
- SMP related nodes for BG2 and BG2Q

* tag 'berlin-dt-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: add SMP related nodes and properties for BG2Q
  ARM: dts: berlin: add SMP related nodes and properties for BG2
  Documentation: bindings: add the marvell,berlin-smp CPU enable method
  Documentation: bindings: add the Berlin CPU control doc
  ARM: dts: berlin: enable i2c0 and i2c2
  ARM: dts: berlin: add I2C nodes for BG2Q
  ARM: dts: berlin2q: set L2CC tag and data latency to 2 cycles

Signed-off-by: Olof Johansson <olof@lixom.net>
 2014-07-07 22:42:33 -07:00
Olof Johansson
cc7b990440 Merge tag 'renesas-dt-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt 
Merge "Renesas ARM Based SoC DT Updates for v3.17" from Simon Horman:

Increased hardware coverage:
- Add R-Car sounds support to r8a7790 SoC
- Add PCIe support to r8a7790 and r8a7791 SoCs
- Increase I2C support of Henninger and lager boards
- DVFS support to Koelsch board
- Add SYS-DMAC clocks to r8a7791 SoCs
- Add USB 3.0 clocks to r8a7791 and r8a7790 SoCs
- Add LED labels to armadillo800eva board

Cleanup:
- Remove early_printk from marzen command line

* tag 'renesas-dt-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
  ARM: shmobile: r8a7791: add R-Car sound support on DTSI
  ARM: shmobile: henninger: Enable PCIe Controller & PCIe bus clock
  ARM: shmobile: koelsch: Enable PCIe Controller & PCIe bus clock
  ARM: shmobile: r8a7791: Add PCIe Controller device node
  ARM: shmobile: r8a7791: Add default PCIe bus clock
  ARM: shmobile: r8a7791: Add PCIEC clock device tree node
  ARM: shmobile: r8a7790: Add PCIe Controller device node
  ARM: shmobile: r8a7790: Add default PCIe bus clock
  ARM: shmobile: r8a7790: Add PCIEC clock device tree node
  ARM: shmobile: r8a7791: add MSTP10 support on DTSI
  ARM: shmobile: r8a7791: add audio clock on DTSI
  ARM: shmobile: r8a7790: add R-Car sound support on DTSI
  ARM: shmobile: r8a7790: add MSTP10 support on DTSI
  ARM: shmobile: henninger: add I2C2 DT support
  ARM: shmobile: koelsch: Remove duplicate i2c6 nodes
  ARM: shmobile: lager: Remove duplicate i2c3 nodes
  ARM: shmobile: Lager memory map update
  ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
  ARM: shmobile: lager: add i2c1, i2c2 pins
  ARM: shmobile: lager: enable i2c devices
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
 2014-07-06 17:22:26 -07:00
Linus Torvalds
4c834452aa Linux 3.16-rc3 v3.16-rc3 2014-06-29 14:11:36 -07:00
Linus Torvalds
ef2e0391e5 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 
Pull ARM fixes from Russell King:
 "Another round of ARM fixes.  The largest change here is the L2 changes
  to work around problems for the Armada 37x/380 devices, where most of
  the size comes down to comments rather than code.

  The other significant fix here is for the ptrace code, to ensure that
  rewritten syscalls work as intended.  This was pointed out by Kees
  Cook, but Will Deacon reworked the patch to be more elegant.

  The remainder are fairly trivial changes"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8087/1: ptrace: reload syscall number after secure_computing() check
  ARM: 8086/1: Set memblock limit for nommu
  ARM: 8085/1: sa1100: collie: add top boot mtd partition
  ARM: 8084/1: sa1100: collie: revert back to cfi_probe
  ARM: 8080/1: mcpm.h: remove unused variable declaration
  ARM: 8076/1: mm: add support for HW coherent systems in PL310 cache
 2014-06-29 13:40:08 -07:00