diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 04:59:22 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 04:59:22 +0400 |
| commit | cd5f48a7acd8aa3974019360dcecc8eebf24fa67 (patch) | |
| tree | 67f28c89b23efe26bbac8b3c6a545d4deaee7592 /arch/arm/boot/dts/ecx-2000.dts | |
| parent | 2b23e9a51d37a85723fb56a41515f53d351f3e62 (diff) | |
| parent | ba0d7ed391b7b3fb5ca98d9cf4d067b7f5ed956b (diff) | |
| download | linux-cd5f48a7acd8aa3974019360dcecc8eebf24fa67.tar.xz | |
Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
Merge "Samsung 2nd DT updates for v3.15" from Kukjin Kim:
- add DT entry for AHCI SATA and SATA PHY with using generic
PHY framework for exynos5250 and arndale, smdk5250 boards.
- add SSS DT node for exynos5420 and exynos5250
- remove leftover spi0 node for smdk5250 board
- add ADC and thermistor nodes for exynos4412-trats2 board
- move common irq-combiner node for exynos4x12 from exynos4212
and exynos4412
- add ADC, PMU and GPS_ALIVE power domain nodes for exynos4x12
Note that based on previous tags/samsung-dt and tags/exynos-clk
* tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: enable ahci sata and sata phy for exynos5250
ARM: dts: add dt node for sss module for exynos5250/5420
ARM: dts: Remove leftover spi0 node for smdk5250
ARM: dts: Add ADC and themistor nodes for exynos4412-trats2
ARM: dts: Move common dt data for interrupt combiner controller for exynos4x12
ARM: dts: Add GPS_ALIVE power domain for exynos4x12
ARM: dts: Add PMU dt data to support PMU for exynos4x12
ARM: dts: Add ADC's dt data to read raw data for exynos4x12
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/ecx-2000.dts')
0 files changed, 0 insertions, 0 deletions