diff options
-rw-r--r-- | arch/arm/boot/dts/tegra-cardhu.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 41 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 24 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 8 |
4 files changed, 67 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts index ab8d901b5ab6..facb950c4bec 100644 --- a/arch/arm/boot/dts/tegra-cardhu.dts +++ b/arch/arm/boot/dts/tegra-cardhu.dts | |||
@@ -93,6 +93,14 @@ | |||
93 | 93 | ||
94 | i2c@7000c500 { | 94 | i2c@7000c500 { |
95 | clock-frequency = <100000>; | 95 | clock-frequency = <100000>; |
96 | |||
97 | /* ALS and Proximity sensor */ | ||
98 | isl29028@44 { | ||
99 | compatible = "isil,isl29028"; | ||
100 | reg = <0x44>; | ||
101 | interrupt-parent = <&gpio>; | ||
102 | interrupts = <88 0x04>; /*gpio PL0 */ | ||
103 | }; | ||
96 | }; | 104 | }; |
97 | 105 | ||
98 | i2c@7000c700 { | 106 | i2c@7000c700 { |
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index ed0a2f5bf918..c4d171ec9ee4 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts | |||
@@ -100,7 +100,7 @@ | |||
100 | }; | 100 | }; |
101 | hdint { | 101 | hdint { |
102 | nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1", | 102 | nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1", |
103 | "lsck", "lsda", "pta"; | 103 | "lsck", "lsda"; |
104 | nvidia,function = "hdmi"; | 104 | nvidia,function = "hdmi"; |
105 | }; | 105 | }; |
106 | i2cp { | 106 | i2cp { |
@@ -134,6 +134,10 @@ | |||
134 | nvidia,pins = "pmc"; | 134 | nvidia,pins = "pmc"; |
135 | nvidia,function = "pwr_on"; | 135 | nvidia,function = "pwr_on"; |
136 | }; | 136 | }; |
137 | pta { | ||
138 | nvidia,pins = "pta"; | ||
139 | nvidia,function = "i2c2"; | ||
140 | }; | ||
137 | rm { | 141 | rm { |
138 | nvidia,pins = "rm"; | 142 | nvidia,pins = "rm"; |
139 | nvidia,function = "i2c1"; | 143 | nvidia,function = "i2c1"; |
@@ -270,10 +274,32 @@ | |||
270 | micdet-delay = <100>; | 274 | micdet-delay = <100>; |
271 | gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >; | 275 | gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >; |
272 | }; | 276 | }; |
277 | |||
278 | /* ALS and proximity sensor */ | ||
279 | isl29018@44 { | ||
280 | compatible = "isil,isl29018"; | ||
281 | reg = <0x44>; | ||
282 | interrupt-parent = <&gpio>; | ||
283 | interrupts = < 202 0x04 >; /* GPIO PZ2 */ | ||
284 | }; | ||
285 | |||
286 | gyrometer@68 { | ||
287 | compatible = "invn,mpu3050"; | ||
288 | reg = <0x68>; | ||
289 | interrupt-parent = <&gpio>; | ||
290 | interrupts = <204 0x04>; /* gpio PZ4 */ | ||
291 | }; | ||
273 | }; | 292 | }; |
274 | 293 | ||
275 | i2c@7000c400 { | 294 | i2c@7000c400 { |
276 | clock-frequency = <400000>; | 295 | clock-frequency = <100000>; |
296 | |||
297 | smart-battery@b { | ||
298 | compatible = "ti,bq20z75", "smart-battery-1.1"; | ||
299 | reg = <0xb>; | ||
300 | ti,i2c-retry-count = <2>; | ||
301 | ti,poll-retry-count = <10>; | ||
302 | }; | ||
277 | }; | 303 | }; |
278 | 304 | ||
279 | i2c@7000c500 { | 305 | i2c@7000c500 { |
@@ -283,10 +309,17 @@ | |||
283 | i2c@7000d000 { | 309 | i2c@7000d000 { |
284 | clock-frequency = <400000>; | 310 | clock-frequency = <400000>; |
285 | 311 | ||
286 | adt7461@4c { | 312 | temperature-sensor@4c { |
287 | compatible = "adt7461"; | 313 | compatible = "nct1008"; |
288 | reg = <0x4c>; | 314 | reg = <0x4c>; |
289 | }; | 315 | }; |
316 | |||
317 | magnetometer@c { | ||
318 | compatible = "ak8975"; | ||
319 | reg = <0xc>; | ||
320 | interrupt-parent = <&gpio>; | ||
321 | interrupts = <109 0x04>; /* gpio PN5 */ | ||
322 | }; | ||
290 | }; | 323 | }; |
291 | 324 | ||
292 | i2s@70002a00 { | 325 | i2s@70002a00 { |
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index e4fcf9a8178a..ead93657dd06 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts | |||
@@ -250,13 +250,19 @@ | |||
250 | 250 | ||
251 | i2c@7000c500 { | 251 | i2c@7000c500 { |
252 | clock-frequency = <400000>; | 252 | clock-frequency = <400000>; |
253 | }; | ||
254 | 253 | ||
255 | i2c@7000d000 { | 254 | codec: codec@1a { |
256 | status = "disable"; | 255 | compatible = "ti,tlv320aic23"; |
256 | reg = <0x1a>; | ||
257 | }; | ||
258 | |||
259 | rtc@56 { | ||
260 | compatible = "emmicro,em3027"; | ||
261 | reg = <0x56>; | ||
262 | }; | ||
257 | }; | 263 | }; |
258 | 264 | ||
259 | i2s@70002800 { | 265 | i2c@7000d000 { |
260 | status = "disable"; | 266 | status = "disable"; |
261 | }; | 267 | }; |
262 | 268 | ||
@@ -264,8 +270,10 @@ | |||
264 | status = "disable"; | 270 | status = "disable"; |
265 | }; | 271 | }; |
266 | 272 | ||
267 | das@70000c00 { | 273 | sound { |
268 | status = "disable"; | 274 | compatible = "nvidia,tegra-audio-trimslice"; |
275 | nvidia,i2s-controller = <&tegra_i2s1>; | ||
276 | nvidia,audio-codec = <&codec>; | ||
269 | }; | 277 | }; |
270 | 278 | ||
271 | serial@70006000 { | 279 | serial@70006000 { |
@@ -288,10 +296,6 @@ | |||
288 | status = "disable"; | 296 | status = "disable"; |
289 | }; | 297 | }; |
290 | 298 | ||
291 | sdhci@c8000000 { | ||
292 | status = "disable"; | ||
293 | }; | ||
294 | |||
295 | sdhci@c8000200 { | 299 | sdhci@c8000200 { |
296 | status = "disable"; | 300 | status = "disable"; |
297 | }; | 301 | }; |
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index bd074cfb338f..c20d5e93f9c9 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts | |||
@@ -256,6 +256,14 @@ | |||
256 | micdet-delay = <100>; | 256 | micdet-delay = <100>; |
257 | gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >; | 257 | gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >; |
258 | }; | 258 | }; |
259 | |||
260 | /* ALS and proximity sensor */ | ||
261 | isl29018@44 { | ||
262 | compatible = "isil,isl29018"; | ||
263 | reg = <0x44>; | ||
264 | interrupt-parent = <&gpio>; | ||
265 | interrupts = <202 0x04>; /*gpio PZ2 */ | ||
266 | }; | ||
259 | }; | 267 | }; |
260 | 268 | ||
261 | i2c@7000c400 { | 269 | i2c@7000c400 { |