aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/Makefile6
-rw-r--r--arch/arm/boot/dts/ste-href-stuib.dtsi (renamed from arch/arm/boot/dts/ste-stuib.dtsi)2
-rw-r--r--arch/arm/boot/dts/ste-href-tvk1281618.dtsi41
-rw-r--r--arch/arm/boot/dts/ste-href.dtsi29
-rw-r--r--arch/arm/boot/dts/ste-hrefprev60-stuib.dts34
-rw-r--r--arch/arm/boot/dts/ste-hrefprev60-tvk.dts19
-rw-r--r--arch/arm/boot/dts/ste-hrefprev60.dtsi (renamed from arch/arm/boot/dts/ste-hrefprev60.dts)37
-rw-r--r--arch/arm/boot/dts/ste-hrefv60plus-stuib.dts36
-rw-r--r--arch/arm/boot/dts/ste-hrefv60plus-tvk.dts21
-rw-r--r--arch/arm/boot/dts/ste-hrefv60plus.dtsi (renamed from arch/arm/boot/dts/ste-hrefv60plus.dts)12
10 files changed, 183 insertions, 54 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7ec6985a5315..a5534c0e71ef 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -190,8 +190,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
190dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb 190dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
191dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 191dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
192dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 192dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
193 ste-hrefprev60.dtb \ 193 ste-hrefprev60-stuib.dtb \
194 ste-hrefv60plus.dtb \ 194 ste-hrefprev60-tvk.dtb \
195 ste-hrefv60plus-stuib.dtb \
196 ste-hrefv60plus-tvk.dtb \
195 ste-ccu8540.dtb \ 197 ste-ccu8540.dtb \
196 ste-ccu9540.dtb 198 ste-ccu9540.dtb
197dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb 199dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
diff --git a/arch/arm/boot/dts/ste-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
index 524e33240ad4..76704ec0ffcc 100644
--- a/arch/arm/boot/dts/ste-stuib.dtsi
+++ b/arch/arm/boot/dts/ste-href-stuib.dtsi
@@ -57,7 +57,6 @@
57 bu21013_tp@5c { 57 bu21013_tp@5c {
58 compatible = "rohm,bu21013_tp"; 58 compatible = "rohm,bu21013_tp";
59 reg = <0x5c>; 59 reg = <0x5c>;
60 touch-gpio = <&gpio2 20 0x4>;
61 avdd-supply = <&ab8500_ldo_aux1_reg>; 60 avdd-supply = <&ab8500_ldo_aux1_reg>;
62 61
63 rohm,touch-max-x = <384>; 62 rohm,touch-max-x = <384>;
@@ -68,7 +67,6 @@
68 bu21013_tp@5d { 67 bu21013_tp@5d {
69 compatible = "rohm,bu21013_tp"; 68 compatible = "rohm,bu21013_tp";
70 reg = <0x5d>; 69 reg = <0x5d>;
71 touch-gpio = <&gpio2 20 0x4>;
72 avdd-supply = <&ab8500_ldo_aux1_reg>; 70 avdd-supply = <&ab8500_ldo_aux1_reg>;
73 71
74 rohm,touch-max-x = <384>; 72 rohm,touch-max-x = <384>;
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
new file mode 100644
index 000000000000..76d3ef13175f
--- /dev/null
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -0,0 +1,41 @@
1/*
2 * Copyright 2012 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 *
11 * Device Tree for the TVK1281618 UIB
12 */
13
14#include <dt-bindings/interrupt-controller/irq.h>
15
16/ {
17 soc {
18 /* Add Synaptics touch screen, TC35892 keypad etc here */
19 i2c@80004000 {
20 tc3589x@44 {
21 compatible = "tc3589x";
22 reg = <0x44>;
23 interrupt-parent = <&gpio6>;
24 interrupts = <26 IRQ_TYPE_EDGE_RISING>;
25
26 interrupt-controller;
27 #interrupt-cells = <2>;
28
29 tc3589x_gpio {
30 compatible = "tc3589x-gpio";
31 interrupts = <0 IRQ_TYPE_EDGE_RISING>;
32
33 interrupt-controller;
34 #interrupt-cells = <2>;
35 gpio-controller;
36 #gpio-cells = <2>;
37 };
38 };
39 };
40 };
41};
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index f88a659aea3b..aa3f02060fdd 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -41,28 +41,6 @@
41 status = "okay"; 41 status = "okay";
42 }; 42 };
43 43
44 i2c@80004000 {
45 tc3589x@42 {
46 compatible = "tc3589x";
47 reg = <0x42>;
48 interrupt-parent = <&gpio6>;
49 interrupts = <25 IRQ_TYPE_EDGE_RISING>;
50
51 interrupt-controller;
52 #interrupt-cells = <2>;
53
54 tc3589x_gpio: tc3589x_gpio {
55 compatible = "tc3589x-gpio";
56 interrupts = <0 IRQ_TYPE_EDGE_RISING>;
57
58 interrupt-controller;
59 #interrupt-cells = <2>;
60 gpio-controller;
61 #gpio-cells = <2>;
62 };
63 };
64 };
65
66 i2c@80128000 { 44 i2c@80128000 {
67 lp5521@33 { 45 lp5521@33 {
68 compatible = "national,lp5521"; 46 compatible = "national,lp5521";
@@ -72,6 +50,7 @@
72 chan0 { 50 chan0 {
73 led-cur = /bits/ 8 <0x2f>; 51 led-cur = /bits/ 8 <0x2f>;
74 max-cur = /bits/ 8 <0x5f>; 52 max-cur = /bits/ 8 <0x5f>;
53 linux,default-trigger = "heartbeat";
75 }; 54 };
76 chan1 { 55 chan1 {
77 led-cur = /bits/ 8 <0x2f>; 56 led-cur = /bits/ 8 <0x2f>;
@@ -102,7 +81,7 @@
102 }; 81 };
103 bh1780@29 { 82 bh1780@29 {
104 compatible = "rohm,bh1780gli"; 83 compatible = "rohm,bh1780gli";
105 reg = <0x33>; 84 reg = <0x29>;
106 }; 85 };
107 }; 86 };
108 87
@@ -168,6 +147,10 @@
168 147
169 prcmu@80157000 { 148 prcmu@80157000 {
170 ab8500 { 149 ab8500 {
150 ab8500-gpio {
151 compatible = "stericsson,ab8500-gpio";
152 };
153
171 ab8500-regulators { 154 ab8500-regulators {
172 ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { 155 ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
173 regulator-name = "V-DISPLAY"; 156 regulator-name = "V-DISPLAY";
diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts
new file mode 100644
index 000000000000..2b1cb5b584b6
--- /dev/null
+++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts
@@ -0,0 +1,34 @@
1/*
2 * Copyright 2012 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 */
11
12/dts-v1/;
13#include "ste-hrefprev60.dtsi"
14#include "ste-href-stuib.dtsi"
15
16/ {
17 model = "ST-Ericsson HREF (pre-v60) and ST UIB";
18 compatible = "st-ericsson,mop500", "st-ericsson,u8500";
19
20 soc {
21 /* Reset line for the BU21013 touchscreen */
22 i2c@80110000 {
23 /* Only one of these will be used */
24 bu21013_tp@5c {
25 touch-gpio = <&gpio2 12 0x4>;
26 reset-gpio = <&tc3589x_gpio 13 0x4>;
27 };
28 bu21013_tp@5d {
29 touch-gpio = <&gpio2 12 0x4>;
30 reset-gpio = <&tc3589x_gpio 13 0x4>;
31 };
32 };
33 };
34};
diff --git a/arch/arm/boot/dts/ste-hrefprev60-tvk.dts b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts
new file mode 100644
index 000000000000..59523f866812
--- /dev/null
+++ b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts
@@ -0,0 +1,19 @@
1/*
2 * Copyright 2012 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 */
11
12/dts-v1/;
13#include "ste-hrefprev60.dtsi"
14#include "ste-href-tvk1281618.dtsi"
15
16/ {
17 model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";
18 compatible = "st-ericsson,mop500", "st-ericsson,u8500";
19};
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index d8d3b99ab007..b2cd7bc2752f 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dts
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -7,17 +7,14 @@
7 * 7 *
8 * http://www.opensource.org/licenses/gpl-license.html 8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 *
11 * Device Tree for the HREF+ prior to the v60 variant.
10 */ 12 */
11 13
12/dts-v1/;
13#include "ste-dbx5x0.dtsi" 14#include "ste-dbx5x0.dtsi"
14#include "ste-href.dtsi" 15#include "ste-href.dtsi"
15#include "ste-stuib.dtsi"
16 16
17/ { 17/ {
18 model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
19 compatible = "st-ericsson,mop500", "st-ericsson,u8500";
20
21 gpio_keys { 18 gpio_keys {
22 button@1 { 19 button@1 {
23 gpios = <&tc3589x_gpio 7 0x4>; 20 gpios = <&tc3589x_gpio 7 0x4>;
@@ -25,24 +22,30 @@
25 }; 22 };
26 23
27 soc { 24 soc {
28 prcmu@80157000 {
29 ab8500@5 {
30 ab8500-gpio {
31 compatible = "stericsson,ab8500-gpio";
32 };
33 };
34 };
35
36 i2c@80004000 { 25 i2c@80004000 {
37 tps61052@33 { 26 tps61052@33 {
38 compatible = "tps61052"; 27 compatible = "tps61052";
39 reg = <0x33>; 28 reg = <0x33>;
40 }; 29 };
41 };
42 30
43 i2c@80110000 { 31 tc3589x@42 {
44 bu21013_tp@5c { 32 compatible = "tc3589x";
45 reset-gpio = <&tc3589x_gpio 13 0x4>; 33 reg = <0x42>;
34 interrupt-parent = <&gpio6>;
35 interrupts = <25 IRQ_TYPE_EDGE_RISING>;
36
37 interrupt-controller;
38 #interrupt-cells = <2>;
39
40 tc3589x_gpio: tc3589x_gpio {
41 compatible = "tc3589x-gpio";
42 interrupts = <0 IRQ_TYPE_EDGE_RISING>;
43
44 interrupt-controller;
45 #interrupt-cells = <2>;
46 gpio-controller;
47 #gpio-cells = <2>;
48 };
46 }; 49 };
47 }; 50 };
48 51
diff --git a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
new file mode 100644
index 000000000000..8c6a2de56cf1
--- /dev/null
+++ b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
@@ -0,0 +1,36 @@
1/*
2 * Copyright 2012 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 *
11 * Device Tree for the HREF version 60 or later with the ST UIB
12 */
13
14/dts-v1/;
15#include "ste-hrefv60plus.dtsi"
16#include "ste-href-stuib.dtsi"
17
18/ {
19 model = "ST-Ericsson HREF (v60+) and ST UIB";
20 compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
21
22 soc {
23 /* Reset line for the BU21013 touchscreen */
24 i2c@80110000 {
25 /* Only one of these will be used */
26 bu21013_tp@5c {
27 touch-gpio = <&gpio2 20 0x4>;
28 reset-gpio = <&gpio4 17 0x4>;
29 };
30 bu21013_tp@5d {
31 touch-gpio = <&gpio2 20 0x4>;
32 reset-gpio = <&gpio4 17 0x4>;
33 };
34 };
35 };
36};
diff --git a/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
new file mode 100644
index 000000000000..d53cccdce776
--- /dev/null
+++ b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
@@ -0,0 +1,21 @@
1/*
2 * Copyright 2012 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 *
11 * Device Tree for the HREF version 60 or later with the TVK1281618 UIB
12 */
13
14/dts-v1/;
15#include "ste-hrefv60plus.dtsi"
16#include "ste-href-tvk1281618.dtsi"
17
18/ {
19 model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";
20 compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
21};
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index bb3cfc7280e8..aed511b47a9e 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dts
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -9,10 +9,8 @@
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 */ 10 */
11 11
12/dts-v1/;
13#include "ste-dbx5x0.dtsi" 12#include "ste-dbx5x0.dtsi"
14#include "ste-href.dtsi" 13#include "ste-href.dtsi"
15#include "ste-stuib.dtsi"
16 14
17/ { 15/ {
18 model = "ST-Ericsson HREF (v60+) platform with Device Tree"; 16 model = "ST-Ericsson HREF (v60+) platform with Device Tree";
@@ -20,17 +18,11 @@
20 18
21 gpio_keys { 19 gpio_keys {
22 button@1 { 20 button@1 {
23 gpios = <&gpio6 25 0x4>; 21 gpios = <&gpio5 25 0x4>;
24 }; 22 };
25 }; 23 };
26 24
27 soc { 25 soc {
28 i2c@80110000 {
29 bu21013_tp@0x5c {
30 reset-gpio = <&gpio4 15 0x4>;
31 };
32 };
33
34 // External Micro SD slot 26 // External Micro SD slot
35 sdi0_per1@80126000 { 27 sdi0_per1@80126000 {
36 arm,primecell-periphid = <0x10480180>; 28 arm,primecell-periphid = <0x10480180>;
@@ -40,7 +32,7 @@
40 mmc-cap-mmc-highspeed; 32 mmc-cap-mmc-highspeed;
41 vmmc-supply = <&ab8500_ldo_aux3_reg>; 33 vmmc-supply = <&ab8500_ldo_aux3_reg>;
42 34
43 cd-gpios = <&tc3589x_gpio 3 0x4>; 35 cd-gpios = <&gpio2 31 0x4>; // 95
44 36
45 status = "okay"; 37 status = "okay";
46 }; 38 };
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-27 17:32:06 -0400