diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 12:08:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 12:08:39 -0400 |
commit | e6c81cce5699ec6be3a7533b5ad7a062ab3357f2 (patch) | |
tree | 4592735bbfb17f163217d0bb80877dcc22a869c0 /arch/arm/boot/dts | |
parent | d0440c59f52d31aa7f74ba8e35cc22ee96acea84 (diff) | |
parent | a018bb2ff95868ea592212b6735b35836fda268b (diff) |
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Olof Johansson:
"Our SoC branch usually contains expanded support for new SoCs and
other core platform code. In this case, that includes:
- support for the new Annapurna Labs "Alpine" platform
- a rework greatly simplifying adding new platform support to the
MCPM subsystem (Multi-cluster power management)
- cpuidle and PM improvements for Exynos3250
- misc updates for Renesas, OMAP, Meson, i.MX. Some of these could
have gone in other branches but ended up here for various reasons"
* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
ARM: alpine: add support for generic pci
ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
ARM: vexpress: DCSCB: tighten CPU validity assertion
ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
ARM: MCPM: move the algorithmic complexity to the core code
ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
ARM: EXYNOS: add AFTR mode support for Exynos3250
ARM: EXYNOS: add code for setting/clearing boot flag
ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
ARM: EXYNOS: Remove left over 'extra_save'
ARM: EXYNOS: Constify exynos_pm_data array
ARM: EXYNOS: use static in suspend.c
ARM: EXYNOS: Use platform device name as power domain name
ARM: EXYNOS: add support for async-bridge clocks for pm_domains
ARM: omap-device: add missed callback for suspend-to-disk
...
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 0c3b6783b72a..2a0f895c48d0 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts | |||
@@ -513,9 +513,27 @@ | |||
513 | pinctrl-0 = <&iic3_pins>; | 513 | pinctrl-0 = <&iic3_pins>; |
514 | status = "okay"; | 514 | status = "okay"; |
515 | 515 | ||
516 | pmic@58 { | ||
517 | compatible = "dlg,da9063"; | ||
518 | reg = <0x58>; | ||
519 | interrupt-parent = <&irqc0>; | ||
520 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; | ||
521 | interrupt-controller; | ||
522 | |||
523 | rtc { | ||
524 | compatible = "dlg,da9063-rtc"; | ||
525 | }; | ||
526 | |||
527 | wdt { | ||
528 | compatible = "dlg,da9063-watchdog"; | ||
529 | }; | ||
530 | }; | ||
531 | |||
516 | vdd_dvfs: regulator@68 { | 532 | vdd_dvfs: regulator@68 { |
517 | compatible = "dlg,da9210"; | 533 | compatible = "dlg,da9210"; |
518 | reg = <0x68>; | 534 | reg = <0x68>; |
535 | interrupt-parent = <&irqc0>; | ||
536 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; | ||
519 | 537 | ||
520 | regulator-min-microvolt = <1000000>; | 538 | regulator-min-microvolt = <1000000>; |
521 | regulator-max-microvolt = <1000000>; | 539 | regulator-max-microvolt = <1000000>; |
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index a3c27807f6c5..b2dcf640d583 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts | |||
@@ -517,9 +517,27 @@ | |||
517 | status = "okay"; | 517 | status = "okay"; |
518 | clock-frequency = <100000>; | 518 | clock-frequency = <100000>; |
519 | 519 | ||
520 | pmic@58 { | ||
521 | compatible = "dlg,da9063"; | ||
522 | reg = <0x58>; | ||
523 | interrupt-parent = <&irqc0>; | ||
524 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; | ||
525 | interrupt-controller; | ||
526 | |||
527 | rtc { | ||
528 | compatible = "dlg,da9063-rtc"; | ||
529 | }; | ||
530 | |||
531 | wdt { | ||
532 | compatible = "dlg,da9063-watchdog"; | ||
533 | }; | ||
534 | }; | ||
535 | |||
520 | vdd_dvfs: regulator@68 { | 536 | vdd_dvfs: regulator@68 { |
521 | compatible = "dlg,da9210"; | 537 | compatible = "dlg,da9210"; |
522 | reg = <0x68>; | 538 | reg = <0x68>; |
539 | interrupt-parent = <&irqc0>; | ||
540 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; | ||
523 | 541 | ||
524 | regulator-min-microvolt = <1000000>; | 542 | regulator-min-microvolt = <1000000>; |
525 | regulator-max-microvolt = <1000000>; | 543 | regulator-max-microvolt = <1000000>; |