Merge tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorKevin Hilman <khilman@linaro.org>
Tue, 20 Aug 2013 22:34:49 +0000 (15:34 -0700)
committerKevin Hilman <khilman@linaro.org>
Tue, 20 Aug 2013 22:34:49 +0000 (15:34 -0700)
From: Linus Walleij:
Ux500 device tree enablement base for the v3.12
development cycle:
- Various cleanups like remove non-existant hardware from
  the Snowball device tree, prefix all files with "ste-*"
- External regulators
- Documentation updates
- Delete some minor dangling platform data
- Pin control settings for U8540 through DT

* tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (22 commits)
  ARM: ux500: fix devicetree builds
  ARM: ux500: Remove u9540.dts as it's been replaced
  ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi
  ARM: ux500: Apply a ste-* prefix onto stuib.dtsi
  ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts
  ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org>
  ARM: ux500: Apply a ste-* prefix onto href.dtsi
  ARM: ux500: Apply a ste-* prefix onto ccu9540.dts
  ARM: ux500: Apply a ste-* prefix onto ccu8540.dts
  ARM: ux500: Apply a ste-* prefix onto snowball.dts
  ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor
  ARM: ux500: Remove Snowball DTS entry for TPS61052 chip
  ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip
  ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS
  ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
  ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
  ARM: ux500: Stop passing MMC's platform data for Device Tree boots
  Documentation: Update binding for Nomadik and DBx5x based platforms
  ARM: ux500: Supply external regulator names for Snowball's DT
  ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use
  ...

23 files changed:
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/ccu8540.dts [deleted file]
arch/arm/boot/dts/ccu9540.dts [deleted file]
arch/arm/boot/dts/dbx5x0.dtsi [deleted file]
arch/arm/boot/dts/href.dtsi [deleted file]
arch/arm/boot/dts/hrefprev60.dts [deleted file]
arch/arm/boot/dts/hrefv60plus.dts [deleted file]
arch/arm/boot/dts/snowball.dts [deleted file]
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi [new file with mode: 0644]
arch/arm/boot/dts/ste-ccu8540.dts [new file with mode: 0644]
arch/arm/boot/dts/ste-ccu9540.dts [new file with mode: 0644]
arch/arm/boot/dts/ste-dbx5x0.dtsi [new file with mode: 0644]
arch/arm/boot/dts/ste-href.dtsi [new file with mode: 0644]
arch/arm/boot/dts/ste-hrefprev60.dts [new file with mode: 0644]
arch/arm/boot/dts/ste-hrefv60plus.dts [new file with mode: 0644]
arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi [new file with mode: 0644]
arch/arm/boot/dts/ste-snowball.dts [new file with mode: 0644]
arch/arm/boot/dts/ste-stuib.dtsi [new file with mode: 0644]
arch/arm/boot/dts/stuib.dtsi [deleted file]
arch/arm/boot/dts/u9540.dts [deleted file]
arch/arm/mach-ux500/cpu-db8500.c
include/dt-bindings/pinctrl/nomadik.h [new file with mode: 0644]

index 9a2f3f420526938232848c56d5decfed34c9ca33..6b33b9f18e88347d5f2d2cd3b8e0d85d5ea13b12 100644 (file)
@@ -1,8 +1,8 @@
 ST Ericsson Nomadik pinmux controller
 
 Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"
 - reg: Should contain the register physical address and length of the PRCMU.
 
 Please refer to pinctrl-bindings.txt in this directory for details of the
