Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: s5pv210: Add support for more devices present on Aries

This commit enables following devices present on Aries based phones:
- pwm-vibrator attached to PWM 1
- poweroff support
- Atmel maXTouch touchscreen, connected to I2C-2
- Broadcom BCM4329 Bluetooth over UART-0

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

authored by

Jonathan Bakker and committed by
Krzysztof Kozlowski
c7985d8c 657846f7

+68
+68
arch/arm/boot/dts/s5pv210-aries.dtsi
··· 41 41 }; 42 42 }; 43 43 44 + vibrator_pwr: regulator-fixed-0 { 45 + compatible = "regulator-fixed"; 46 + regulator-name = "vibrator-en"; 47 + enable-active-high; 48 + gpio = <&gpj1 1 GPIO_ACTIVE_HIGH>; 49 + }; 50 + 44 51 wifi_pwrseq: wifi-pwrseq { 45 52 compatible = "mmc-pwrseq-simple"; 46 53 reset-gpios = <&gpg1 2 GPIO_ACTIVE_LOW>; ··· 321 314 reg = <0x36>; 322 315 }; 323 316 }; 317 + 318 + vibrator: pwm-vibrator { 319 + compatible = "pwm-vibrator"; 320 + pwms = <&pwm 1 44642 0>; 321 + pwm-names = "enable"; 322 + vcc-supply = <&vibrator_pwr>; 323 + pinctrl-names = "default"; 324 + pinctrl-0 = <&pwm1_out>; 325 + }; 326 + 327 + poweroff: syscon-poweroff { 328 + compatible = "syscon-poweroff"; 329 + regmap = <&pmu_syscon>; 330 + offset = <0x681c>; /* PS_HOLD_CONTROL */ 331 + value = <0x5200>; 332 + }; 324 333 }; 325 334 326 335 &fimd { ··· 370 347 status = "okay"; 371 348 }; 372 349 350 + &i2c2 { 351 + samsung,i2c-sda-delay = <100>; 352 + samsung,i2c-max-bus-freq = <400000>; 353 + samsung,i2c-slave-addr = <0x10>; 354 + status = "okay"; 355 + 356 + touchscreen@4a { 357 + compatible = "atmel,maxtouch"; 358 + reg = <0x4a>; 359 + interrupt-parent = <&gpj0>; 360 + interrupts = <5 IRQ_TYPE_EDGE_FALLING>; 361 + pinctrl-names = "default"; 362 + pinctrl-0 = <&ts_irq>; 363 + reset-gpios = <&gpj1 3 GPIO_ACTIVE_HIGH>; 364 + }; 365 + }; 366 + 373 367 &mfc { 374 368 memory-region = <&mfc_left>, <&mfc_right>; 375 369 }; ··· 412 372 samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 413 373 }; 414 374 375 + bt_host_wake: bt-host-wake { 376 + samsung,pins = "gph2-5"; 377 + samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; 378 + samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>; 379 + samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 380 + }; 381 + 415 382 tf_detect: tf-detect { 416 383 samsung,pins = "gph3-4"; 417 384 samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; ··· 431 384 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; 432 385 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 433 386 }; 387 + 388 + ts_irq: ts-irq { 389 + samsung,pins = "gpj0-5"; 390 + samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; 391 + samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; 392 + samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; 393 + }; 394 + }; 395 + 396 + &pwm { 397 + samsung,pwm-outputs = <1>; 434 398 }; 435 399 436 400 &sdhci1 { ··· 479 421 480 422 &uart0 { 481 423 status = "okay"; 424 + 425 + bluetooth { 426 + compatible = "brcm,bcm43438-bt"; 427 + max-speed = <115200>; 428 + pinctrl-names = "default"; 429 + pinctrl-0 = <&uart0_data &uart0_fctl &bt_host_wake>; 430 + shutdown-gpios = <&gpb 3 GPIO_ACTIVE_HIGH>; 431 + device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>; 432 + host-wakeup-gpios = <&gph2 5 GPIO_ACTIVE_HIGH>; 433 + }; 482 434 }; 483 435 484 436 &uart1 {