diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-02 19:53:35 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-02 19:53:35 +0400 |
| commit | 04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491 (patch) | |
| tree | 062e082e19ab94a4ca7bc60286df970debdd2d6f /arch/arm/boot/dts/exynos4412-odroid-common.dtsi | |
| parent | 9810f5370b6e60c4b564f294feb51761f0e741f6 (diff) | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
| download | linux-04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491.tar.xz | |
Merge tag 'v3.17-rc4' into asoc-simple
Linux 3.17-rc4
Diffstat (limited to 'arch/arm/boot/dts/exynos4412-odroid-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 6d6d23c83d30..adadaf97ac01 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -134,6 +134,8 @@ i2c@13860000 { pinctrl-0 = <&i2c0_bus>; pinctrl-names = "default"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <400000>; status = "okay"; usb3503: usb3503@08 { @@ -148,6 +150,10 @@ max77686: pmic@09 { compatible = "maxim,max77686"; + interrupt-parent = <&gpx3>; + interrupts = <2 0>; + pinctrl-names = "default"; + pinctrl-0 = <&max77686_irq>; reg = <0x09>; #clock-cells = <1>; @@ -368,4 +374,11 @@ samsung,pins = "gpx1-3"; samsung,pin-pud = <0>; }; + + max77686_irq: max77686-irq { + samsung,pins = "gpx3-2"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; }; |