@@ -68,7 +68,7 @@ Optional subnode-properties:
 Example board file extract:
 
        pinctrl@80157000 {
-               compatible = "stericsson,nmk-pinctrl";
+               compatible = "stericsson,db8500-pinctrl";
                reg = <0x80157000 0x2000>;
 
                pinctrl-names = "default";
index f3861de9fd4ee06cccab4d13552da832f92e36c5..c2977ef59943b4f91d978c35dc328150295129b3 100644 (file)
@@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
        am43x-epos-evm.dtb
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
-dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
-       hrefprev60.dtb \
-       hrefv60plus.dtb \
-       ccu8540.dtb \
-       ccu9540.dtb
+dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
+       ste-hrefprev60.dtb \
+       ste-hrefv60plus.dtb \
+       ste-ccu8540.dtb \
+       ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        emev2-kzm9d-reference.dtb \
diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts
deleted file mode 100644 (file)
index 48ff034..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-
-/ {
-       model = "ST-Ericsson U8540 platform with Device Tree";
-       compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
-
-       memory@0 {
-               reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
-       };
-
-       soc {
-               prcmu@80157000 {
-                       reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
-                       reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
-               };
-
-               uart@80120000 {
-                       status = "okay";
-               };
-
-               uart@80121000 {
-                       status = "okay";
-               };
-
-               uart@80007000 {
-                       status = "okay";
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts
deleted file mode 100644 (file)
index ed29ec7..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-
-/ {
-       model = "ST-Ericsson CCU9540 platform with Device Tree";
-       compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
-
-       memory {
-               reg = <0x00000000 0x20000000>;
-       };
-
-       soc {
-               uart@80120000 {
-                       status = "okay";
-               };
-
-               uart@80121000 {
-                       status = "okay";
-               };
-
-               uart@80007000 {
-                       status = "okay";
-               };
-
-               // External Micro SD slot
-               sdi0_per1@80126000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-                       cd-gpios  = <&gpio7 6 0x4>; // 230
-                       cd-inverted;
-
-                       status = "okay";
-               };
-
-
-               // WLAN SDIO channel
-               sdi1_per2@80118000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-
-                       status = "okay";
-               };
-
-               // On-board eMMC
-               sdi4_per2@80114000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                       status = "okay";
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
deleted file mode 100644 (file)
index a152945..0000000
+++ /dev/null
@@ -1,781 +0,0 @@
-/*
- * Copyright 2012 Linaro Ltd
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include "skeleton.dtsi"
-
-/ {
-       soc {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "stericsson,db8500";
-               interrupt-parent = <&intc>;
-               ranges;
-
-               intc: interrupt-controller@a0411000 {
-                       compatible = "arm,cortex-a9-gic";
-                       #interrupt-cells = <3>;
-                       #address-cells = <1>;
-                       interrupt-controller;
-                       reg = <0xa0411000 0x1000>,
-                             <0xa0410100 0x100>;
-               };
-
-               L2: l2-cache {
-                       compatible = "arm,pl310-cache";
-                       reg = <0xa0412000 0x1000>;
-                       interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
-                       cache-unified;
-                       cache-level = <2>;
-               };
-
-               pmu {
-                       compatible = "arm,cortex-a9-pmu";
-                       interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               timer@a0410600 {
-                       compatible = "arm,cortex-a9-twd-timer";
-                       reg = <0xa0410600 0x20>;
-                       interrupts = <1 13 0x304>; /* IRQ level high per-CPU */
-               };
-
-               rtc@80154000 {
-                       compatible = "arm,rtc-pl031", "arm,primecell";
-                       reg = <0x80154000 0x1000>;
-                       interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               gpio0: gpio@8012e000 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8012e000 0x80>;
-                       interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <0>;
-               };
-
-               gpio1: gpio@8012e080 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8012e080 0x80>;
-                       interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <1>;
-               };
-
-               gpio2: gpio@8000e000 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8000e000 0x80>;
-                       interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <2>;
-               };
-
-               gpio3: gpio@8000e080 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8000e080 0x80>;
-                       interrupts = <0 122 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <3>;
-               };
-
-               gpio4: gpio@8000e100 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8000e100 0x80>;
-                       interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <4>;
-               };
-
-               gpio5: gpio@8000e180 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8000e180 0x80>;
-                       interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <5>;
-               };
-
-               gpio6: gpio@8011e000 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8011e000 0x80>;
-                       interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <6>;
-               };
-
-               gpio7: gpio@8011e080 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0x8011e080 0x80>;
-                       interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <7>;
-               };
-
-               gpio8: gpio@a03fe000 {
-                       compatible = "stericsson,db8500-gpio",
-                               "st,nomadik-gpio";
-                       reg =  <0xa03fe000 0x80>;
-                       interrupts = <0 127 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       st,supports-sleepmode;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-bank = <8>;
-               };
-
-               pinctrl {
-                       compatible = "stericsson,db8500-pinctrl";
-                       prcm = <&prcmu>;
-               };
-
-               usb_per5@a03e0000 {
-                       compatible = "stericsson,db8500-musb",
-                               "mentor,musb";
-                       reg = <0xa03e0000 0x10000>;
-                       interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "mc";
-
-                       dr_mode = "otg";
-
-                       dmas = <&dma 38 0 0x2>, /* Logical - DevToMem */
-                              <&dma 38 0 0x0>, /* Logical - MemToDev */
-                              <&dma 37 0 0x2>, /* Logical - DevToMem */
-                              <&dma 37 0 0x0>, /* Logical - MemToDev */
-                              <&dma 36 0 0x2>, /* Logical - DevToMem */
-                              <&dma 36 0 0x0>, /* Logical - MemToDev */
-                              <&dma 19 0 0x2>, /* Logical - DevToMem */
-                              <&dma 19 0 0x0>, /* Logical - MemToDev */
-                              <&dma 18 0 0x2>, /* Logical - DevToMem */
-                              <&dma 18 0 0x0>, /* Logical - MemToDev */
-                              <&dma 17 0 0x2>, /* Logical - DevToMem */
-                              <&dma 17 0 0x0>, /* Logical - MemToDev */
-                              <&dma 16 0 0x2>, /* Logical - DevToMem */
-                              <&dma 16 0 0x0>, /* Logical - MemToDev */
-                              <&dma 39 0 0x2>, /* Logical - DevToMem */
-                              <&dma 39 0 0x0>; /* Logical - MemToDev */
-
-                       dma-names = "iep_1_9",  "oep_1_9",
-                                   "iep_2_10", "oep_2_10",
-                                   "iep_3_11", "oep_3_11",
-                                   "iep_4_12", "oep_4_12",
-                                   "iep_5_13", "oep_5_13",
-                                   "iep_6_14", "oep_6_14",
-                                   "iep_7_15", "oep_7_15",
-                                   "iep_8",    "oep_8";
-               };
-
-               dma: dma-controller@801C0000 {
-                       compatible = "stericsson,db8500-dma40", "stericsson,dma40";
-                       reg = <0x801C0000 0x1000 0x40010000 0x800>;
-                       reg-names = "base", "lcpa";
-                       interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
-
-                       #dma-cells = <3>;
-                       memcpy-channels = <56 57 58 59 60>;
-               };
-
-               prcmu: prcmu@80157000 {
-                       compatible = "stericsson,db8500-prcmu";
-                       reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
-                       reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
-                       interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       ranges;
-
-                       prcmu-timer-4@80157450 {
-                               compatible = "stericsson,db8500-prcmu-timer-4";
-                               reg = <0x80157450 0xC>;
-                       };
-
-                       thermal@801573c0 {
-                               compatible = "stericsson,db8500-thermal";
-                               reg = <0x801573c0 0x40>;
-                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,
-                                            <22 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
-                               status = "disabled";
-                        };
-
-                       db8500-prcmu-regulators {
-                               compatible = "stericsson,db8500-prcmu-regulator";
-
-                               // DB8500_REGULATOR_VAPE
-                               db8500_vape_reg: db8500_vape {
-                                       regulator-compatible = "db8500_vape";
-                                       regulator-always-on;
-                               };
-
-                               // DB8500_REGULATOR_VARM
-                               db8500_varm_reg: db8500_varm {
-                                       regulator-compatible = "db8500_varm";
-                               };
-
-                               // DB8500_REGULATOR_VMODEM
-                               db8500_vmodem_reg: db8500_vmodem {
-                                       regulator-compatible = "db8500_vmodem";
-                               };
-
-                               // DB8500_REGULATOR_VPLL
-                               db8500_vpll_reg: db8500_vpll {
-                                       regulator-compatible = "db8500_vpll";
-                               };
-
-                               // DB8500_REGULATOR_VSMPS1
-                               db8500_vsmps1_reg: db8500_vsmps1 {
-                                       regulator-compatible = "db8500_vsmps1";
-                               };
-
-                               // DB8500_REGULATOR_VSMPS2
-                               db8500_vsmps2_reg: db8500_vsmps2 {
-                                       regulator-compatible = "db8500_vsmps2";
-                               };
-
-                               // DB8500_REGULATOR_VSMPS3
-                               db8500_vsmps3_reg: db8500_vsmps3 {
-                                       regulator-compatible = "db8500_vsmps3";
-                               };
-
-                               // DB8500_REGULATOR_VRF1
-                               db8500_vrf1_reg: db8500_vrf1 {
-                                       regulator-compatible = "db8500_vrf1";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SVAMMDSP
-                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
-                                       regulator-compatible = "db8500_sva_mmdsp";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SVAMMDSPRET
-                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
-                                       regulator-compatible = "db8500_sva_mmdsp_ret";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SVAPIPE
-                               db8500_sva_pipe_reg: db8500_sva_pipe {
-                                       regulator-compatible = "db8500_sva_pipe";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SIAMMDSP
-                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
-                                       regulator-compatible = "db8500_sia_mmdsp";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SIAMMDSPRET
-                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SIAPIPE
-                               db8500_sia_pipe_reg: db8500_sia_pipe {
-                                       regulator-compatible = "db8500_sia_pipe";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_SGA
-                               db8500_sga_reg: db8500_sga {
-                                       regulator-compatible = "db8500_sga";
-                                       vin-supply = <&db8500_vape_reg>;
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_B2R2_MCDE
-                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
-                                       regulator-compatible = "db8500_b2r2_mcde";
-                                       vin-supply = <&db8500_vape_reg>;
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_ESRAM12
-                               db8500_esram12_reg: db8500_esram12 {
-                                       regulator-compatible = "db8500_esram12";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_ESRAM12RET
-                               db8500_esram12_ret_reg: db8500_esram12_ret {
-                                       regulator-compatible = "db8500_esram12_ret";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_ESRAM34
-                               db8500_esram34_reg: db8500_esram34 {
-                                       regulator-compatible = "db8500_esram34";
-                               };
-
-                               // DB8500_REGULATOR_SWITCH_ESRAM34RET
-                               db8500_esram34_ret_reg: db8500_esram34_ret {
-                                       regulator-compatible = "db8500_esram34_ret";
-                               };
-                       };
-
-                       ab8500 {
-                               compatible = "stericsson,ab8500";
-                               interrupt-parent = <&intc>;
-                               interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-
-                               ab8500_gpio: ab8500-gpio {
-                                       gpio-controller;
-                                       #gpio-cells = <2>;
-                               };
-
-                               ab8500-rtc {
-                                       compatible = "stericsson,ab8500-rtc";
-                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH
-                                                     18 IRQ_TYPE_LEVEL_HIGH>;
-                                       interrupt-names = "60S", "ALARM";
-                               };
-
-                               ab8500-gpadc {
-                                       compatible = "stericsson,ab8500-gpadc";
-                                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH
-                                                     39 IRQ_TYPE_LEVEL_HIGH>;
-                                       interrupt-names = "HW_CONV_END", "SW_CONV_END";
-                                       vddadc-supply = <&ab8500_ldo_tvout_reg>;
-                               };
-
-                               ab8500_battery: ab8500_battery {
-                                       stericsson,battery-type = "LIPO";
-                                       thermistor-on-batctrl;
-                               };
-
-                               ab8500_fg {
-                                       compatible = "stericsson,ab8500-fg";
-                                       battery    = <&ab8500_battery>;
-                               };
-
-                               ab8500_btemp {
-                                       compatible = "stericsson,ab8500-btemp";
-                                       battery    = <&ab8500_battery>;
-                               };
-
-                               ab8500_charger {
-                                       compatible      = "stericsson,ab8500-charger";
-                                       battery         = <&ab8500_battery>;
-                                       vddadc-supply   = <&ab8500_ldo_tvout_reg>;
-                               };
-
-                               ab8500_chargalg {
-                                       compatible      = "stericsson,ab8500-chargalg";
-                                       battery         = <&ab8500_battery>;
-                               };
-
-                               ab8500_usb {
-                                       compatible = "stericsson,ab8500-usb";
-                                       interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
-                                                      96 IRQ_TYPE_LEVEL_HIGH
-                                                      14 IRQ_TYPE_LEVEL_HIGH
-                                                      15 IRQ_TYPE_LEVEL_HIGH
-                                                      79 IRQ_TYPE_LEVEL_HIGH
-                                                      74 IRQ_TYPE_LEVEL_HIGH
-                                                      75 IRQ_TYPE_LEVEL_HIGH>;
-                                       interrupt-names = "ID_WAKEUP_R",
-                                                         "ID_WAKEUP_F",
-                                                         "VBUS_DET_F",
-                                                         "VBUS_DET_R",
-                                                         "USB_LINK_STATUS",
-                                                         "USB_ADP_PROBE_PLUG",
-                                                         "USB_ADP_PROBE_UNPLUG";
-                                       vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
-                                       v-ape-supply = <&db8500_vape_reg>;
-                                       musb_1v8-supply = <&db8500_vsmps2_reg>;
-                               };
-
-                               ab8500-ponkey {
-                                       compatible = "stericsson,ab8500-poweron-key";
-                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH
-                                                     7 IRQ_TYPE_LEVEL_HIGH>;
-                                       interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
-                               };
-
-                               ab8500-sysctrl {
-                                       compatible = "stericsson,ab8500-sysctrl";
-                               };
-
-                               ab8500-pwm {
-                                       compatible = "stericsson,ab8500-pwm";
-                               };
-
-                               ab8500-debugfs {
-                                       compatible = "stericsson,ab8500-debug";
-                               };
-
-                               codec: ab8500-codec {
-                                       compatible = "stericsson,ab8500-codec";
-
-                                       V-AUD-supply = <&ab8500_ldo_audio_reg>;
-                                       V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
-                                       V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
-                                       V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
-
-                                       stericsson,earpeice-cmv = <950>; /* Units in mV. */
-                               };
-
-                               ab8500-regulators {
-                                       compatible = "stericsson,ab8500-regulator";
-
-                                       // supplies to the display/camera
-                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
-                                               regulator-compatible = "ab8500_ldo_aux1";
-                                               regulator-min-microvolt = <2500000>;
-                                               regulator-max-microvolt = <2900000>;
-                                               regulator-boot-on;
-                                               /* BUG: If turned off MMC will be affected. */
-                                               regulator-always-on;
-                                       };
-
-                                       // supplies to the on-board eMMC
-                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
-                                               regulator-compatible = "ab8500_ldo_aux2";
-                                               regulator-min-microvolt = <1100000>;
-                                               regulator-max-microvolt = <3300000>;
-                                       };
-
-                                       // supply for VAUX3; SDcard slots
-                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
-                                               regulator-compatible = "ab8500_ldo_aux3";
-                                               regulator-min-microvolt = <1100000>;
-                                               regulator-max-microvolt = <3300000>;
-                                       };
-
-                                       // supply for v-intcore12; VINTCORE12 LDO
-                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
-                                               regulator-compatible = "ab8500_ldo_intcore";
-                                       };
-
-                                       // supply for tvout; gpadc; TVOUT LDO
-                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
-                                               regulator-compatible = "ab8500_ldo_tvout";
-                                       };
-
-                                       // supply for ab8500-usb; USB LDO
-                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
-                                               regulator-compatible = "ab8500_ldo_usb";
-                                       };
-
-                                       // supply for ab8500-vaudio; VAUDIO LDO
-                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
-                                               regulator-compatible = "ab8500_ldo_audio";
-                                       };
-
-                                       // supply for v-anamic1 VAMIC1 LDO
-                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
-                                               regulator-compatible = "ab8500_ldo_anamic1";
-                                       };
-
-                                       // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
-                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
-                                               regulator-compatible = "ab8500_ldo_anamic2";
-                                       };
-
-                                       // supply for v-dmic; VDMIC LDO
-                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
-                                               regulator-compatible = "ab8500_ldo_dmic";
-                                       };
-
-                                       // supply for U8500 CSI/DSI; VANA LDO
-                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
-                                               regulator-compatible = "ab8500_ldo_ana";
-                                       };
-                               };
-                       };
-               };
-
-               i2c@80004000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
-                       reg = <0x80004000 0x1000>;
-                       interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
-                       arm,primecell-periphid = <0x180024>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       v-i2c-supply = <&db8500_vape_reg>;
-
-                       clock-frequency = <400000>;
-               };
-
-               i2c@80122000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
-                       reg = <0x80122000 0x1000>;
-                       interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
-                       arm,primecell-periphid = <0x180024>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       v-i2c-supply = <&db8500_vape_reg>;
-
-                       clock-frequency = <400000>;
-               };
-
-               i2c@80128000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
-                       reg = <0x80128000 0x1000>;
-                       interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
-                       arm,primecell-periphid = <0x180024>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       v-i2c-supply = <&db8500_vape_reg>;
-
-                       clock-frequency = <400000>;
-               };
-
-               i2c@80110000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
-                       reg = <0x80110000 0x1000>;
-                       interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>;
-                       arm,primecell-periphid = <0x180024>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       v-i2c-supply = <&db8500_vape_reg>;
-
-                       clock-frequency = <400000>;
-               };
-
-               i2c@8012a000 {
-                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
-                       reg = <0x8012a000 0x1000>;
-                       interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
-                       arm,primecell-periphid = <0x180024>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       v-i2c-supply = <&db8500_vape_reg>;
-
-                       clock-frequency = <400000>;
-               };
-
-               ssp@80002000 {
-                       compatible = "arm,pl022", "arm,primecell";
-                       reg = <0x80002000 0x1000>;
-                       interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               uart@80120000 {
-                       compatible = "arm,pl011", "arm,primecell";
-                       reg = <0x80120000 0x1000>;
-                       interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 13 0 0x2>, /* Logical - DevToMem */
-                              <&dma 13 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               uart@80121000 {
-                       compatible = "arm,pl011", "arm,primecell";
-                       reg = <0x80121000 0x1000>;
-                       interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 12 0 0x2>, /* Logical - DevToMem */
-                              <&dma 12 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               uart@80007000 {
-                       compatible = "arm,pl011", "arm,primecell";
-                       reg = <0x80007000 0x1000>;
-                       interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 11 0 0x2>, /* Logical - DevToMem */
-                              <&dma 11 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               sdi0_per1@80126000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80126000 0x1000>;
-                       interrupts = <0 60 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 29 0 0x2>, /* Logical - DevToMem */
-                              <&dma 29 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               sdi1_per2@80118000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80118000 0x1000>;
-                       interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 32 0 0x2>, /* Logical - DevToMem */
-                              <&dma 32 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               sdi2_per3@80005000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80005000 0x1000>;
-                       interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 28 0 0x2>, /* Logical - DevToMem */
-                              <&dma 28 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               sdi3_per2@80119000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80119000 0x1000>;
-                       interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
-                       status = "disabled";
-               };
-
-               sdi4_per2@80114000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80114000 0x1000>;
-                       interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
-
-                       dmas = <&dma 42 0 0x2>, /* Logical - DevToMem */
-                              <&dma 42 0 0x0>; /* Logical - MemToDev */
-                       dma-names = "rx", "tx";
-
-                       status = "disabled";
-               };
-
-               sdi5_per3@80008000 {
-                       compatible = "arm,pl18x", "arm,primecell";
-                       reg = <0x80008000 0x1000>;
-                       interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
-                       status = "disabled";
-               };
-
-               msp0: msp@80123000 {
-                       compatible = "stericsson,ux500-msp-i2s";
-                       reg = <0x80123000 0x1000>;
-                       interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
-                       v-ape-supply = <&db8500_vape_reg>;
-                       status = "disabled";
-               };
-
-               msp1: msp@80124000 {
-                       compatible = "stericsson,ux500-msp-i2s";
-                       reg = <0x80124000 0x1000>;
-                       interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
-                       v-ape-supply = <&db8500_vape_reg>;
-                       status = "disabled";
-               };
-
-               // HDMI sound
-               msp2: msp@80117000 {
-                       compatible = "stericsson,ux500-msp-i2s";
-                       reg = <0x80117000 0x1000>;
-                       interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
-                       v-ape-supply = <&db8500_vape_reg>;
-                       status = "disabled";
-               };
-
-               msp3: msp@80125000 {
-                       compatible = "stericsson,ux500-msp-i2s";
-                       reg = <0x80125000 0x1000>;
-                       interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
-                       v-ape-supply = <&db8500_vape_reg>;
-                       status = "disabled";
-               };
-
-               external-bus@50000000 {
-                       compatible = "simple-bus";
-                       reg = <0x50000000 0x4000000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0 0x50000000 0x4000000>;
-                       status = "disabled";
-               };
-
-               cpufreq-cooling {
-                       compatible = "stericsson,db8500-cpufreq-cooling";
-                       status = "disabled";
-                };
-
-               vmmci: regulator-gpio {
-                       compatible = "regulator-gpio";
-
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2900000>;
-                       regulator-name = "mmci-reg";
-                       regulator-type = "voltage";
-
-                       startup-delay-us = <100>;
-                       enable-active-high;
-
-                       states = <1800000 0x1
-                                 2900000 0x0>;
-
-                       status = "disabled";
-               };
-
-               cryp@a03cb000 {
-                       compatible = "stericsson,ux500-cryp";
-                       reg = <0xa03cb000 0x1000>;
-                       interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
-
-                       v-ape-supply = <&db8500_vape_reg>;
-               };
-
-               hash@a03c2000 {
-                       compatible = "stericsson,ux500-hash";
-                       reg = <0xa03c2000 0x1000>;
-
-                       v-ape-supply = <&db8500_vape_reg>;
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
deleted file mode 100644 (file)
index 9db41b9..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include "dbx5x0.dtsi"
-
-/ {
-       memory {
-               reg = <0x00000000 0x20000000>;
-       };
-
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               button@1 {
-                       linux,code = <11>;
-                       label = "SFH7741 Proximity Sensor";
-               };
-       };
-
-       soc {
-               uart@80120000 {
-                       status = "okay";
-               };
-
-               uart@80121000 {
-                       status = "okay";
-               };
-
-               uart@80007000 {
-                       status = "okay";
-               };
-
-               i2c@80004000 {
-                       tc3589x@42 {
-                               compatible = "tc3589x";
-                               reg = <0x42>;
-                               interrupt-parent = <&gpio6>;
-                               interrupts = <25 IRQ_TYPE_EDGE_RISING>;
-
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-
-                               tc3589x_gpio: tc3589x_gpio {
-                                       compatible = "tc3589x-gpio";
-                                       interrupts = <0 IRQ_TYPE_EDGE_RISING>;
-
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       gpio-controller;
-                                       #gpio-cells = <2>;
-                               };
-                       };
-               };
-
-               i2c@80128000 {
-                       lp5521@33 {
-                               compatible = "national,lp5521";
-                               reg = <0x33>;
-                               label = "lp5521_pri";
-                               clock-mode = /bits/ 8 <2>;
-                               chan0 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                               chan1 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                               chan2 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                       };
-                       lp5521@34 {
-                               compatible = "national,lp5521";
-                               reg = <0x34>;
-                               label = "lp5521_sec";
-                               clock-mode = /bits/ 8 <2>;
-                               chan0 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                               chan1 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                               chan2 {
-                                       led-cur = /bits/ 8 <0x2f>;
-                                       max-cur = /bits/ 8 <0x5f>;
-                               };
-                       };
-                       bh1780@29 {
-                               compatible = "rohm,bh1780gli";
-                               reg = <0x33>;
-                       };
-               };
-
-               // External Micro SD slot
-               sdi0_per1@80126000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
-                       vqmmc-supply = <&vmmci>;
-
-                       cd-gpios  = <&tc3589x_gpio 3 0x4>;
-
-                       status = "okay";
-               };
-
-               // WLAN SDIO channel
-               sdi1_per2@80118000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-
-                       status = "okay";
-               };
-
-               // PoP:ed eMMC
-               sdi2_per3@80005000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-
-                       status = "okay";
-               };
-
-               // On-board eMMC
-               sdi4_per2@80114000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                       status = "okay";
-               };
-
-               sound {
-                       compatible = "stericsson,snd-soc-mop500";
-
-                       stericsson,cpu-dai = <&msp1 &msp3>;
-                       stericsson,audio-codec = <&codec>;
-               };
-
-               msp1: msp@80124000 {
-                       status = "okay";
-               };
-
-               msp3: msp@80125000 {
-                       status = "okay";
-               };
-
-               prcmu@80157000 {
-                       db8500-prcmu-regulators {
-                               db8500_vape_reg: db8500_vape {
-                                       regulator-name = "db8500-vape";
-                               };
-
-                               db8500_varm_reg: db8500_varm {
-                                       regulator-name = "db8500-varm";
-                               };
-
-                               db8500_vmodem_reg: db8500_vmodem {
-                                       regulator-name = "db8500-vmodem";
-                               };
-
-                               db8500_vpll_reg: db8500_vpll {
-                                       regulator-name = "db8500-vpll";
-                               };
-
-                               db8500_vsmps1_reg: db8500_vsmps1 {
-                                       regulator-name = "db8500-vsmps1";
-                               };
-
-                               db8500_vsmps2_reg: db8500_vsmps2 {
-                                       regulator-name = "db8500-vsmps2";
-                               };
-
-                               db8500_vsmps3_reg: db8500_vsmps3 {
-                                       regulator-name = "db8500-vsmps3";
-                               };
-
-                               db8500_vrf1_reg: db8500_vrf1 {
-                                       regulator-name = "db8500-vrf1";
-                               };
-
-                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
-                                       regulator-name = "db8500-sva-mmdsp";
-                               };
-
-                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
-                                       regulator-name = "db8500-sva-mmdsp-ret";
-                               };
-
-                               db8500_sva_pipe_reg: db8500_sva_pipe {
-                                       regulator-name = "db8500_sva_pipe";
-                               };
-
-                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
-                                       regulator-name = "db8500_sia_mmdsp";
-                               };
-
-                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
-                                       regulator-name = "db8500-sia-mmdsp-ret";
-                               };
-
-                               db8500_sia_pipe_reg: db8500_sia_pipe {
-                                       regulator-name = "db8500-sia-pipe";
-                               };
-
-                               db8500_sga_reg: db8500_sga {
-                                       regulator-name = "db8500-sga";
-                               };
-
-                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
-                                       regulator-name = "db8500-b2r2-mcde";
-                               };
-
-                               db8500_esram12_reg: db8500_esram12 {
-                                       regulator-name = "db8500-esram12";
-                               };
-
-                               db8500_esram12_ret_reg: db8500_esram12_ret {
-                                       regulator-name = "db8500-esram12-ret";
-                               };
-
-                               db8500_esram34_reg: db8500_esram34 {
-                                       regulator-name = "db8500-esram34";
-                               };
-
-                               db8500_esram34_ret_reg: db8500_esram34_ret {
-                                       regulator-name = "db8500-esram34-ret";
-                               };
-                       };
-
-                       ab8500 {
-                               ab8500-regulators {
-                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
-                                               regulator-name = "V-DISPLAY";
-                                       };
-
-                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
-                                               regulator-name = "V-eMMC1";
-                                       };
-
-                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
-                                               regulator-name = "V-MMC-SD";
-                                       };
-
-                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
-                                               regulator-name = "V-INTCORE";
-                                       };
-
-                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
-                                               regulator-name = "V-TVOUT";
-                                       };
-
-                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
-                                               regulator-name = "dummy";
-                                       };
-
-                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
-                                               regulator-name = "V-AUD";
-                                       };
-
-                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
-                                               regulator-name = "V-AMIC1";
-                                       };
-
-                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
-                                               regulator-name = "V-AMIC2";
-                                       };
-
-                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
-                                               regulator-name = "V-DMIC";
-                                       };
-
-                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
-                                               regulator-name = "V-CSI/DSI";
-                                       };
-                               };
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
deleted file mode 100644 (file)
index c6bb07d..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
-
-/ {
-       model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
-       compatible = "st-ericsson,mop500", "st-ericsson,u8500";
-
-       gpio_keys {
-               button@1 {
-                       gpios = <&tc3589x_gpio 7 0x4>;
-               };
-       };
-
-       soc {
-               prcmu@80157000 {
-                       ab8500@5 {
-                               ab8500-gpio {
-                                       compatible = "stericsson,ab8500-gpio";
-                               };
-                       };
-               };
-
-               i2c@80004000 {
-                       tps61052@33 {
-                               compatible = "tps61052";
-                               reg = <0x33>;
-                       };
-               };
-
-               i2c@80110000 {
-                       bu21013_tp@5c {
-                               reset-gpio = <&tc3589x_gpio 13 0x4>;
-                       };
-               };
-
-               vmmci: regulator-gpio {
-                       gpios = <&tc3589x_gpio 18 0x4>;
-                       enable-gpio = <&tc3589x_gpio 17 0x4>;
-
-                       status = "okay";
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
deleted file mode 100644 (file)
index 3d580d6..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
-
-/ {
-       model = "ST-Ericsson HREF (v60+) platform with Device Tree";
-       compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
-
-       gpio_keys {
-               button@1 {
-                       gpios = <&gpio6 25 0x4>;
-               };
-       };
-
-       soc {
-               i2c@80110000 {
-                       bu21013_tp@0x5c {
-                               reset-gpio = <&gpio4 15 0x4>;
-                       };
-               };
-
-               // External Micro SD slot
-               sdi0_per1@80126000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-                       cd-gpios  = <&tc3589x_gpio 3 0x4>;
-
-                       status = "okay";
-               };
-
-               // WLAN SDIO channel
-               sdi1_per2@80118000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-
-                       status = "okay";
-               };
-
-               // PoP:ed eMMC
-               sdi2_per3@80005000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-
-                       status = "okay";
-               };
-
-               // On-board eMMC
-               sdi4_per2@80114000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                       status = "okay";
-               };
-
-               prcmu@80157000 {
-                       db8500-prcmu-regulators {
-                               db8500_vape_reg: db8500_vape {
-                                       regulator-name = "db8500-vape";
-                               };
-
-                               db8500_varm_reg: db8500_varm {
-                                       regulator-name = "db8500-varm";
-                               };
-
-                               db8500_vmodem_reg: db8500_vmodem {
-                                       regulator-name = "db8500-vmodem";
-                               };
-
-                               db8500_vpll_reg: db8500_vpll {
-                                       regulator-name = "db8500-vpll";
-                               };
-
-                               db8500_vsmps1_reg: db8500_vsmps1 {
-                                       regulator-name = "db8500-vsmps1";
-                               };
-
-                               db8500_vsmps2_reg: db8500_vsmps2 {
-                                       regulator-name = "db8500-vsmps2";
-                               };
-
-                               db8500_vsmps3_reg: db8500_vsmps3 {
-                                       regulator-name = "db8500-vsmps3";
-                               };
-
-                               db8500_vrf1_reg: db8500_vrf1 {
-                                       regulator-name = "db8500-vrf1";
-                               };
-
-                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
-                                       regulator-name = "db8500-sva-mmdsp";
-                               };
-
-                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
-                                       regulator-name = "db8500-sva-mmdsp-ret";
-                               };
-
-                               db8500_sva_pipe_reg: db8500_sva_pipe {
-                                       regulator-name = "db8500_sva_pipe";
-                               };
-
-                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
-                                       regulator-name = "db8500_sia_mmdsp";
-                               };
-
-                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
-                                       regulator-name = "db8500-sia-mmdsp-ret";
-                               };
-
-                               db8500_sia_pipe_reg: db8500_sia_pipe {
-                                       regulator-name = "db8500-sia-pipe";
-                               };
-
-                               db8500_sga_reg: db8500_sga {
-                                       regulator-name = "db8500-sga";
-                               };
-
-                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
-                                       regulator-name = "db8500-b2r2-mcde";
-                               };
-
-                               db8500_esram12_reg: db8500_esram12 {
-                                       regulator-name = "db8500-esram12";
-                               };
-
-                               db8500_esram12_ret_reg: db8500_esram12_ret {
-                                       regulator-name = "db8500-esram12-ret";
-                               };
-
-                               db8500_esram34_reg: db8500_esram34 {
-                                       regulator-name = "db8500-esram34";
-                               };
-
-                               db8500_esram34_ret_reg: db8500_esram34_ret {
-                                       regulator-name = "db8500-esram34-ret";
-                               };
-                       };
-
-                       ab8500 {
-                               ab8500-regulators {
-                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
-                                               regulator-name = "V-DISPLAY";
-                                       };
-
-                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
-                                               regulator-name = "V-eMMC1";
-                                       };
-
-                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
-                                               regulator-name = "V-MMC-SD";
-                                       };
-
-                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
-                                               regulator-name = "V-INTCORE";
-                                       };
-
-                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
-                                               regulator-name = "V-TVOUT";
-                                       };
-
-                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
-                                               regulator-name = "dummy";
-                                       };
-
-                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
-                                               regulator-name = "V-AUD";
-                                       };
-
-                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
-                                               regulator-name = "V-AMIC1";
-                                       };
-
-                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
-                                               regulator-name = "V-AMIC2";
-                                       };
-
-                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
-                                               regulator-name = "V-DMIC";
-                                       };
-
-                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
-                                               regulator-name = "V-CSI/DSI";
-                                       };
-                               };
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
deleted file mode 100644 (file)
index 49824be..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright 2011 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-
-/ {
-       model = "Calao Systems Snowball platform with device tree";
-       compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
-
-       memory {
-               reg = <0x00000000 0x20000000>;
-       };
-
-       en_3v3_reg: en_3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "en-3v3-fixed-supply";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */
-               gpio = <&ab8500_gpio 25 0x4>;
-               startup-delay-us = <5000>;
-               enable-active-high;
-       };
-
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               button@1 {
-                       debounce_interval = <50>;
-                       wakeup = <1>;
-                       linux,code = <2>;
-                       label = "userpb";
-                       gpios = <&gpio1 0 0x4>;
-               };
-               button@2 {
-                       debounce_interval = <50>;
-                       wakeup = <1>;
-                       linux,code = <3>;
-                       label = "extkb1";
-                       gpios = <&gpio4 23 0x4>;
-               };
-               button@3 {
-                       debounce_interval = <50>;
-                       wakeup = <1>;
-                       linux,code = <4>;
-                       label = "extkb2";
-                       gpios = <&gpio4 24 0x4>;
-               };
-               button@4 {
-                       debounce_interval = <50>;
-                       wakeup = <1>;
-                       linux,code = <5>;
-                       label = "extkb3";
-                       gpios = <&gpio5 1 0x4>;
-               };
-               button@5 {
-                       debounce_interval = <50>;
-                       wakeup = <1>;
-                       linux,code = <6>;
-                       label = "extkb4";
-                       gpios = <&gpio5 2 0x4>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               used-led {
-                       label = "user_led";
-                       gpios = <&gpio4 14 0x4>;
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
-       soc {
-
-               sound {
-                       compatible = "stericsson,snd-soc-mop500";
-
-                       stericsson,cpu-dai = <&msp1 &msp3>;
-                       stericsson,audio-codec = <&codec>;
-               };
-
-               msp1: msp@80124000 {
-                       status = "okay";
-               };
-
-               msp3: msp@80125000 {
-                       status = "okay";
-               };
-
-               external-bus@50000000 {
-                       status = "okay";
-
-                       ethernet@0 {
-                               compatible = "smsc,lan9115";
-                               reg = <0 0x10000>;
-                               interrupts = <12 IRQ_TYPE_EDGE_RISING>;
-                               interrupt-parent = <&gpio4>;
-                               vdd33a-supply = <&en_3v3_reg>;
-                               vddvario-supply = <&db8500_vape_reg>;
-
-
-                               reg-shift = <1>;
-                               reg-io-width = <2>;
-                               smsc,force-internal-phy;
-                               smsc,irq-active-high;
-                               smsc,irq-push-pull;
-                       };
-               };
-
-               vmmci: regulator-gpio {
-                       gpios = <&gpio6 25 0x4>;
-                       enable-gpio = <&gpio7 4 0x4>;
-
-                       status = "okay";
-               };
-
-               // External Micro SD slot
-               sdi0_per1@80126000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
-                       vqmmc-supply = <&vmmci>;
-
-                       cd-gpios  = <&gpio6 26 0x4>; // 218
-                       cd-inverted;
-
-                       status = "okay";
-               };
-
-               // On-board eMMC
-               sdi4_per2@80114000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                       status = "okay";
-               };
-
-               uart@80120000 {
-                       status = "okay";
-               };
-
-               uart@80121000 {
-                       status = "okay";
-               };
-
-               uart@80007000 {
-                       status = "okay";
-               };
-
-               i2c@80004000 {
-                       tc3589x@42 {
-                               //compatible = "tc3589x";
-                               reg = <0x42>;
-                               gpios = <&gpio6 25 0x4>;
-                               interrupt-parent = <&gpio6>;
-                       };
-                       tps61052@33 {
-                               //compatible = "tps61052";
-                               reg = <0x33>;
-                       };
-               };
-
-               i2c@80128000 {
-                       lp5521@33 {
-                               // compatible = "lp5521";
-                               reg = <0x33>;
-                       };
-                       lp5521@34 {
-                               // compatible = "lp5521";
-                               reg = <0x34>;
-                       };
-                       bh1780@29 {
-                               // compatible = "rohm,bh1780gli";
-                               reg = <0x33>;
-                       };
-               };
-
-               cpufreq-cooling {
-                       status = "okay";
-               };
-
-               prcmu@80157000 {
-                       db8500-prcmu-regulators {
-                               db8500_vape_reg: db8500_vape {
-                                       regulator-name = "db8500-vape";
-                               };
-
-                               db8500_varm_reg: db8500_varm {
-                                       regulator-name = "db8500-varm";
-                               };
-
-                               db8500_vmodem_reg: db8500_vmodem {
-                                       regulator-name = "db8500-vmodem";
-                               };
-
-                               db8500_vpll_reg: db8500_vpll {
-                                       regulator-name = "db8500-vpll";
-                               };
-
-                               db8500_vsmps1_reg: db8500_vsmps1 {
-                                       regulator-name = "db8500-vsmps1";
-                               };
-
-                               db8500_vsmps2_reg: db8500_vsmps2 {
-                                       regulator-name = "db8500-vsmps2";
-                               };
-
-                               db8500_vsmps3_reg: db8500_vsmps3 {
-                                       regulator-name = "db8500-vsmps3";
-                               };
-
-                               db8500_vrf1_reg: db8500_vrf1 {
-                                       regulator-name = "db8500-vrf1";
-                               };
-
-                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
-                                       regulator-name = "db8500-sva-mmdsp";
-                               };
-
-                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
-                                       regulator-name = "db8500-sva-mmdsp-ret";
-                               };
-
-                               db8500_sva_pipe_reg: db8500_sva_pipe {
-                                       regulator-name = "db8500_sva_pipe";
-                               };
-
-                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
-                                       regulator-name = "db8500_sia_mmdsp";
-                               };
-
-                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
-                                       regulator-name = "db8500-sia-mmdsp-ret";
-                               };
-
-                               db8500_sia_pipe_reg: db8500_sia_pipe {
-                                       regulator-name = "db8500-sia-pipe";
-                               };
-
-                               db8500_sga_reg: db8500_sga {
-                                       regulator-name = "db8500-sga";
-                               };
-
-                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
-                                       regulator-name = "db8500-b2r2-mcde";
-                               };
-
-                               db8500_esram12_reg: db8500_esram12 {
-                                       regulator-name = "db8500-esram12";
-                               };
-
-                               db8500_esram12_ret_reg: db8500_esram12_ret {
-                                       regulator-name = "db8500-esram12-ret";
-                               };
-
-                               db8500_esram34_reg: db8500_esram34 {
-                                       regulator-name = "db8500-esram34";
-                               };
-
-                               db8500_esram34_ret_reg: db8500_esram34_ret {
-                                       regulator-name = "db8500-esram34-ret";
-                               };
-                       };
-
-                       thermal@801573c0 {
-                               num-trips = <4>;
-
-                               trip0-temp = <70000>;
-                               trip0-type = "active";
-                               trip0-cdev-num = <1>;
-                               trip0-cdev-name0 = "thermal-cpufreq-0";
-
-                               trip1-temp = <75000>;
-                               trip1-type = "active";
-                               trip1-cdev-num = <1>;
-                               trip1-cdev-name0 = "thermal-cpufreq-0";
-
-                               trip2-temp = <80000>;
-                               trip2-type = "active";
-                               trip2-cdev-num = <1>;
-                               trip2-cdev-name0 = "thermal-cpufreq-0";
-
-                               trip3-temp = <85000>;
-                               trip3-type = "critical";
-                               trip3-cdev-num = <0>;
-
-                               status = "okay";
-                       };
-
-                       ab8500 {
-                               ab8500-gpio {
-                                       compatible = "stericsson,ab8500-gpio";
-                               };
-
-                               ab8500-regulators {
-                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
-                                               regulator-name = "V-DISPLAY";
-                                       };
-
-                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
-                                               regulator-name = "V-eMMC1";
-                                       };
-
-                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
-                                               regulator-name = "V-MMC-SD";
-                                       };
-
-                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
-                                               regulator-name = "V-INTCORE";
-                                       };
-
-                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
-                                               regulator-name = "V-TVOUT";
-                                       };
-
-                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
-                                               regulator-name = "dummy";
-                                       };
-
-                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
-                                               regulator-name = "V-AUD";
-                                       };
-
-                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
-                                               regulator-name = "V-AMIC1";
-                                       };
-
-                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
-                                               regulator-name = "V-AMIC2";
-                                       };
-
-                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
-                                               regulator-name = "V-DMIC";
-                                       };
-
-                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
-                                               regulator-name = "V-CSI/DSI";
-                                       };
-                               };
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..e079996
--- /dev/null
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2012 ST-Ericsson
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include "ste-nomadik-pinctrl.dtsi"
+
+/ {
+       soc {
+               pinctrl {
+                       uart0 {
+                               uart0_default_mux: uart0_mux {
+                                       default_mux {
+                                               ste,function = "u0";
+                                               ste,pins = "u0_a_1";
+                                       };
+                               };
+
+                               uart0_default_mode: uart0_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO0", "GPIO2";
+                                               ste,config = <&in_pu>;
+                                       };
+
+                                       default_cfg2 {
+                                               ste,pins = "GPIO1", "GPIO3";
+                                               ste,config = <&out_hi>;
+                                       };
+                               };
+
+                               uart0_sleep_mode: uart0_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO0", "GPIO2";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+
+                                       sleep_cfg2 {
+                                               ste,pins = "GPIO1", "GPIO3";
+                                               ste,config = <&slpm_out_hi>;
+                                       };
+                               };
+                       };
+
+                       uart2 {
+                               uart2_default_mode: uart2_default {
+                                       default_mux {
+                                               ste,function = "u2";
+                                               ste,pins = "u2txrx_a_1";
+                                       };
+
+                                       default_cfg1 {
+                                               ste,pins = "GPIO120";
+                                               ste,config = <&in_pu>;
+                                       };
+
+                                       default_cfg2 {
+                                               ste,pins = "GPIO121";
+                                               ste,config = <&out_hi>;
+                                       };
+                               };
+
+                               uart2_sleep_mode: uart2_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO120";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+
+                                       sleep_cfg2 {
+                                               ste,pins = "GPIO121";
+                                               ste,config = <&slpm_out_hi>;
+                                       };
+                               };
+                       };
+
+                       i2c0 {
+                               i2c0_default_mux: i2c_mux {
+                                       default_mux {
+                                               ste,function = "i2c0";
+                                               ste,pins = "i2c0_a_1";
+                                       };
+                               };
+
+                               i2c0_default_mode: i2c_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO147", "GPIO148";
+                                               ste,config = <&in_pu>;
+                                       };
+                               };
+
+                               i2c0_sleep_mode: i2c_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO147", "GPIO148";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+                               };
+                       };
+
+                       i2c1 {
+                               i2c1_default_mux: i2c_mux {
+                                       default_mux {
+                                               ste,function = "i2c1";
+                                               ste,pins = "i2c1_b_2";
+                                       };
+                               };
+
+                               i2c1_default_mode: i2c_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO16", "GPIO17";
+                                               ste,config = <&in_pu>;
+                                       };
+                               };
+
+                               i2c1_sleep_mode: i2c_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO16", "GPIO17";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+                               };
+                       };
+
+                       i2c2 {
+                               i2c2_default_mux: i2c_mux {
+                                       default_mux {
+                                               ste,function = "i2c2";
+                                               ste,pins = "i2c2_b_2";
+                                       };
+                               };
+
+                               i2c2_default_mode: i2c_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO10", "GPIO11";
+                                               ste,config = <&in_pu>;
+                                       };
+                               };
+
+                               i2c2_sleep_mode: i2c_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO11", "GPIO11";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+                               };
+                       };
+
+                       i2c4 {
+                               i2c4_default_mux: i2c_mux {
+                                       default_mux {
+                                               ste,function = "i2c4";
+                                               ste,pins = "i2c4_b_2";
+                                       };
+                               };
+
+                               i2c4_default_mode: i2c_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO122", "GPIO123";
+                                               ste,config = <&in_pu>;
+                                       };
+                               };
+
+                               i2c4_sleep_mode: i2c_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO122", "GPIO123";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+                               };
+                       };
+
+                       i2c5 {
+                               i2c5_default_mux: i2c_mux {
+                                       default_mux {
+                                               ste,function = "i2c5";
+                                               ste,pins = "i2c5_c_2";
+                                       };
+                               };
+
+                               i2c5_default_mode: i2c_default {
+                                       default_cfg1 {
+                                               ste,pins = "GPIO118", "GPIO119";
+                                               ste,config = <&in_pu>;
+                                       };
+                               };
+
+                               i2c5_sleep_mode: i2c_sleep {
+                                       sleep_cfg1 {
+                                               ste,pins = "GPIO118", "GPIO119";
+                                               ste,config = <&slpm_in_pu>;
+                                       };
+                               };
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts
new file mode 100644 (file)
index 0000000..7f3baf5
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+#include "ste-ccu8540-pinctrl.dtsi"
+
+/ {
+       model = "ST-Ericsson U8540 platform with Device Tree";
+       compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
+
+       memory@0 {
+               reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
+       };
+
+       soc {
+               pinctrl {
+                       compatible = "stericsson,db8540-pinctrl";
+               };
+
+               prcmu@80157000 {
+                       reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
+                       reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
+               };
+
+               uart@80120000 {
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&uart0_default_mux>, <&uart0_default_mode>;
+                       pinctrl-1 = <&uart0_sleep_mode>;
+                       status = "okay";
+               };
+
+               uart@80121000 {
+                       status = "okay";
+               };
+
+               uart@80007000 {
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&uart2_default_mode>;
+                       pinctrl-1 = <&uart2_sleep_mode>;
+                       status = "okay";
+               };
+
+               i2c0: i2c@80004000 {
+                       pinctrl-names = "default","sleep";
+                       pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;
+                       pinctrl-1 = <&i2c0_sleep_mode>;
+               };
+
+               i2c1: i2c@80122000 {
+                       pinctrl-names = "default","sleep";
+                       pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;
+                       pinctrl-1 = <&i2c1_sleep_mode>;
+               };
+
+               i2c2: i2c@80128000 {
+                       pinctrl-names = "default","sleep";
+                       pinctrl-0 = <&i2c2_default_mux>, <&i2c2_default_mode>;
+                       pinctrl-1 = <&i2c2_sleep_mode>;
+               };
+
+               i2c3: i2c@80110000 {
+                       status = "disabled";
+               };
+
+               i2c4: i2c@8012a000 {
+                       pinctrl-names = "default","sleep";
+                       pinctrl-0 = <&i2c4_default_mux>, <&i2c4_default_mode>;
+                       pinctrl-1 = <&i2c4_sleep_mode>;
+               };
+
+               i2c5: i2c@80001000 {
+                       pinctrl-names = "default","sleep";
+                       pinctrl-0 = <&i2c5_default_mux>, <&i2c5_default_mode>;
+                       pinctrl-1 = <&i2c5_sleep_mode>;
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
new file mode 100644 (file)
index 0000000..2295087
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+
+/ {
+       model = "ST-Ericsson CCU9540 platform with Device Tree";
+       compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
+
+       memory {
+               reg = <0x00000000 0x20000000>;
+       };
+
+       soc {
+               uart@80120000 {
+                       status = "okay";
+               };
+
+               uart@80121000 {
+                       status = "okay";
+               };
+
+               uart@80007000 {
+                       status = "okay";
+               };
+
+               // External Micro SD slot
+               sdi0_per1@80126000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+                       mmc-cap-sd-highspeed;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
+
+                       cd-gpios  = <&gpio7 6 0x4>; // 230
+                       cd-inverted;
+
+                       status = "okay";
+               };
+
+
+               // WLAN SDIO channel
+               sdi1_per2@80118000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+
+                       status = "okay";
+               };
+
+               // On-board eMMC
+               sdi4_per2@80114000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+                       status = "okay";
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
new file mode 100644 (file)
index 0000000..1c1091e
--- /dev/null
@@ -0,0 +1,809 @@
+/*
+ * Copyright 2012 Linaro Ltd
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+
+/ {
+       soc {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "stericsson,db8500";
+               interrupt-parent = <&intc>;
+               ranges;
+
+               intc: interrupt-controller@a0411000 {
+                       compatible = "arm,cortex-a9-gic";
+                       #interrupt-cells = <3>;
+                       #address-cells = <1>;
+                       interrupt-controller;
+                       reg = <0xa0411000 0x1000>,
+                             <0xa0410100 0x100>;
+               };
+
+               L2: l2-cache {
+                       compatible = "arm,pl310-cache";
+                       reg = <0xa0412000 0x1000>;
+                       interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
+                       cache-unified;
+                       cache-level = <2>;
+               };
+
+               pmu {
+                       compatible = "arm,cortex-a9-pmu";
+                       interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               timer@a0410600 {
+                       compatible = "arm,cortex-a9-twd-timer";
+                       reg = <0xa0410600 0x20>;
+                       interrupts = <1 13 0x304>; /* IRQ level high per-CPU */
+               };
+
+               rtc@80154000 {
+                       compatible = "arm,rtc-pl031", "arm,primecell";
+                       reg = <0x80154000 0x1000>;
+                       interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               gpio0: gpio@8012e000 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8012e000 0x80>;
+                       interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <0>;
+               };
+
+               gpio1: gpio@8012e080 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8012e080 0x80>;
+                       interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <1>;
+               };
+
+               gpio2: gpio@8000e000 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8000e000 0x80>;
+                       interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <2>;
+               };
+
+               gpio3: gpio@8000e080 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8000e080 0x80>;
+                       interrupts = <0 122 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <3>;
+               };
+
+               gpio4: gpio@8000e100 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8000e100 0x80>;
+                       interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <4>;
+               };
+
+               gpio5: gpio@8000e180 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8000e180 0x80>;
+                       interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <5>;
+               };
+
+               gpio6: gpio@8011e000 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8011e000 0x80>;
+                       interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <6>;
+               };
+
+               gpio7: gpio@8011e080 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0x8011e080 0x80>;
+                       interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <7>;
+               };
+
+               gpio8: gpio@a03fe000 {
+                       compatible = "stericsson,db8500-gpio",
+                               "st,nomadik-gpio";
+                       reg =  <0xa03fe000 0x80>;
+                       interrupts = <0 127 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       st,supports-sleepmode;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank = <8>;
+               };
+
+               pinctrl {
+                       compatible = "stericsson,db8500-pinctrl";
+                       prcm = <&prcmu>;
+               };
+
+               usb_per5@a03e0000 {
+                       compatible = "stericsson,db8500-musb",
+                               "mentor,musb";
+                       reg = <0xa03e0000 0x10000>;
+                       interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "mc";
+
+                       dr_mode = "otg";
+
+                       dmas = <&dma 38 0 0x2>, /* Logical - DevToMem */
+                              <&dma 38 0 0x0>, /* Logical - MemToDev */
+                              <&dma 37 0 0x2>, /* Logical - DevToMem */
+                              <&dma 37 0 0x0>, /* Logical - MemToDev */
+                              <&dma 36 0 0x2>, /* Logical - DevToMem */
+                              <&dma 36 0 0x0>, /* Logical - MemToDev */
+                              <&dma 19 0 0x2>, /* Logical - DevToMem */
+                              <&dma 19 0 0x0>, /* Logical - MemToDev */
+                              <&dma 18 0 0x2>, /* Logical - DevToMem */
+                              <&dma 18 0 0x0>, /* Logical - MemToDev */
+                              <&dma 17 0 0x2>, /* Logical - DevToMem */
+                              <&dma 17 0 0x0>, /* Logical - MemToDev */
+                              <&dma 16 0 0x2>, /* Logical - DevToMem */
+                              <&dma 16 0 0x0>, /* Logical - MemToDev */
+                              <&dma 39 0 0x2>, /* Logical - DevToMem */
+                              <&dma 39 0 0x0>; /* Logical - MemToDev */
+
+                       dma-names = "iep_1_9",  "oep_1_9",
+                                   "iep_2_10", "oep_2_10",
+                                   "iep_3_11", "oep_3_11",
+                                   "iep_4_12", "oep_4_12",
+                                   "iep_5_13", "oep_5_13",
+                                   "iep_6_14", "oep_6_14",
+                                   "iep_7_15", "oep_7_15",
+                                   "iep_8",    "oep_8";
+               };
+
+               dma: dma-controller@801C0000 {
+                       compatible = "stericsson,db8500-dma40", "stericsson,dma40";
+                       reg = <0x801C0000 0x1000 0x40010000 0x800>;
+                       reg-names = "base", "lcpa";
+                       interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
+
+                       #dma-cells = <3>;
+                       memcpy-channels = <56 57 58 59 60>;
+               };
+
+               prcmu: prcmu@80157000 {
+                       compatible = "stericsson,db8500-prcmu";
+                       reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
+                       reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
+                       interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       ranges;
+
+                       prcmu-timer-4@80157450 {
+                               compatible = "stericsson,db8500-prcmu-timer-4";
+                               reg = <0x80157450 0xC>;
+                       };
+
+                       thermal@801573c0 {
+                               compatible = "stericsson,db8500-thermal";
+                               reg = <0x801573c0 0x40>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,
+                                            <22 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
+                               status = "disabled";
+                       };
+
+                       db8500-prcmu-regulators {
+                               compatible = "stericsson,db8500-prcmu-regulator";
+
+                               // DB8500_REGULATOR_VAPE
+                               db8500_vape_reg: db8500_vape {
+                                       regulator-compatible = "db8500_vape";
+                                       regulator-always-on;
+                               };
+
+                               // DB8500_REGULATOR_VARM
+                               db8500_varm_reg: db8500_varm {
+                                       regulator-compatible = "db8500_varm";
+                               };
+
+                               // DB8500_REGULATOR_VMODEM
+                               db8500_vmodem_reg: db8500_vmodem {
+                                       regulator-compatible = "db8500_vmodem";
+                               };
+
+                               // DB8500_REGULATOR_VPLL
+                               db8500_vpll_reg: db8500_vpll {
+                                       regulator-compatible = "db8500_vpll";
+                               };
+
+                               // DB8500_REGULATOR_VSMPS1
+                               db8500_vsmps1_reg: db8500_vsmps1 {
+                                       regulator-compatible = "db8500_vsmps1";
+                               };
+
+                               // DB8500_REGULATOR_VSMPS2
+                               db8500_vsmps2_reg: db8500_vsmps2 {
+                                       regulator-compatible = "db8500_vsmps2";
+                               };
+
+                               // DB8500_REGULATOR_VSMPS3
+                               db8500_vsmps3_reg: db8500_vsmps3 {
+                                       regulator-compatible = "db8500_vsmps3";
+                               };
+
+                               // DB8500_REGULATOR_VRF1
+                               db8500_vrf1_reg: db8500_vrf1 {
+                                       regulator-compatible = "db8500_vrf1";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SVAMMDSP
+                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+                                       regulator-compatible = "db8500_sva_mmdsp";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SVAMMDSPRET
+                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+                                       regulator-compatible = "db8500_sva_mmdsp_ret";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SVAPIPE
+                               db8500_sva_pipe_reg: db8500_sva_pipe {
+                                       regulator-compatible = "db8500_sva_pipe";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SIAMMDSP
+                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+                                       regulator-compatible = "db8500_sia_mmdsp";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SIAMMDSPRET
+                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SIAPIPE
+                               db8500_sia_pipe_reg: db8500_sia_pipe {
+                                       regulator-compatible = "db8500_sia_pipe";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_SGA
+                               db8500_sga_reg: db8500_sga {
+                                       regulator-compatible = "db8500_sga";
+                                       vin-supply = <&db8500_vape_reg>;
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_B2R2_MCDE
+                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+                                       regulator-compatible = "db8500_b2r2_mcde";
+                                       vin-supply = <&db8500_vape_reg>;
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_ESRAM12
+                               db8500_esram12_reg: db8500_esram12 {
+                                       regulator-compatible = "db8500_esram12";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_ESRAM12RET
+                               db8500_esram12_ret_reg: db8500_esram12_ret {
+                                       regulator-compatible = "db8500_esram12_ret";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_ESRAM34
+                               db8500_esram34_reg: db8500_esram34 {
+                                       regulator-compatible = "db8500_esram34";
+                               };
+
+                               // DB8500_REGULATOR_SWITCH_ESRAM34RET
+                               db8500_esram34_ret_reg: db8500_esram34_ret {
+                                       regulator-compatible = "db8500_esram34_ret";
+                               };
+                       };
+
+                       ab8500 {
+                               compatible = "stericsson,ab8500";
+                               interrupt-parent = <&intc>;
+                               interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+
+                               ab8500_gpio: ab8500-gpio {
+                                       gpio-controller;
+                                       #gpio-cells = <2>;
+                               };
+
+                               ab8500-rtc {
+                                       compatible = "stericsson,ab8500-rtc";
+                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH
+                                                     18 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "60S", "ALARM";
+                               };
+
+                               ab8500-gpadc {
+                                       compatible = "stericsson,ab8500-gpadc";
+                                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH
+                                                     39 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "HW_CONV_END", "SW_CONV_END";
+                                       vddadc-supply = <&ab8500_ldo_tvout_reg>;
+                               };
+
+                               ab8500_battery: ab8500_battery {
+                                       stericsson,battery-type = "LIPO";
+                                       thermistor-on-batctrl;
+                               };
+
+                               ab8500_fg {
+                                       compatible = "stericsson,ab8500-fg";
+                                       battery    = <&ab8500_battery>;
+                               };
+
+                               ab8500_btemp {
+                                       compatible = "stericsson,ab8500-btemp";
+                                       battery    = <&ab8500_battery>;
+                               };
+
+                               ab8500_charger {
+                                       compatible      = "stericsson,ab8500-charger";
+                                       battery         = <&ab8500_battery>;
+                                       vddadc-supply   = <&ab8500_ldo_tvout_reg>;
+                               };
+
+                               ab8500_chargalg {
+                                       compatible      = "stericsson,ab8500-chargalg";
+                                       battery         = <&ab8500_battery>;
+                               };
+
+                               ab8500_usb {
+                                       compatible = "stericsson,ab8500-usb";
+                                       interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
+                                                      96 IRQ_TYPE_LEVEL_HIGH
+                                                      14 IRQ_TYPE_LEVEL_HIGH
+                                                      15 IRQ_TYPE_LEVEL_HIGH
+                                                      79 IRQ_TYPE_LEVEL_HIGH
+                                                      74 IRQ_TYPE_LEVEL_HIGH
+                                                      75 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "ID_WAKEUP_R",
+                                                         "ID_WAKEUP_F",
+                                                         "VBUS_DET_F",
+                                                         "VBUS_DET_R",
+                                                         "USB_LINK_STATUS",
+                                                         "USB_ADP_PROBE_PLUG",
+                                                         "USB_ADP_PROBE_UNPLUG";
+                                       vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
+                                       v-ape-supply = <&db8500_vape_reg>;
+                                       musb_1v8-supply = <&db8500_vsmps2_reg>;
+                               };
+
+                               ab8500-ponkey {
+                                       compatible = "stericsson,ab8500-poweron-key";
+                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH
+                                                     7 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
+                               };
+
+                               ab8500-sysctrl {
+                                       compatible = "stericsson,ab8500-sysctrl";
+                               };
+
+                               ab8500-pwm {
+                                       compatible = "stericsson,ab8500-pwm";
+                               };
+
+                               ab8500-debugfs {
+                                       compatible = "stericsson,ab8500-debug";
+                               };
+
+                               codec: ab8500-codec {
+                                       compatible = "stericsson,ab8500-codec";
+
+                                       V-AUD-supply = <&ab8500_ldo_audio_reg>;
+                                       V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
+                                       V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
+                                       V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
+
+                                       stericsson,earpeice-cmv = <950>; /* Units in mV. */
+                               };
+
+                               ext_regulators: ab8500-ext-regulators {
+                                       compatible = "stericsson,ab8500-ext-regulator";
+
+                                       ab8500_ext1_reg: ab8500_ext1 {
+                                               regulator-compatible = "ab8500_ext1";
+                                               regulator-min-microvolt = <1800000>;
+                                               regulator-max-microvolt = <1800000>;
+                                               regulator-boot-on;
+                                               regulator-always-on;
+                                       };
+
+                                       ab8500_ext2_reg: ab8500_ext2 {
+                                               regulator-compatible = "ab8500_ext2";
+                                               regulator-min-microvolt = <1360000>;
+                                               regulator-max-microvolt = <1360000>;
+                                               regulator-boot-on;
+                                               regulator-always-on;
+                                       };
+
+                                       ab8500_ext3_reg: ab8500_ext3 {
+                                               regulator-compatible = "ab8500_ext3";
+                                               regulator-min-microvolt = <3400000>;
+                                               regulator-max-microvolt = <3400000>;
+                                               regulator-boot-on;
+                                       };
+                               };
+
+                               ab8500-regulators {
+                                       compatible = "stericsson,ab8500-regulator";
+                                       vin-supply = <&ab8500_ext3_reg>;
+
+                                       // supplies to the display/camera
+                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                                               regulator-compatible = "ab8500_ldo_aux1";
+                                               regulator-min-microvolt = <2500000>;
+                                               regulator-max-microvolt = <2900000>;
+                                               regulator-boot-on;
+                                               /* BUG: If turned off MMC will be affected. */
+                                               regulator-always-on;
+                                       };
+
+                                       // supplies to the on-board eMMC
+                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
+                                               regulator-compatible = "ab8500_ldo_aux2";
+                                               regulator-min-microvolt = <1100000>;
+                                               regulator-max-microvolt = <3300000>;
+                                       };
+
+                                       // supply for VAUX3; SDcard slots
+                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
+                                               regulator-compatible = "ab8500_ldo_aux3";
+                                               regulator-min-microvolt = <1100000>;
+                                               regulator-max-microvolt = <3300000>;
+                                       };
+
+                                       // supply for v-intcore12; VINTCORE12 LDO
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
+                                               regulator-compatible = "ab8500_ldo_intcore";
+                                       };
+
+                                       // supply for tvout; gpadc; TVOUT LDO
+                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
+                                               regulator-compatible = "ab8500_ldo_tvout";
+                                       };
+
+                                       // supply for ab8500-usb; USB LDO
+                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
+                                               regulator-compatible = "ab8500_ldo_usb";
+                                       };
+
+                                       // supply for ab8500-vaudio; VAUDIO LDO
+                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
+                                               regulator-compatible = "ab8500_ldo_audio";
+                                       };
+
+                                       // supply for v-anamic1 VAMIC1 LDO
+                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
+                                               regulator-compatible = "ab8500_ldo_anamic1";
+                                       };
+
+                                       // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
+                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
+                                               regulator-compatible = "ab8500_ldo_anamic2";
+                                       };
+
+                                       // supply for v-dmic; VDMIC LDO
+                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
+                                               regulator-compatible = "ab8500_ldo_dmic";
+                                       };
+
+                                       // supply for U8500 CSI/DSI; VANA LDO
+                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
+                                               regulator-compatible = "ab8500_ldo_ana";
+                                       };
+                               };
+                       };
+               };
+
+               i2c@80004000 {
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
+                       reg = <0x80004000 0x1000>;
+                       interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
+                       arm,primecell-periphid = <0x180024>;
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
+               };
+
+               i2c@80122000 {
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
+                       reg = <0x80122000 0x1000>;
+                       interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
+                       arm,primecell-periphid = <0x180024>;
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
+               };
+
+               i2c@80128000 {
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
+                       reg = <0x80128000 0x1000>;
+                       interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
+                       arm,primecell-periphid = <0x180024>;
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
+               };
+
+               i2c@80110000 {
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
+                       reg = <0x80110000 0x1000>;
+                       interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>;
+                       arm,primecell-periphid = <0x180024>;
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
+               };
+
+               i2c@8012a000 {
+                       compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
+                       reg = <0x8012a000 0x1000>;
+                       interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
+                       arm,primecell-periphid = <0x180024>;
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       v-i2c-supply = <&db8500_vape_reg>;
+
+                       clock-frequency = <400000>;
+               };
+
+               ssp@80002000 {
+                       compatible = "arm,pl022", "arm,primecell";
+                       reg = <0x80002000 0x1000>;
+                       interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               uart@80120000 {
+                       compatible = "arm,pl011", "arm,primecell";
+                       reg = <0x80120000 0x1000>;
+                       interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 13 0 0x2>, /* Logical - DevToMem */
+                              <&dma 13 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               uart@80121000 {
+                       compatible = "arm,pl011", "arm,primecell";
+                       reg = <0x80121000 0x1000>;
+                       interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 12 0 0x2>, /* Logical - DevToMem */
+                              <&dma 12 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               uart@80007000 {
+                       compatible = "arm,pl011", "arm,primecell";
+                       reg = <0x80007000 0x1000>;
+                       interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 11 0 0x2>, /* Logical - DevToMem */
+                              <&dma 11 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               sdi0_per1@80126000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80126000 0x1000>;
+                       interrupts = <0 60 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 29 0 0x2>, /* Logical - DevToMem */
+                              <&dma 29 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               sdi1_per2@80118000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80118000 0x1000>;
+                       interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 32 0 0x2>, /* Logical - DevToMem */
+                              <&dma 32 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               sdi2_per3@80005000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80005000 0x1000>;
+                       interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 28 0 0x2>, /* Logical - DevToMem */
+                              <&dma 28 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               sdi3_per2@80119000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80119000 0x1000>;
+                       interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               sdi4_per2@80114000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80114000 0x1000>;
+                       interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dmas = <&dma 42 0 0x2>, /* Logical - DevToMem */
+                              <&dma 42 0 0x0>; /* Logical - MemToDev */
+                       dma-names = "rx", "tx";
+
+                       status = "disabled";
+               };
+
+               sdi5_per3@80008000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       reg = <0x80008000 0x1000>;
+                       interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               msp0: msp@80123000 {
+                       compatible = "stericsson,ux500-msp-i2s";
+                       reg = <0x80123000 0x1000>;
+                       interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+                       v-ape-supply = <&db8500_vape_reg>;
+                       status = "disabled";
+               };
+
+               msp1: msp@80124000 {
+                       compatible = "stericsson,ux500-msp-i2s";
+                       reg = <0x80124000 0x1000>;
+                       interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
+                       v-ape-supply = <&db8500_vape_reg>;
+                       status = "disabled";
+               };
+
+               // HDMI sound
+               msp2: msp@80117000 {
+                       compatible = "stericsson,ux500-msp-i2s";
+                       reg = <0x80117000 0x1000>;
+                       interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
+                       v-ape-supply = <&db8500_vape_reg>;
+                       status = "disabled";
+               };
+
+               msp3: msp@80125000 {
+                       compatible = "stericsson,ux500-msp-i2s";
+                       reg = <0x80125000 0x1000>;
+                       interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
+                       v-ape-supply = <&db8500_vape_reg>;
+                       status = "disabled";
+               };
+
+               external-bus@50000000 {
+                       compatible = "simple-bus";
+                       reg = <0x50000000 0x4000000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x50000000 0x4000000>;
+                       status = "disabled";
+               };
+
+               cpufreq-cooling {
+                       compatible = "stericsson,db8500-cpufreq-cooling";
+                       status = "disabled";
+                };
+
+               vmmci: regulator-gpio {
+                       compatible = "regulator-gpio";
+
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2900000>;
+                       regulator-name = "mmci-reg";
+                       regulator-type = "voltage";
+
+                       startup-delay-us = <100>;
+                       enable-active-high;
+
+                       states = <1800000 0x1
+                                 2900000 0x0>;
+
+                       status = "disabled";
+               };
+
+               cryp@a03cb000 {
+                       compatible = "stericsson,ux500-cryp";
+                       reg = <0xa03cb000 0x1000>;
+                       interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
+
+                       v-ape-supply = <&db8500_vape_reg>;
+               };
+
+               hash@a03c2000 {
+                       compatible = "stericsson,ux500-hash";
+                       reg = <0xa03c2000 0x1000>;
+
+                       v-ape-supply = <&db8500_vape_reg>;
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
new file mode 100644 (file)
index 0000000..370e03f
--- /dev/null
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "ste-dbx5x0.dtsi"
+
+/ {
+       memory {
+               reg = <0x00000000 0x20000000>;
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               button@1 {
+                       linux,code = <11>;
+                       label = "SFH7741 Proximity Sensor";
+               };
+       };
+
+       soc {
+               uart@80120000 {
+                       status = "okay";
+               };
+
+               uart@80121000 {
+                       status = "okay";
+               };
+
+               uart@80007000 {
+                       status = "okay";
+               };
+
+               i2c@80004000 {
+                       tc3589x@42 {
+                               compatible = "tc3589x";
+                               reg = <0x42>;
+                               interrupt-parent = <&gpio6>;
+                               interrupts = <25 IRQ_TYPE_EDGE_RISING>;
+
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+
+                               tc3589x_gpio: tc3589x_gpio {
+                                       compatible = "tc3589x-gpio";
+                                       interrupts = <0 IRQ_TYPE_EDGE_RISING>;
+
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                                       gpio-controller;
+                                       #gpio-cells = <2>;
+                               };
+                       };
+               };
+
+               i2c@80128000 {
+                       lp5521@33 {
+                               compatible = "national,lp5521";
+                               reg = <0x33>;
+                               label = "lp5521_pri";
+                               clock-mode = /bits/ 8 <2>;
+                               chan0 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                               chan1 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                               chan2 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                       };
+                       lp5521@34 {
+                               compatible = "national,lp5521";
+                               reg = <0x34>;
+                               label = "lp5521_sec";
+                               clock-mode = /bits/ 8 <2>;
+                               chan0 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                               chan1 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                               chan2 {
+                                       led-cur = /bits/ 8 <0x2f>;
+                                       max-cur = /bits/ 8 <0x5f>;
+                               };
+                       };
+                       bh1780@29 {
+                               compatible = "rohm,bh1780gli";
+                               reg = <0x33>;
+                       };
+               };
+
+               // External Micro SD slot
+               sdi0_per1@80126000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+                       mmc-cap-sd-highspeed;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
+                       vqmmc-supply = <&vmmci>;
+
+                       cd-gpios  = <&tc3589x_gpio 3 0x4>;
+
+                       status = "okay";
+               };
+
+               // WLAN SDIO channel
+               sdi1_per2@80118000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+
+                       status = "okay";
+               };
+
+               // PoP:ed eMMC
+               sdi2_per3@80005000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+
+                       status = "okay";
+               };
+
+               // On-board eMMC
+               sdi4_per2@80114000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+                       status = "okay";
+               };
+
+               sound {
+                       compatible = "stericsson,snd-soc-mop500";
+
+                       stericsson,cpu-dai = <&msp1 &msp3>;
+                       stericsson,audio-codec = <&codec>;
+               };
+
+               msp1: msp@80124000 {
+                       status = "okay";
+               };
+
+               msp3: msp@80125000 {
+                       status = "okay";
+               };
+
+               prcmu@80157000 {
+                       db8500-prcmu-regulators {
+                               db8500_vape_reg: db8500_vape {
+                                       regulator-name = "db8500-vape";
+                               };
+
+                               db8500_varm_reg: db8500_varm {
+                                       regulator-name = "db8500-varm";
+                               };
+
+                               db8500_vmodem_reg: db8500_vmodem {
+                                       regulator-name = "db8500-vmodem";
+                               };
+
+                               db8500_vpll_reg: db8500_vpll {
+                                       regulator-name = "db8500-vpll";
+                               };
+
+                               db8500_vsmps1_reg: db8500_vsmps1 {
+                                       regulator-name = "db8500-vsmps1";
+                               };
+
+                               db8500_vsmps2_reg: db8500_vsmps2 {
+                                       regulator-name = "db8500-vsmps2";
+                               };
+
+                               db8500_vsmps3_reg: db8500_vsmps3 {
+                                       regulator-name = "db8500-vsmps3";
+                               };
+
+                               db8500_vrf1_reg: db8500_vrf1 {
+                                       regulator-name = "db8500-vrf1";
+                               };
+
+                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+                                       regulator-name = "db8500-sva-mmdsp";
+                               };
+
+                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+                                       regulator-name = "db8500-sva-mmdsp-ret";
+                               };
+
+                               db8500_sva_pipe_reg: db8500_sva_pipe {
+                                       regulator-name = "db8500_sva_pipe";
+                               };
+
+                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+                                       regulator-name = "db8500_sia_mmdsp";
+                               };
+
+                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+                                       regulator-name = "db8500-sia-mmdsp-ret";
+                               };
+
+                               db8500_sia_pipe_reg: db8500_sia_pipe {
+                                       regulator-name = "db8500-sia-pipe";
+                               };
+
+                               db8500_sga_reg: db8500_sga {
+                                       regulator-name = "db8500-sga";
+                               };
+
+                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+                                       regulator-name = "db8500-b2r2-mcde";
+                               };
+
+                               db8500_esram12_reg: db8500_esram12 {
+                                       regulator-name = "db8500-esram12";
+                               };
+
+                               db8500_esram12_ret_reg: db8500_esram12_ret {
+                                       regulator-name = "db8500-esram12-ret";
+                               };
+
+                               db8500_esram34_reg: db8500_esram34 {
+                                       regulator-name = "db8500-esram34";
+                               };
+
+                               db8500_esram34_ret_reg: db8500_esram34_ret {
+                                       regulator-name = "db8500-esram34-ret";
+                               };
+                       };
+
+                       ab8500 {
+                               ab8500-regulators {
+                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                                               regulator-name = "V-DISPLAY";
+                                       };
+
+                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
+                                               regulator-name = "V-eMMC1";
+                                       };
+
+                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
+                                               regulator-name = "V-MMC-SD";
+                                       };
+
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
+                                               regulator-name = "V-INTCORE";
+                                       };
+
+                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
+                                               regulator-name = "V-TVOUT";
+                                       };
+
+                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
+                                               regulator-name = "dummy";
+                                       };
+
+                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
+                                               regulator-name = "V-AUD";
+                                       };
+
+                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
+                                               regulator-name = "V-AMIC1";
+                                       };
+
+                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
+                                               regulator-name = "V-AMIC2";
+                                       };
+
+                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
+                                               regulator-name = "V-DMIC";
+                                       };
+
+                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
+                                               regulator-name = "V-CSI/DSI";
+                                       };
+                               };
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts
new file mode 100644 (file)
index 0000000..d8d3b99
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
+
+/ {
+       model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
+       compatible = "st-ericsson,mop500", "st-ericsson,u8500";
+
+       gpio_keys {
+               button@1 {
+                       gpios = <&tc3589x_gpio 7 0x4>;
+               };
+       };
+
+       soc {
+               prcmu@80157000 {
+                       ab8500@5 {
+                               ab8500-gpio {
+                                       compatible = "stericsson,ab8500-gpio";
+                               };
+                       };
+               };
+
+               i2c@80004000 {
+                       tps61052@33 {
+                               compatible = "tps61052";
+                               reg = <0x33>;
+                       };
+               };
+
+               i2c@80110000 {
+                       bu21013_tp@5c {
+                               reset-gpio = <&tc3589x_gpio 13 0x4>;
+                       };
+               };
+
+               vmmci: regulator-gpio {
+                       gpios = <&tc3589x_gpio 18 0x4>;
+                       enable-gpio = <&tc3589x_gpio 17 0x4>;
+
+                       status = "okay";
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts
new file mode 100644 (file)
index 0000000..6e52ebb
--- /dev/null
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
+
+/ {
+       model = "ST-Ericsson HREF (v60+) platform with Device Tree";
+       compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
+
+       gpio_keys {
+               button@1 {
+                       gpios = <&gpio6 25 0x4>;
+               };
+       };
+
+       soc {
+               i2c@80110000 {
+                       bu21013_tp@0x5c {
+                               reset-gpio = <&gpio4 15 0x4>;
+                       };
+               };
+
+               // External Micro SD slot
+               sdi0_per1@80126000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+                       mmc-cap-sd-highspeed;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
+
+                       cd-gpios  = <&tc3589x_gpio 3 0x4>;
+
+                       status = "okay";
+               };
+
+               // WLAN SDIO channel
+               sdi1_per2@80118000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+
+                       status = "okay";
+               };
+
+               // PoP:ed eMMC
+               sdi2_per3@80005000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+
+                       status = "okay";
+               };
+
+               // On-board eMMC
+               sdi4_per2@80114000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+                       status = "okay";
+               };
+
+               prcmu@80157000 {
+                       db8500-prcmu-regulators {
+                               db8500_vape_reg: db8500_vape {
+                                       regulator-name = "db8500-vape";
+                               };
+
+                               db8500_varm_reg: db8500_varm {
+                                       regulator-name = "db8500-varm";
+                               };
+
+                               db8500_vmodem_reg: db8500_vmodem {
+                                       regulator-name = "db8500-vmodem";
+                               };
+
+                               db8500_vpll_reg: db8500_vpll {
+                                       regulator-name = "db8500-vpll";
+                               };
+
+                               db8500_vsmps1_reg: db8500_vsmps1 {
+                                       regulator-name = "db8500-vsmps1";
+                               };
+
+                               db8500_vsmps2_reg: db8500_vsmps2 {
+                                       regulator-name = "db8500-vsmps2";
+                               };
+
+                               db8500_vsmps3_reg: db8500_vsmps3 {
+                                       regulator-name = "db8500-vsmps3";
+                               };
+
+                               db8500_vrf1_reg: db8500_vrf1 {
+                                       regulator-name = "db8500-vrf1";
+                               };
+
+                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+                                       regulator-name = "db8500-sva-mmdsp";
+                               };
+
+                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+                                       regulator-name = "db8500-sva-mmdsp-ret";
+                               };
+
+                               db8500_sva_pipe_reg: db8500_sva_pipe {
+                                       regulator-name = "db8500_sva_pipe";
+                               };
+
+                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+                                       regulator-name = "db8500_sia_mmdsp";
+                               };
+
+                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+                                       regulator-name = "db8500-sia-mmdsp-ret";
+                               };
+
+                               db8500_sia_pipe_reg: db8500_sia_pipe {
+                                       regulator-name = "db8500-sia-pipe";
+                               };
+
+                               db8500_sga_reg: db8500_sga {
+                                       regulator-name = "db8500-sga";
+                               };
+
+                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+                                       regulator-name = "db8500-b2r2-mcde";
+                               };
+
+                               db8500_esram12_reg: db8500_esram12 {
+                                       regulator-name = "db8500-esram12";
+                               };
+
+                               db8500_esram12_ret_reg: db8500_esram12_ret {
+                                       regulator-name = "db8500-esram12-ret";
+                               };
+
+                               db8500_esram34_reg: db8500_esram34 {
+                                       regulator-name = "db8500-esram34";
+                               };
+
+                               db8500_esram34_ret_reg: db8500_esram34_ret {
+                                       regulator-name = "db8500-esram34-ret";
+                               };
+                       };
+
+                       ab8500 {
+                               ab8500-regulators {
+                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                                               regulator-name = "V-DISPLAY";
+                                       };
+
+                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
+                                               regulator-name = "V-eMMC1";
+                                       };
+
+                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
+                                               regulator-name = "V-MMC-SD";
+                                       };
+
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
+                                               regulator-name = "V-INTCORE";
+                                       };
+
+                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
+                                               regulator-name = "V-TVOUT";
+                                       };
+
+                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
+                                               regulator-name = "dummy";
+                                       };
+
+                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
+                                               regulator-name = "V-AUD";
+                                       };
+
+                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
+                                               regulator-name = "V-AMIC1";
+                                       };
+
+                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
+                                               regulator-name = "V-AMIC2";
+                                       };
+
+                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
+                                               regulator-name = "V-DMIC";
+                                       };
+
+                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
+                                               regulator-name = "V-CSI/DSI";
+                                       };
+                               };
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..efddee9
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2012 ST-Ericsson
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include <dt-bindings/pinctrl/nomadik.h>
+
+/ {
+       in_nopull: in_nopull {
+               ste,input = <INPUT_NOPULL>;
+       };
+
+       in_pu: input_pull_up {
+               ste,input = <INPUT_PULLUP>;
+       };
+
+       in_pd: input_pull_down {
+               ste,input = <INPUT_PULLDOWN>;
+       };
+
+       out_hi: output_high {
+               ste,output = <OUTPUT_HIGH>;
+       };
+
+       out_lo: output_low {
+               ste,output = <OUTPUT_LOW>;
+       };
+
+       gpio_out_lo: gpio_output_low {
+               ste,gpio = <GPIOMODE_ENABLED>;
+               ste,output = <OUTPUT_LOW>;
+       };
+
+       slpm_in_pu: slpm_in_pu {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-input = <SLPM_INPUT_PULLUP>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+       };
+
+       slpm_in_wkup_pdis: slpm_in_wkup_pdis {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-input = <SLPM_DIR_INPUT>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+
+       slpm_out_lo: slpm_out_lo {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-output = <SLPM_OUTPUT_LOW>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+       };
+
+       slpm_out_hi: slpm_out_hi {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+       };
+
+       slpm_out_hi_wkup_pdis: slpm_out_hi_wkup_pdis {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+
+       slpm_out_wkup_pdis: slpm_out_wkup_pdis {
+               ste,sleep = <SLPM_ENABLED>;
+               ste,sleep-output = <SLPM_DIR_OUTPUT>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+
+       in_wkup_pdis: in_wkup_pdis {
+               ste,sleep-input = <SLPM_DIR_INPUT>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+
+       out_hi_wkup_pdis: out_hi_wkup_pdis {
+               ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+
+       out_wkup_pdis: out_wkup_pdis {
+               ste,sleep-output = <SLPM_DIR_OUTPUT>;
+               ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+               ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+       };
+};
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
new file mode 100644 (file)
index 0000000..f1fc128
--- /dev/null
@@ -0,0 +1,347 @@
+/*
+ * Copyright 2011 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+
+/ {
+       model = "Calao Systems Snowball platform with device tree";
+       compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
+
+       memory {
+               reg = <0x00000000 0x20000000>;
+       };
+
+       en_3v3_reg: en_3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "en-3v3-fixed-supply";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */
+               gpio = <&ab8500_gpio 25 0x4>;
+               startup-delay-us = <5000>;
+               enable-active-high;
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               button@1 {
+                       debounce_interval = <50>;
+                       wakeup = <1>;
+                       linux,code = <2>;
+                       label = "userpb";
+                       gpios = <&gpio1 0 0x4>;
+               };
+               button@2 {
+                       debounce_interval = <50>;
+                       wakeup = <1>;
+                       linux,code = <3>;
+                       label = "extkb1";
+                       gpios = <&gpio4 23 0x4>;
+               };
+               button@3 {
+                       debounce_interval = <50>;
+                       wakeup = <1>;
+                       linux,code = <4>;
+                       label = "extkb2";
+                       gpios = <&gpio4 24 0x4>;
+               };
+               button@4 {
+                       debounce_interval = <50>;
+                       wakeup = <1>;
+                       linux,code = <5>;
+                       label = "extkb3";
+                       gpios = <&gpio5 1 0x4>;
+               };
+               button@5 {
+                       debounce_interval = <50>;
+                       wakeup = <1>;
+                       linux,code = <6>;
+                       label = "extkb4";
+                       gpios = <&gpio5 2 0x4>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               used-led {
+                       label = "user_led";
+                       gpios = <&gpio4 14 0x4>;
+                       default-state = "on";
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+
+       soc {
+
+               sound {
+                       compatible = "stericsson,snd-soc-mop500";
+
+                       stericsson,cpu-dai = <&msp1 &msp3>;
+                       stericsson,audio-codec = <&codec>;
+               };
+
+               msp1: msp@80124000 {
+                       status = "okay";
+               };
+
+               msp3: msp@80125000 {
+                       status = "okay";
+               };
+
+               external-bus@50000000 {
+                       status = "okay";
+
+                       ethernet@0 {
+                               compatible = "smsc,lan9115";
+                               reg = <0 0x10000>;
+                               interrupts = <12 IRQ_TYPE_EDGE_RISING>;
+                               interrupt-parent = <&gpio4>;
+                               vdd33a-supply = <&en_3v3_reg>;
+                               vddvario-supply = <&db8500_vape_reg>;
+
+
+                               reg-shift = <1>;
+                               reg-io-width = <2>;
+                               smsc,force-internal-phy;
+                               smsc,irq-active-high;
+                               smsc,irq-push-pull;
+                       };
+               };
+
+               vmmci: regulator-gpio {
+                       gpios = <&gpio6 25 0x4>;
+                       enable-gpio = <&gpio7 4 0x4>;
+
+                       status = "okay";
+               };
+
+               // External Micro SD slot
+               sdi0_per1@80126000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <4>;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
+                       vqmmc-supply = <&vmmci>;
+
+                       cd-gpios  = <&gpio6 26 0x4>; // 218
+                       cd-inverted;
+
+                       status = "okay";
+               };
+
+               // On-board eMMC
+               sdi4_per2@80114000 {
+                       arm,primecell-periphid = <0x10480180>;
+                       max-frequency = <100000000>;
+                       bus-width = <8>;
+                       mmc-cap-mmc-highspeed;
+                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+                       status = "okay";
+               };
+
+               uart@80120000 {
+                       status = "okay";
+               };
+
+               uart@80121000 {
+                       status = "okay";
+               };
+
+               uart@80007000 {
+                       status = "okay";
+               };
+
+               cpufreq-cooling {
+                       status = "okay";
+               };
+
+               prcmu@80157000 {
+                       db8500-prcmu-regulators {
+                               db8500_vape_reg: db8500_vape {
+                                       regulator-name = "db8500-vape";
+                               };
+
+                               db8500_varm_reg: db8500_varm {
+                                       regulator-name = "db8500-varm";
+                               };
+
+                               db8500_vmodem_reg: db8500_vmodem {
+                                       regulator-name = "db8500-vmodem";
+                               };
+
+                               db8500_vpll_reg: db8500_vpll {
+                                       regulator-name = "db8500-vpll";
+                               };
+
+                               db8500_vsmps1_reg: db8500_vsmps1 {
+                                       regulator-name = "db8500-vsmps1";
+                               };
+
+                               db8500_vsmps2_reg: db8500_vsmps2 {
+                                       regulator-name = "db8500-vsmps2";
+                               };
+
+                               db8500_vsmps3_reg: db8500_vsmps3 {
+                                       regulator-name = "db8500-vsmps3";
+                               };
+
+                               db8500_vrf1_reg: db8500_vrf1 {
+                                       regulator-name = "db8500-vrf1";
+                               };
+
+                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+                                       regulator-name = "db8500-sva-mmdsp";
+                               };
+
+                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+                                       regulator-name = "db8500-sva-mmdsp-ret";
+                               };
+
+                               db8500_sva_pipe_reg: db8500_sva_pipe {
+                                       regulator-name = "db8500_sva_pipe";
+                               };
+
+                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+                                       regulator-name = "db8500_sia_mmdsp";
+                               };
+
+                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+                                       regulator-name = "db8500-sia-mmdsp-ret";
+                               };
+
+                               db8500_sia_pipe_reg: db8500_sia_pipe {
+                                       regulator-name = "db8500-sia-pipe";
+                               };
+
+                               db8500_sga_reg: db8500_sga {
+                                       regulator-name = "db8500-sga";
+                               };
+
+                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+                                       regulator-name = "db8500-b2r2-mcde";
+                               };
+
+                               db8500_esram12_reg: db8500_esram12 {
+                                       regulator-name = "db8500-esram12";
+                               };
+
+                               db8500_esram12_ret_reg: db8500_esram12_ret {
+                                       regulator-name = "db8500-esram12-ret";
+                               };
+
+                               db8500_esram34_reg: db8500_esram34 {
+                                       regulator-name = "db8500-esram34";
+                               };
+
+                               db8500_esram34_ret_reg: db8500_esram34_ret {
+                                       regulator-name = "db8500-esram34-ret";
+                               };
+                       };
+
+                       thermal@801573c0 {
+                               num-trips = <4>;
+
+                               trip0-temp = <70000>;
+                               trip0-type = "active";
+                               trip0-cdev-num = <1>;
+                               trip0-cdev-name0 = "thermal-cpufreq-0";
+
+                               trip1-temp = <75000>;
+                               trip1-type = "active";
+                               trip1-cdev-num = <1>;
+                               trip1-cdev-name0 = "thermal-cpufreq-0";
+
+                               trip2-temp = <80000>;
+                               trip2-type = "active";
+                               trip2-cdev-num = <1>;
+                               trip2-cdev-name0 = "thermal-cpufreq-0";
+
+                               trip3-temp = <85000>;
+                               trip3-type = "critical";
+                               trip3-cdev-num = <0>;
+
+                               status = "okay";
+                       };
+
+                       ab8500 {
+                               ab8500-gpio {
+                                       compatible = "stericsson,ab8500-gpio";
+                               };
+
+                               ext_regulators: ab8500-ext-regulators {
+                                       ab8500_ext1_reg: ab8500_ext1 {
+                                               regulator-name = "ab8500-ext-supply1";
+                                       };
+
+                                       ab8500_ext2_reg_reg: ab8500_ext2 {
+                                               regulator-name = "ab8500-ext-supply2";
+                                       };
+
+                                       ab8500_ext3_reg_reg: ab8500_ext3 {
+                                               regulator-name = "ab8500-ext-supply3";
+                                       };
+                               };
+
+                               ab8500-regulators {
+                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                                               regulator-name = "V-DISPLAY";
+                                       };
+
+                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
+                                               regulator-name = "V-eMMC1";
+                                       };
+
+                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
+                                               regulator-name = "V-MMC-SD";
+                                       };
+
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
+                                               regulator-name = "V-INTCORE";
+                                       };
+
+                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
+                                               regulator-name = "V-TVOUT";
+                                       };
+
+                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
+                                               regulator-name = "dummy";
+                                       };
+
+                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
+                                               regulator-name = "V-AUD";
+                                       };
+
+                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
+                                               regulator-name = "V-AMIC1";
+                                       };
+
+                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
+                                               regulator-name = "V-AMIC2";
+                                       };
+
+                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
+                                               regulator-name = "V-DMIC";
+                                       };
+
+                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
+                                               regulator-name = "V-CSI/DSI";
+                                       };
+                               };
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/ste-stuib.dtsi b/arch/arm/boot/dts/ste-stuib.dtsi
new file mode 100644 (file)
index 0000000..524e332
--- /dev/null
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+       soc {
+               i2c@80004000 {
+                       stmpe1601: stmpe1601@40 {
+                               compatible = "st,stmpe1601";
+                               reg = <0x40>;
+                               interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
+                               interrupt-parent = <&gpio6>;
+                               interrupt-controller;
+
+                               wakeup-source;
+                               st,autosleep-timeout = <1024>;
+
+                               stmpe_keypad {
+                                       compatible = "st,stmpe-keypad";
+
+                                       debounce-interval = <64>;
+                                       st,scan-count = <8>;
+                                       st,no-autorepeat;
+
+                                       linux,keymap = <0x205006b
+                                                       0x4010074
+                                                       0x3050072
+                                                       0x1030004
+                                                       0x502006a
+                                                       0x500000a
+                                                       0x5008b
+                                                       0x706001c
+                                                       0x405000b
+                                                       0x6070003
+                                                       0x3040067
+                                                       0x303006c
+                                                       0x60400e7
+                                                       0x602009e
+                                                       0x4020073
+                                                       0x5050002
+                                                       0x4030069
+                                                       0x3020008>;
+                               };
+                       };
+               };
+
+               i2c@80110000 {
+                       bu21013_tp@5c {
+                               compatible = "rohm,bu21013_tp";
+                               reg = <0x5c>;
+                               touch-gpio = <&gpio2 20 0x4>;
+                               avdd-supply = <&ab8500_ldo_aux1_reg>;
+
+                               rohm,touch-max-x = <384>;
+                               rohm,touch-max-y = <704>;
+                               rohm,flip-y;
+                       };
+
+                       bu21013_tp@5d {
+                               compatible = "rohm,bu21013_tp";
+                               reg = <0x5d>;
+                               touch-gpio = <&gpio2 20 0x4>;
+                               avdd-supply = <&ab8500_ldo_aux1_reg>;
+
+                               rohm,touch-max-x = <384>;
+                               rohm,touch-max-y = <704>;
+                               rohm,flip-y;
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/stuib.dtsi
deleted file mode 100644 (file)
index 524e332..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-       soc {
-               i2c@80004000 {
-                       stmpe1601: stmpe1601@40 {
-                               compatible = "st,stmpe1601";
-                               reg = <0x40>;
-                               interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
-                               interrupt-parent = <&gpio6>;
-                               interrupt-controller;
-
-                               wakeup-source;
-                               st,autosleep-timeout = <1024>;
-
-                               stmpe_keypad {
-                                       compatible = "st,stmpe-keypad";
-
-                                       debounce-interval = <64>;
-                                       st,scan-count = <8>;
-                                       st,no-autorepeat;
-
-                                       linux,keymap = <0x205006b
-                                                       0x4010074
-                                                       0x3050072
-                                                       0x1030004
-                                                       0x502006a
-                                                       0x500000a
-                                                       0x5008b
-                                                       0x706001c
-                                                       0x405000b
-                                                       0x6070003
-                                                       0x3040067
-                                                       0x303006c
-                                                       0x60400e7
-                                                       0x602009e
-                                                       0x4020073
-                                                       0x5050002
-                                                       0x4030069
-                                                       0x3020008>;
-                               };
-                       };
-               };
-
-               i2c@80110000 {
-                       bu21013_tp@5c {
-                               compatible = "rohm,bu21013_tp";
-                               reg = <0x5c>;
-                               touch-gpio = <&gpio2 20 0x4>;
-                               avdd-supply = <&ab8500_ldo_aux1_reg>;
-
-                               rohm,touch-max-x = <384>;
-                               rohm,touch-max-y = <704>;
-                               rohm,flip-y;
-                       };
-
-                       bu21013_tp@5d {
-                               compatible = "rohm,bu21013_tp";
-                               reg = <0x5d>;
-                               touch-gpio = <&gpio2 20 0x4>;
-                               avdd-supply = <&ab8500_ldo_aux1_reg>;
-
-                               rohm,touch-max-x = <384>;
-                               rohm,touch-max-y = <704>;
-                               rohm,flip-y;
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
deleted file mode 100644 (file)
index 95892ec..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-/include/ "dbx5x0.dtsi"
-
-/ {
-       model = "ST-Ericsson U9540 platform with Device Tree";
-       compatible = "st-ericsson,u9540";
-
-       memory {
-               reg = <0x00000000 0x20000000>;
-       };
-
-       soc-u9500 {
-               uart@80120000 {
-                       status = "okay";
-               };
-
-               uart@80121000 {
-                       status = "okay";
-               };
-
-               uart@80007000 {
-                       status = "okay";
-               };
-
-               // External Micro SD slot
-               sdi0_per1@80126000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-                       cd-gpios  = <&gpio7 6 0x4>; // 230
-                       cd-inverted;
-
-                       status = "okay";
-               };
-
-
-               // WLAN SDIO channel
-               sdi1_per2@80118000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <50000000>;
-                       bus-width = <4>;
-
-                       status = "okay";
-               };
-
-               // On-board eMMC
-               sdi4_per2@80114000 {
-                       arm,primecell-periphid = <0x10480180>;
-                       max-frequency = <100000000>;
-                       bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
-                       vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                       status = "okay";
-               };
-       };
-};
index 12eee8167525dfd3f6e8cf6bec401408516b9dd1..2061b6a2a766aa947feda9e789c221355f08dbcb 100644 (file)
@@ -223,10 +223,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
        OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
        OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0",  &ssp0_plat),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  NULL),
        /* Requires clock name bindings. */
        OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
        OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
diff --git a/include/dt-bindings/pinctrl/nomadik.h b/include/dt-bindings/pinctrl/nomadik.h
new file mode 100644 (file)
index 0000000..638fb32
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * nomadik.h
+ *
+ * Copyright (C) ST-Ericsson SA 2013
+ * Author: Gabriel Fernandez <gabriel.fernandez@st.com> for ST-Ericsson.
+ * License terms:  GNU General Public License (GPL), version 2
+ */
+
+#define INPUT_NOPULL           0
+#define INPUT_PULLUP           1
+#define INPUT_PULLDOWN         2
+
+#define OUTPUT_LOW             0
+#define OUTPUT_HIGH            1
+#define DIR_OUTPUT             2
+
+#define SLPM_DISABLED          0
+#define SLPM_ENABLED           1
+
+#define SLPM_INPUT_NOPULL      0
+#define SLPM_INPUT_PULLUP      1
+#define SLPM_INPUT_PULLDOWN    2
+#define SLPM_DIR_INPUT         3
+
+#define SLPM_OUTPUT_LOW                0
+#define SLPM_OUTPUT_HIGH       1
+#define SLPM_DIR_OUTPUT                2
+
+#define SLPM_WAKEUP_DISABLE    0
+#define SLPM_WAKEUP_ENABLE     1
+
+#define GPIOMODE_DISABLED      0
+#define GPIOMODE_ENABLED       1
+
+#define SLPM_PDIS_DISABLED     0
+#define SLPM_PDIS_ENABLED      1
This page took 0.236616 seconds and 5 git commands to generate.