Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
“47a184a80800dd69abd1206eea1b961070ce2ca3”上不存在“drivers/gpu/drm/drm_bufs.c”
提交 9440bd23 编写于 作者: O Olof Johansson
浏览文件
操作

Merge tag 'ux500-dt-for-arm-soc' of... 

Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Device tree patches for ux500, basically trees and auxdata:
- Fix for the thermal node to be contained in the PRCMU node
- Add the DTS and auxdata needed to boot the U8540 platform
- Various regulators added and renamed
- Rename base SoC node
- A bunch of DMA patches adding channels for DT boots
- A bunch of crypto+hash patches adding config for DT boots
- A bunch of patches fixing the ALSA SoC support to work
- Register the LP5521 LEDs
- Fix a number of typos and naming errors

* tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (39 commits)
  ARM: ux500: drop any 0x prefix from I2C DT devices
  ARM: ux500: Allocate correct amount of memory for the u8540 in DT
  ARM: ux500: Provide auxdata to ux500 ASoC driver
  ARM: ux500: Add DT regulators for ab8500-codec
  ARM: ux500: Correct anamic2 typo in DT files
  ARM: ux500: Fix trivial typo in v-anamic1 comment
  ARM: ux500: Reduce PRCMU reg-names to shorter form for u8540 DT
  ARM: ux500: Add an auxdata entry for MUSB for clock-name look-up
  ARM: ux500: cut chip-select GPIOs from SSP device
  ARM: ux500: use symbolic names for interrupt flags
  ARM: ux500: use #include syntax to include *.dtsi.
  ARM: ux500: bump MMC/SD max frequency for DT boots
  ARM: ux500: Apply other compatible name to the u8540 DTS file
  pinctrl/nomadik: Standardise Pinctrl compat string for DBx5x based platforms
  ARM: ux500: Standardise Pinctrl compatible string for DBx5x based platforms
  ARM: ux500: Standardise DBx5x0 based Pinctrl compat string in the DTS
  crypto: ux500/hash - Enable DT probing of the driver
  crypto: ux500/cryp - Enable DT probing of the driver
  ARM: ux500: enable the crypto and hash on all dbx500
  ARM: ux500: Provide an AUXDATA entry for ux500-hash
  ...
