diff options
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/highbank.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-dreamplug.dts | 25 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 26 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/testcases/tests-phandle.dtsi | 2 |
8 files changed, 70 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts index 305635bd45c0..37c0ff9c8b90 100644 --- a/arch/arm/boot/dts/highbank.dts +++ b/arch/arm/boot/dts/highbank.dts | |||
@@ -72,15 +72,15 @@ | |||
72 | ranges; | 72 | ranges; |
73 | 73 | ||
74 | timer@fff10600 { | 74 | timer@fff10600 { |
75 | compatible = "arm,smp-twd"; | 75 | compatible = "arm,cortex-a9-twd-timer"; |
76 | reg = <0xfff10600 0x20>; | 76 | reg = <0xfff10600 0x20>; |
77 | interrupts = <1 13 0xf04>; | 77 | interrupts = <1 13 0xf01>; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | watchdog@fff10620 { | 80 | watchdog@fff10620 { |
81 | compatible = "arm,cortex-a9-wdt"; | 81 | compatible = "arm,cortex-a9-twd-wdt"; |
82 | reg = <0xfff10620 0x20>; | 82 | reg = <0xfff10620 0x20>; |
83 | interrupts = <1 14 0xf04>; | 83 | interrupts = <1 14 0xf01>; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | intc: interrupt-controller@fff11000 { | 86 | intc: interrupt-controller@fff11000 { |
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 263e8f3664b5..4905f51a106f 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi | |||
@@ -88,9 +88,9 @@ | |||
88 | ranges; | 88 | ranges; |
89 | 89 | ||
90 | timer@00a00600 { | 90 | timer@00a00600 { |
91 | compatible = "arm,smp-twd"; | 91 | compatible = "arm,cortex-a9-twd-timer"; |
92 | reg = <0x00a00600 0x100>; | 92 | reg = <0x00a00600 0x20>; |
93 | interrupts = <1 13 0xf4>; | 93 | interrupts = <1 13 0xf01>; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | L2: l2-cache@00a02000 { | 96 | L2: l2-cache@00a02000 { |
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts new file mode 100644 index 000000000000..8a5dff807b45 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -0,0 +1,25 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | /include/ "kirkwood.dtsi" | ||
4 | |||
5 | / { | ||
6 | model = "Globalscale Technologies Dreamplug"; | ||
7 | compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | ||
8 | |||
9 | memory { | ||
10 | device_type = "memory"; | ||
11 | reg = <0x00000000 0x20000000>; | ||
12 | }; | ||
13 | |||
14 | chosen { | ||
15 | bootargs = "console=ttyS0,115200n8 earlyprintk"; | ||
16 | }; | ||
17 | |||
18 | serial@f1012000 { | ||
19 | compatible = "ns16550a"; | ||
20 | reg = <0xf1012000 0xff>; | ||
21 | reg-shift = <2>; | ||
22 | interrupts = <33>; | ||
23 | clock-frequency = <200000000>; | ||
24 | }; | ||
25 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi new file mode 100644 index 000000000000..771c6bbeb29a --- /dev/null +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
@@ -0,0 +1,6 @@ | |||
1 | /include/ "skeleton.dtsi" | ||
2 | |||
3 | / { | ||
4 | compatible = "marvell,kirkwood"; | ||
5 | }; | ||
6 | |||
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 3c1ff5a43fb7..6c02abb469d4 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts | |||
@@ -42,6 +42,11 @@ | |||
42 | 42 | ||
43 | i2c@7000d000 { | 43 | i2c@7000d000 { |
44 | clock-frequency = <400000>; | 44 | clock-frequency = <400000>; |
45 | |||
46 | adt7461@4c { | ||
47 | compatible = "adi,adt7461"; | ||
48 | reg = <0x4c>; | ||
49 | }; | ||
45 | }; | 50 | }; |
46 | 51 | ||
47 | i2s@70002a00 { | 52 | i2s@70002a00 { |
@@ -105,4 +110,25 @@ | |||
105 | sdhci@c8000600 { | 110 | sdhci@c8000600 { |
106 | support-8bit; | 111 | support-8bit; |
107 | }; | 112 | }; |
113 | |||
114 | gpio-keys { | ||
115 | compatible = "gpio-keys"; | ||
116 | |||
117 | power { | ||
118 | label = "Power"; | ||
119 | gpios = <&gpio 79 1>; /* gpio PJ7, active low */ | ||
120 | linux,code = <116>; /* KEY_POWER */ | ||
121 | gpio-key,wakeup; | ||
122 | }; | ||
123 | }; | ||
124 | |||
125 | gpio-leds { | ||
126 | compatible = "gpio-leds"; | ||
127 | |||
128 | wifi { | ||
129 | label = "wifi-led"; | ||
130 | gpios = <&gpio 24 0>; | ||
131 | linux,default-trigger = "rfkill0"; | ||
132 | }; | ||
133 | }; | ||
108 | }; | 134 | }; |
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index d2bc7e7ad06d..aff8a175aa40 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -107,6 +107,8 @@ | |||
107 | 0 89 0x04 >; | 107 | 0 89 0x04 >; |
108 | #gpio-cells = <2>; | 108 | #gpio-cells = <2>; |
109 | gpio-controller; | 109 | gpio-controller; |
110 | #interrupt-cells = <2>; | ||
111 | interrupt-controller; | ||
110 | }; | 112 | }; |
111 | 113 | ||
112 | pinmux: pinmux@70000000 { | 114 | pinmux: pinmux@70000000 { |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index e957051f8645..62a7b39f1c9a 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
@@ -115,6 +115,8 @@ | |||
115 | 0 125 0x04 >; | 115 | 0 125 0x04 >; |
116 | #gpio-cells = <2>; | 116 | #gpio-cells = <2>; |
117 | gpio-controller; | 117 | gpio-controller; |
118 | #interrupt-cells = <2>; | ||
119 | interrupt-controller; | ||
118 | }; | 120 | }; |
119 | 121 | ||
120 | serial@70006000 { | 122 | serial@70006000 { |
diff --git a/arch/arm/boot/dts/testcases/tests-phandle.dtsi b/arch/arm/boot/dts/testcases/tests-phandle.dtsi index ec0c4e6212c9..0007d3cd7dc2 100644 --- a/arch/arm/boot/dts/testcases/tests-phandle.dtsi +++ b/arch/arm/boot/dts/testcases/tests-phandle.dtsi | |||
@@ -31,6 +31,8 @@ | |||
31 | phandle-list-bad-phandle = <12345678 0 0>; | 31 | phandle-list-bad-phandle = <12345678 0 0>; |
32 | phandle-list-bad-args = <&provider2 1 0>, | 32 | phandle-list-bad-args = <&provider2 1 0>, |
33 | <&provider3 0>; | 33 | <&provider3 0>; |
34 | empty-property; | ||
35 | unterminated-string = [40 41 42 43]; | ||
34 | }; | 36 | }; |
35 | }; | 37 | }; |
36 | }; | 38 | }; |