Signed-off-by: NOlof Johansson <olof@lixom.net>
上级 9214cbe5 d594224a
隐藏空白更改
内联 并排
Showing with 359 addition and 164 deletion
Documentation/devicetree/bindings/mfd/ab8500.txt
浏览文件 @ 9440bd23
...@@ -120,7 +120,7 @@ ab8500 { ...@@ -120,7 +120,7 @@ ab8500 {
"USB_LINK_STATUS", "USB_LINK_STATUS",
"USB_ADP_PROBE_PLUG", "USB_ADP_PROBE_PLUG",
"USB_ADP_PROBE_UNPLUG"; "USB_ADP_PROBE_UNPLUG";
vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
musb_1v8-supply = <&db8500_vsmps2_reg>; musb_1v8-supply = <&db8500_vsmps2_reg>;
}; };
......
arch/arm/boot/dts/Makefile
浏览文件 @ 9440bd23
...@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb ...@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
hrefprev60.dtb \ hrefprev60.dtb \
hrefv60plus.dtb \ hrefv60plus.dtb \
ccu8540.dtb \
ccu9540.dtb ccu9540.dtb
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
......
arch/arm/boot/dts/ccu8540.dts 0 → 100644
浏览文件 @ 9440bd23
/*
* 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";
};
};
};
arch/arm/boot/dts/ccu9540.dts
浏览文件 @ 9440bd23
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "dbx5x0.dtsi" #include "dbx5x0.dtsi"
/ { / {
model = "ST-Ericsson CCU9540 platform with Device Tree"; model = "ST-Ericsson CCU9540 platform with Device Tree";
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
soc-u9500 { soc {
uart@80120000 { uart@80120000 {
status = "okay"; status = "okay";
}; };
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
// WLAN SDIO channel // WLAN SDIO channel
sdi1_per2@80118000 { sdi1_per2@80118000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/dbx5x0.dtsi
浏览文件 @ 9440bd23
...@@ -9,10 +9,11 @@ ...@@ -9,10 +9,11 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
/include/ "skeleton.dtsi" #include <dt-bindings/interrupt-controller/irq.h>
#include "skeleton.dtsi"
/ { / {
soc-u9500 { soc {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "stericsson,db8500"; compatible = "stericsson,db8500";
...@@ -31,33 +32,33 @@ ...@@ -31,33 +32,33 @@
L2: l2-cache { L2: l2-cache {
compatible = "arm,pl310-cache"; compatible = "arm,pl310-cache";
reg = <0xa0412000 0x1000>; reg = <0xa0412000 0x1000>;
interrupts = <0 13 4>; interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
cache-unified; cache-unified;
cache-level = <2>; cache-level = <2>;
}; };
pmu { pmu {
compatible = "arm,cortex-a9-pmu"; compatible = "arm,cortex-a9-pmu";
interrupts = <0 7 0x4>; interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
}; };
timer@a0410600 { timer@a0410600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xa0410600 0x20>; reg = <0xa0410600 0x20>;
interrupts = <1 13 0x304>; interrupts = <1 13 0x304>; /* IRQ level high per-CPU */
}; };
rtc@80154000 { rtc@80154000 {
compatible = "arm,rtc-pl031", "arm,primecell"; compatible = "arm,rtc-pl031", "arm,primecell";
reg = <0x80154000 0x1000>; reg = <0x80154000 0x1000>;
interrupts = <0 18 0x4>; interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
}; };
gpio0: gpio@8012e000 { gpio0: gpio@8012e000 {
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8012e000 0x80>; reg = <0x8012e000 0x80>;
interrupts = <0 119 0x4>; interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -70,7 +71,7 @@ ...@@ -70,7 +71,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8012e080 0x80>; reg = <0x8012e080 0x80>;
interrupts = <0 120 0x4>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8000e000 0x80>; reg = <0x8000e000 0x80>;
interrupts = <0 121 0x4>; interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8000e080 0x80>; reg = <0x8000e080 0x80>;
interrupts = <0 122 0x4>; interrupts = <0 122 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8000e100 0x80>; reg = <0x8000e100 0x80>;
interrupts = <0 123 0x4>; interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -122,7 +123,7 @@ ...@@ -122,7 +123,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8000e180 0x80>; reg = <0x8000e180 0x80>;
interrupts = <0 124 0x4>; interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8011e000 0x80>; reg = <0x8011e000 0x80>;
interrupts = <0 125 0x4>; interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0x8011e080 0x80>; reg = <0x8011e080 0x80>;
interrupts = <0 126 0x4>; interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -161,7 +162,7 @@ ...@@ -161,7 +162,7 @@
compatible = "stericsson,db8500-gpio", compatible = "stericsson,db8500-gpio",
"st,nomadik-gpio"; "st,nomadik-gpio";
reg = <0xa03fe000 0x80>; reg = <0xa03fe000 0x80>;
interrupts = <0 127 0x4>; interrupts = <0 127 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
st,supports-sleepmode; st,supports-sleepmode;
...@@ -171,29 +172,61 @@ ...@@ -171,29 +172,61 @@
}; };
pinctrl { pinctrl {
compatible = "stericsson,nmk-pinctrl"; compatible = "stericsson,db8500-pinctrl";
prcm = <&prcmu>; prcm = <&prcmu>;
}; };
usb@a03e0000 { usb_per5@a03e0000 {
compatible = "stericsson,db8500-musb", compatible = "stericsson,db8500-musb",
"mentor,musb"; "mentor,musb";
reg = <0xa03e0000 0x10000>; reg = <0xa03e0000 0x10000>;
interrupts = <0 23 0x4>; interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
}; interrupt-names = "mc";
dma-controller@801C0000 { dr_mode = "otg";
compatible = "stericsson,db8500-dma40",
"stericsson,dma40"; 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 = <0x801C0000 0x1000 0x40010000 0x800>;
interrupts = <0 25 0x4>; reg-names = "base", "lcpa";
interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <3>;
memcpy-channels = <56 57 58 59 60>;
}; };
prcmu: prcmu@80157000 { prcmu: prcmu@80157000 {
compatible = "stericsson,db8500-prcmu"; compatible = "stericsson,db8500-prcmu";
reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>; reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm"; reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
interrupts = <0 47 0x4>; interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
interrupt-controller; interrupt-controller;
...@@ -208,7 +241,8 @@ ...@@ -208,7 +241,8 @@
thermal@801573c0 { thermal@801573c0 {
compatible = "stericsson,db8500-thermal"; compatible = "stericsson,db8500-thermal";
reg = <0x801573c0 0x40>; reg = <0x801573c0 0x40>;
interrupts = <21 0x4>, <22 0x4>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,
<22 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
status = "disabled"; status = "disabled";
}; };
...@@ -322,21 +356,21 @@ ...@@ -322,21 +356,21 @@
ab8500 { ab8500 {
compatible = "stericsson,ab8500"; compatible = "stericsson,ab8500";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <0 40 0x4>; interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
ab8500-rtc { ab8500-rtc {
compatible = "stericsson,ab8500-rtc"; compatible = "stericsson,ab8500-rtc";
interrupts = <17 0x4 interrupts = <17 IRQ_TYPE_LEVEL_HIGH
18 0x4>; 18 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "60S", "ALARM"; interrupt-names = "60S", "ALARM";
}; };
ab8500-gpadc { ab8500-gpadc {
compatible = "stericsson,ab8500-gpadc"; compatible = "stericsson,ab8500-gpadc";
interrupts = <32 0x4 interrupts = <32 IRQ_TYPE_LEVEL_HIGH
39 0x4>; 39 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "HW_CONV_END", "SW_CONV_END"; interrupt-names = "HW_CONV_END", "SW_CONV_END";
vddadc-supply = <&ab8500_ldo_tvout_reg>; vddadc-supply = <&ab8500_ldo_tvout_reg>;
}; };
...@@ -369,13 +403,13 @@ ...@@ -369,13 +403,13 @@
ab8500_usb { ab8500_usb {
compatible = "stericsson,ab8500-usb"; compatible = "stericsson,ab8500-usb";
interrupts = < 90 0x4 interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
96 0x4 96 IRQ_TYPE_LEVEL_HIGH
14 0x4 14 IRQ_TYPE_LEVEL_HIGH
15 0x4 15 IRQ_TYPE_LEVEL_HIGH
79 0x4 79 IRQ_TYPE_LEVEL_HIGH
74 0x4 74 IRQ_TYPE_LEVEL_HIGH
75 0x4>; 75 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ID_WAKEUP_R", interrupt-names = "ID_WAKEUP_R",
"ID_WAKEUP_F", "ID_WAKEUP_F",
"VBUS_DET_F", "VBUS_DET_F",
...@@ -383,15 +417,15 @@ ...@@ -383,15 +417,15 @@
"USB_LINK_STATUS", "USB_LINK_STATUS",
"USB_ADP_PROBE_PLUG", "USB_ADP_PROBE_PLUG",
"USB_ADP_PROBE_UNPLUG"; "USB_ADP_PROBE_UNPLUG";
vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
musb_1v8-supply = <&db8500_vsmps2_reg>; musb_1v8-supply = <&db8500_vsmps2_reg>;
}; };
ab8500-ponkey { ab8500-ponkey {
compatible = "stericsson,ab8500-poweron-key"; compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 0x4 interrupts = <6 IRQ_TYPE_LEVEL_HIGH
7 0x4>; 7 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
}; };
...@@ -410,6 +444,11 @@ ...@@ -410,6 +444,11 @@
codec: ab8500-codec { codec: ab8500-codec {
compatible = "stericsson,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. */ stericsson,earpeice-cmv = <950>; /* Units in mV. */
}; };
...@@ -441,8 +480,8 @@ ...@@ -441,8 +480,8 @@
}; };
// supply for v-intcore12; VINTCORE12 LDO // supply for v-intcore12; VINTCORE12 LDO
ab8500_ldo_initcore_reg: ab8500_ldo_initcore { ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
regulator-compatible = "ab8500_ldo_initcore"; regulator-compatible = "ab8500_ldo_intcore";
}; };
// supply for tvout; gpadc; TVOUT LDO // supply for tvout; gpadc; TVOUT LDO
...@@ -460,14 +499,14 @@ ...@@ -460,14 +499,14 @@
regulator-compatible = "ab8500_ldo_audio"; regulator-compatible = "ab8500_ldo_audio";
}; };
// supply for v-anamic1 VAMic1-LDO // supply for v-anamic1 VAMIC1 LDO
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
regulator-compatible = "ab8500_ldo_anamic1"; regulator-compatible = "ab8500_ldo_anamic1";
}; };
// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-compatible = "ab8500_ldo_amamic2"; regulator-compatible = "ab8500_ldo_anamic2";
}; };
// supply for v-dmic; VDMIC LDO // supply for v-dmic; VDMIC LDO
...@@ -486,7 +525,7 @@ ...@@ -486,7 +525,7 @@
i2c@80004000 { i2c@80004000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80004000 0x1000>; reg = <0x80004000 0x1000>;
interrupts = <0 21 0x4>; interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
arm,primecell-periphid = <0x180024>; arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
...@@ -499,7 +538,7 @@ ...@@ -499,7 +538,7 @@
i2c@80122000 { i2c@80122000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80122000 0x1000>; reg = <0x80122000 0x1000>;
interrupts = <0 22 0x4>; interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
arm,primecell-periphid = <0x180024>; arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
...@@ -512,7 +551,7 @@ ...@@ -512,7 +551,7 @@
i2c@80128000 { i2c@80128000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80128000 0x1000>; reg = <0x80128000 0x1000>;
interrupts = <0 55 0x4>; interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
arm,primecell-periphid = <0x180024>; arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
...@@ -525,7 +564,7 @@ ...@@ -525,7 +564,7 @@
i2c@80110000 { i2c@80110000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x80110000 0x1000>; reg = <0x80110000 0x1000>;
interrupts = <0 12 0x4>; interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>;
arm,primecell-periphid = <0x180024>; arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
...@@ -538,7 +577,7 @@ ...@@ -538,7 +577,7 @@
i2c@8012a000 { i2c@8012a000 {
compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
reg = <0x8012a000 0x1000>; reg = <0x8012a000 0x1000>;
interrupts = <0 51 0x4>; interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
arm,primecell-periphid = <0x180024>; arm,primecell-periphid = <0x180024>;
#address-cells = <1>; #address-cells = <1>;
...@@ -551,82 +590,114 @@ ...@@ -551,82 +590,114 @@
ssp@80002000 { ssp@80002000 {
compatible = "arm,pl022", "arm,primecell"; compatible = "arm,pl022", "arm,primecell";
reg = <0x80002000 0x1000>; reg = <0x80002000 0x1000>;
interrupts = <0 14 0x4>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
// Add one of these for each child device
cs-gpios = <&gpio0 31 0x4 &gpio4 14 0x4 &gpio4 16 0x4
&gpio6 22 0x4 &gpio7 0 0x4>;
}; };
uart@80120000 { uart@80120000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x80120000 0x1000>; reg = <0x80120000 0x1000>;
interrupts = <0 11 0x4>; 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"; status = "disabled";
}; };
uart@80121000 { uart@80121000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x80121000 0x1000>; reg = <0x80121000 0x1000>;
interrupts = <0 19 0x4>; 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"; status = "disabled";
}; };
uart@80007000 { uart@80007000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x80007000 0x1000>; reg = <0x80007000 0x1000>;
interrupts = <0 26 0x4>; 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"; status = "disabled";
}; };
sdi0_per1@80126000 { sdi0_per1@80126000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80126000 0x1000>; reg = <0x80126000 0x1000>;
interrupts = <0 60 0x4>; 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"; status = "disabled";
}; };
sdi1_per2@80118000 { sdi1_per2@80118000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80118000 0x1000>; reg = <0x80118000 0x1000>;
interrupts = <0 50 0x4>; 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"; status = "disabled";
}; };
sdi2_per3@80005000 { sdi2_per3@80005000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80005000 0x1000>; reg = <0x80005000 0x1000>;
interrupts = <0 41 0x4>; 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"; status = "disabled";
}; };
sdi3_per2@80119000 { sdi3_per2@80119000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80119000 0x1000>; reg = <0x80119000 0x1000>;
interrupts = <0 59 0x4>; interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
sdi4_per2@80114000 { sdi4_per2@80114000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>; reg = <0x80114000 0x1000>;
interrupts = <0 99 0x4>; 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"; status = "disabled";
}; };
sdi5_per3@80008000 { sdi5_per3@80008000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80008000 0x1000>; reg = <0x80008000 0x1000>;
interrupts = <0 100 0x4>; interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
msp0: msp@80123000 { msp0: msp@80123000 {
compatible = "stericsson,ux500-msp-i2s"; compatible = "stericsson,ux500-msp-i2s";
reg = <0x80123000 0x1000>; reg = <0x80123000 0x1000>;
interrupts = <0 31 0x4>; interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
status = "disabled"; status = "disabled";
}; };
...@@ -634,7 +705,7 @@ ...@@ -634,7 +705,7 @@
msp1: msp@80124000 { msp1: msp@80124000 {
compatible = "stericsson,ux500-msp-i2s"; compatible = "stericsson,ux500-msp-i2s";
reg = <0x80124000 0x1000>; reg = <0x80124000 0x1000>;
interrupts = <0 62 0x4>; interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
status = "disabled"; status = "disabled";
}; };
...@@ -643,7 +714,7 @@ ...@@ -643,7 +714,7 @@
msp2: msp@80117000 { msp2: msp@80117000 {
compatible = "stericsson,ux500-msp-i2s"; compatible = "stericsson,ux500-msp-i2s";
reg = <0x80117000 0x1000>; reg = <0x80117000 0x1000>;
interrupts = <0 98 0x4>; interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
status = "disabled"; status = "disabled";
}; };
...@@ -651,7 +722,7 @@ ...@@ -651,7 +722,7 @@
msp3: msp@80125000 { msp3: msp@80125000 {
compatible = "stericsson,ux500-msp-i2s"; compatible = "stericsson,ux500-msp-i2s";
reg = <0x80125000 0x1000>; reg = <0x80125000 0x1000>;
interrupts = <0 62 0x4>; interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
v-ape-supply = <&db8500_vape_reg>; v-ape-supply = <&db8500_vape_reg>;
status = "disabled"; status = "disabled";
}; };
...@@ -686,5 +757,20 @@ ...@@ -686,5 +757,20 @@
status = "disabled"; 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>;
};
}; };
}; };
arch/arm/boot/dts/href.dtsi
浏览文件 @ 9440bd23
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
/include/ "dbx5x0.dtsi" #include <dt-bindings/interrupt-controller/irq.h>
#include "dbx5x0.dtsi"
/ { / {
memory { memory {
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
}; };
}; };
soc-u9500 { soc {
uart@80120000 { uart@80120000 {
status = "okay"; status = "okay";
}; };
...@@ -45,14 +46,14 @@ ...@@ -45,14 +46,14 @@
compatible = "tc3589x"; compatible = "tc3589x";
reg = <0x42>; reg = <0x42>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupts = <25 0x1>; interrupts = <25 IRQ_TYPE_EDGE_RISING>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
tc3589x_gpio: tc3589x_gpio { tc3589x_gpio: tc3589x_gpio {
compatible = "tc3589x-gpio"; compatible = "tc3589x-gpio";
interrupts = <0 0x1>; interrupts = <0 IRQ_TYPE_EDGE_RISING>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
...@@ -63,17 +64,43 @@ ...@@ -63,17 +64,43 @@
}; };
i2c@80128000 { i2c@80128000 {
lp5521@0x33 { lp5521@33 {
compatible = "lp5521"; compatible = "national,lp5521";
reg = <0x33>; 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 {
lp5521@0x34 { compatible = "national,lp5521";
compatible = "lp5521";
reg = <0x34>; 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 {
bh1780@0x29 {
compatible = "rohm,bh1780gli"; compatible = "rohm,bh1780gli";
reg = <0x33>; reg = <0x33>;
}; };
...@@ -82,7 +109,7 @@ ...@@ -82,7 +109,7 @@
// External Micro SD slot // External Micro SD slot
sdi0_per1@80126000 { sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
mmc-cap-sd-highspeed; mmc-cap-sd-highspeed;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
...@@ -97,7 +124,7 @@ ...@@ -97,7 +124,7 @@
// WLAN SDIO channel // WLAN SDIO channel
sdi1_per2@80118000 { sdi1_per2@80118000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
...@@ -106,7 +133,7 @@ ...@@ -106,7 +133,7 @@
// PoP:ed eMMC // PoP:ed eMMC
sdi2_per3@80005000 { sdi2_per3@80005000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <8>; bus-width = <8>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
...@@ -116,7 +143,7 @@ ...@@ -116,7 +143,7 @@
// On-board eMMC // On-board eMMC
sdi4_per2@80114000 { sdi4_per2@80114000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <8>; bus-width = <8>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>; vmmc-supply = <&ab8500_ldo_aux2_reg>;
...@@ -236,7 +263,7 @@ ...@@ -236,7 +263,7 @@
regulator-name = "V-MMC-SD"; regulator-name = "V-MMC-SD";
}; };
ab8500_ldo_initcore_reg: ab8500_ldo_initcore { ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
regulator-name = "V-INTCORE"; regulator-name = "V-INTCORE";
}; };
...@@ -256,7 +283,7 @@ ...@@ -256,7 +283,7 @@
regulator-name = "V-AMIC1"; regulator-name = "V-AMIC1";
}; };
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2"; regulator-name = "V-AMIC2";
}; };
......
arch/arm/boot/dts/hrefprev60.dts
浏览文件 @ 9440bd23
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "dbx5x0.dtsi" #include "dbx5x0.dtsi"
/include/ "href.dtsi" #include "href.dtsi"
/include/ "stuib.dtsi" #include "stuib.dtsi"
/ { / {
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
}; };
}; };
soc-u9500 { soc {
prcmu@80157000 { prcmu@80157000 {
ab8500@5 { ab8500@5 {
ab8500-gpio { ab8500-gpio {
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
}; };
i2c@80110000 { i2c@80110000 {
bu21013_tp@0x5c { bu21013_tp@5c {
reset-gpio = <&tc3589x_gpio 13 0x4>; reset-gpio = <&tc3589x_gpio 13 0x4>;
}; };
}; };
......
arch/arm/boot/dts/hrefv60plus.dts
浏览文件 @ 9440bd23
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "dbx5x0.dtsi" #include "dbx5x0.dtsi"
/include/ "href.dtsi" #include "href.dtsi"
/include/ "stuib.dtsi" #include "stuib.dtsi"
/ { / {
model = "ST-Ericsson HREF (v60+) platform with Device Tree"; model = "ST-Ericsson HREF (v60+) platform with Device Tree";
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
}; };
}; };
soc-u9500 { soc {
i2c@80110000 { i2c@80110000 {
bu21013_tp@0x5c { bu21013_tp@0x5c {
reset-gpio = <&gpio4 15 0x4>; reset-gpio = <&gpio4 15 0x4>;
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
// External Micro SD slot // External Micro SD slot
sdi0_per1@80126000 { sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
mmc-cap-sd-highspeed; mmc-cap-sd-highspeed;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
// WLAN SDIO channel // WLAN SDIO channel
sdi1_per2@80118000 { sdi1_per2@80118000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
// PoP:ed eMMC // PoP:ed eMMC
sdi2_per3@80005000 { sdi2_per3@80005000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <8>; bus-width = <8>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
// On-board eMMC // On-board eMMC
sdi4_per2@80114000 { sdi4_per2@80114000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <8>; bus-width = <8>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>; vmmc-supply = <&ab8500_ldo_aux2_reg>;
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
regulator-name = "V-MMC-SD"; regulator-name = "V-MMC-SD";
}; };
ab8500_ldo_initcore_reg: ab8500_ldo_initcore { ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
regulator-name = "V-INTCORE"; regulator-name = "V-INTCORE";
}; };
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
regulator-name = "V-AMIC1"; regulator-name = "V-AMIC1";
}; };
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2"; regulator-name = "V-AMIC2";
}; };
......
arch/arm/boot/dts/snowball.dts
浏览文件 @ 9440bd23
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "dbx5x0.dtsi" #include "dbx5x0.dtsi"
/ { / {
model = "Calao Systems Snowball platform with device tree"; model = "Calao Systems Snowball platform with device tree";
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
}; };
}; };
soc-u9500 { soc {
sound { sound {
compatible = "stericsson,snd-soc-mop500"; compatible = "stericsson,snd-soc-mop500";
...@@ -99,40 +99,13 @@ ...@@ -99,40 +99,13 @@
status = "okay"; status = "okay";
}; };
prcmu@80157000 {
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";
};
};
external-bus@50000000 { external-bus@50000000 {
status = "okay"; status = "okay";
ethernet@0 { ethernet@0 {
compatible = "smsc,lan9115"; compatible = "smsc,lan9115";
reg = <0 0x10000>; reg = <0 0x10000>;
interrupts = <12 0x1>; interrupts = <12 IRQ_TYPE_EDGE_RISING>;
interrupt-parent = <&gpio4>; interrupt-parent = <&gpio4>;
vdd33a-supply = <&en_3v3_reg>; vdd33a-supply = <&en_3v3_reg>;
vddvario-supply = <&db8500_vape_reg>; vddvario-supply = <&db8500_vape_reg>;
...@@ -146,13 +119,21 @@ ...@@ -146,13 +119,21 @@
}; };
}; };
vmmci: regulator-gpio {
gpios = <&gpio6 25 0x4>;
enable-gpio = <&gpio7 4 0x4>;
status = "okay";
};
// External Micro SD slot // External Micro SD slot
sdi0_per1@80126000 { sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <4>; bus-width = <4>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux3_reg>; vmmc-supply = <&ab8500_ldo_aux3_reg>;
vqmmc-supply = <&vmmci>;
cd-gpios = <&gpio6 26 0x4>; // 218 cd-gpios = <&gpio6 26 0x4>; // 218
cd-inverted; cd-inverted;
...@@ -163,7 +144,7 @@ ...@@ -163,7 +144,7 @@
// On-board eMMC // On-board eMMC
sdi4_per2@80114000 { sdi4_per2@80114000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>; max-frequency = <100000000>;
bus-width = <8>; bus-width = <8>;
mmc-cap-mmc-highspeed; mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>; vmmc-supply = <&ab8500_ldo_aux2_reg>;
...@@ -197,15 +178,15 @@ ...@@ -197,15 +178,15 @@
}; };
i2c@80128000 { i2c@80128000 {
lp5521@0x33 { lp5521@33 {
// compatible = "lp5521"; // compatible = "lp5521";
reg = <0x33>; reg = <0x33>;
}; };
lp5521@0x34 { lp5521@34 {
// compatible = "lp5521"; // compatible = "lp5521";
reg = <0x34>; reg = <0x34>;
}; };
bh1780@0x29 { bh1780@29 {
// compatible = "rohm,bh1780gli"; // compatible = "rohm,bh1780gli";
reg = <0x33>; reg = <0x33>;
}; };
...@@ -298,6 +279,31 @@ ...@@ -298,6 +279,31 @@
}; };
}; };
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 {
ab8500-gpio { ab8500-gpio {
compatible = "stericsson,ab8500-gpio"; compatible = "stericsson,ab8500-gpio";
...@@ -316,7 +322,7 @@ ...@@ -316,7 +322,7 @@
regulator-name = "V-MMC-SD"; regulator-name = "V-MMC-SD";
}; };
ab8500_ldo_initcore_reg: ab8500_ldo_initcore { ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
regulator-name = "V-INTCORE"; regulator-name = "V-INTCORE";
}; };
...@@ -336,7 +342,7 @@ ...@@ -336,7 +342,7 @@
regulator-name = "V-AMIC1"; regulator-name = "V-AMIC1";
}; };
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2"; regulator-name = "V-AMIC2";
}; };
......
arch/arm/boot/dts/stuib.dtsi
浏览文件 @ 9440bd23
...@@ -9,13 +9,15 @@ ...@@ -9,13 +9,15 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include <dt-bindings/interrupt-controller/irq.h>
/ { / {
soc-u9500 { soc {
i2c@80004000 { i2c@80004000 {
stmpe1601: stmpe1601@40 { stmpe1601: stmpe1601@40 {
compatible = "st,stmpe1601"; compatible = "st,stmpe1601";
reg = <0x40>; reg = <0x40>;
interrupts = <26 0x2>; interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupt-controller; interrupt-controller;
...@@ -52,26 +54,26 @@ ...@@ -52,26 +54,26 @@
}; };
i2c@80110000 { i2c@80110000 {
bu21013_tp@0x5c { bu21013_tp@5c {
compatible = "rhom,bu21013_tp"; compatible = "rohm,bu21013_tp";
reg = <0x5c>; reg = <0x5c>;
touch-gpio = <&gpio2 20 0x4>; touch-gpio = <&gpio2 20 0x4>;
avdd-supply = <&ab8500_ldo_aux1_reg>; avdd-supply = <&ab8500_ldo_aux1_reg>;
rhom,touch-max-x = <384>; rohm,touch-max-x = <384>;
rhom,touch-max-y = <704>; rohm,touch-max-y = <704>;
rhom,flip-y; rohm,flip-y;
}; };
bu21013_tp@0x5d { bu21013_tp@5d {
compatible = "rhom,bu21013_tp"; compatible = "rohm,bu21013_tp";
reg = <0x5d>; reg = <0x5d>;
touch-gpio = <&gpio2 20 0x4>; touch-gpio = <&gpio2 20 0x4>;
avdd-supply = <&ab8500_ldo_aux1_reg>; avdd-supply = <&ab8500_ldo_aux1_reg>;
rhom,touch-max-x = <384>; rohm,touch-max-x = <384>;
rhom,touch-max-y = <704>; rohm,touch-max-y = <704>;
rhom,flip-y; rohm,flip-y;
}; };
}; };
}; };
......
arch/arm/mach-ux500/cpu-db8500.c
浏览文件 @ 9440bd23
...@@ -274,11 +274,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { ...@@ -274,11 +274,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL),
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
OF_DEV_AUXDATA("stericsson,db8500-musb", 0xa03e0000, "musb-ux500.0", NULL),
OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
&db8500_prcmu_pdata), &db8500_prcmu_pdata),
OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL), OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL),
OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),
OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
NULL),
/* Requires device name bindings. */ /* Requires device name bindings. */
OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,
"pinctrl-db8500", NULL), "pinctrl-db8500", NULL),
/* Requires clock name and DMA bindings. */ /* Requires clock name and DMA bindings. */
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
...@@ -292,6 +297,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { ...@@ -292,6 +297,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
{}, {},
}; };
static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {
/* Requires DMA bindings. */
OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL),
OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
&db8500_prcmu_pdata),
{},
};
static const struct of_device_id u8500_local_bus_nodes[] = { static const struct of_device_id u8500_local_bus_nodes[] = {
/* only create devices below soc node */ /* only create devices below soc node */
{ .compatible = "stericsson,db8500", }, { .compatible = "stericsson,db8500", },
...@@ -318,8 +333,13 @@ static void __init u8500_init_machine(void) ...@@ -318,8 +333,13 @@ static void __init u8500_init_machine(void)
/* TODO: Export SoC, USB, cpu-freq and DMA40 */ /* TODO: Export SoC, USB, cpu-freq and DMA40 */
parent = u8500_of_init_devices(); parent = u8500_of_init_devices();
/* automatically probe child nodes of db8500 device */ /* automatically probe child nodes of dbx5x0 devices */
of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); if (of_machine_is_compatible("st-ericsson,u8540"))
of_platform_populate(NULL, u8500_local_bus_nodes,
u8540_auxdata_lookup, parent);
else
of_platform_populate(NULL, u8500_local_bus_nodes,
u8500_auxdata_lookup, parent);
} }
static const char * stericsson_dt_platform_compat[] = { static const char * stericsson_dt_platform_compat[] = {
......
drivers/crypto/ux500/cryp/cryp_core.c
浏览文件 @ 9440bd23
...@@ -1743,6 +1743,11 @@ static int ux500_cryp_resume(struct device *dev) ...@@ -1743,6 +1743,11 @@ static int ux500_cryp_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume); static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume);
static const struct of_device_id ux500_cryp_match[] = {
{ .compatible = "stericsson,ux500-cryp" },
{ },
};
static struct platform_driver cryp_driver = { static struct platform_driver cryp_driver = {
.probe = ux500_cryp_probe, .probe = ux500_cryp_probe,
.remove = ux500_cryp_remove, .remove = ux500_cryp_remove,
...@@ -1750,6 +1755,7 @@ static struct platform_driver cryp_driver = { ...@@ -1750,6 +1755,7 @@ static struct platform_driver cryp_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "cryp1", .name = "cryp1",
.of_match_table = ux500_cryp_match,
.pm = &ux500_cryp_pm, .pm = &ux500_cryp_pm,
} }
}; };
......
drivers/crypto/ux500/hash/hash_core.c
浏览文件 @ 9440bd23
...@@ -1961,6 +1961,11 @@ static int ux500_hash_resume(struct device *dev) ...@@ -1961,6 +1961,11 @@ static int ux500_hash_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume); static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume);
static const struct of_device_id ux500_hash_match[] = {
{ .compatible = "stericsson,ux500-hash" },
{ },
};
static struct platform_driver hash_driver = { static struct platform_driver hash_driver = {
.probe = ux500_hash_probe, .probe = ux500_hash_probe,
.remove = ux500_hash_remove, .remove = ux500_hash_remove,
...@@ -1968,6 +1973,7 @@ static struct platform_driver hash_driver = { ...@@ -1968,6 +1973,7 @@ static struct platform_driver hash_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "hash1", .name = "hash1",
.of_match_table = ux500_hash_match,
.pm = &ux500_hash_pm, .pm = &ux500_hash_pm,
} }
}; };
......
drivers/pinctrl/pinctrl-nomadik.c
浏览文件 @ 9440bd23
...@@ -2108,11 +2108,11 @@ static const struct of_device_id nmk_pinctrl_match[] = { ...@@ -2108,11 +2108,11 @@ static const struct of_device_id nmk_pinctrl_match[] = {
.data = (void *)PINCTRL_NMK_STN8815, .data = (void *)PINCTRL_NMK_STN8815,
}, },
{ {
.compatible = "stericsson,nmk-pinctrl", .compatible = "stericsson,db8500-pinctrl",
.data = (void *)PINCTRL_NMK_DB8500, .data = (void *)PINCTRL_NMK_DB8500,
}, },
{ {
.compatible = "stericsson,nmk-pinctrl-db8540", .compatible = "stericsson,db8540-pinctrl",
.data = (void *)PINCTRL_NMK_DB8540, .data = (void *)PINCTRL_NMK_DB8540,
}, },
{}, {},
......
drivers/regulator/ab8500.c
浏览文件 @ 9440bd23
...@@ -2901,7 +2901,7 @@ static struct of_regulator_match ab8500_regulator_match[] = { ...@@ -2901,7 +2901,7 @@ static struct of_regulator_match ab8500_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
{ .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
}; };
...@@ -2917,7 +2917,7 @@ static struct of_regulator_match ab8505_regulator_match[] = { ...@@ -2917,7 +2917,7 @@ static struct of_regulator_match ab8505_regulator_match[] = {
{ .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, }, { .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, },
{ .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, }, { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, }, { .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, }, { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, },
}; };
...@@ -2933,7 +2933,7 @@ static struct of_regulator_match ab8540_regulator_match[] = { ...@@ -2933,7 +2933,7 @@ static struct of_regulator_match ab8540_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, },
{ .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, }, { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, }, { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, }, { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, },
{ .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, }, { .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, },
...@@ -2948,7 +2948,7 @@ static struct of_regulator_match ab9540_regulator_match[] = { ...@@ -2948,7 +2948,7 @@ static struct of_regulator_match ab9540_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, }, { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, }, { .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, }, { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, },
{ .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, }, { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, }, { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, }, { .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, },
}; };
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或