diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-08 10:20:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-08 10:20:26 -0400 |
| commit | 04735a8fc45ba7c9f5b17d4837a0c649087b29e1 (patch) | |
| tree | 6f5d67f3e3dd5c75ab26986a21f7c82628f485fb /arch/arm | |
| parent | 089795090a627f4216c5f21eaf436ba1672cf02e (diff) | |
| parent | e3a96d974d642730ecf603d00c2ca00cfb4e8e99 (diff) | |
| download | u-boot-04735a8fc45ba7c9f5b17d4837a0c649087b29e1.tar.gz u-boot-04735a8fc45ba7c9f5b17d4837a0c649087b29e1.tar.xz u-boot-04735a8fc45ba7c9f5b17d4837a0c649087b29e1.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/exynos4210-trats.dts | 9 | ||||
| -rw-r--r-- | arch/arm/dts/exynos4412-odroid.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/exynos4412-trats2.dts | 18 |
3 files changed, 28 insertions, 1 deletions
diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts index 69c0605184..ac422e4fc4 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -23,6 +23,7 @@ console = "/serial@13820000"; mmc0 = "/sdhci@12510000"; mmc2 = "/sdhci@12530000"; + i2c8 = &i2c_fg; }; fimd@11c00000 { @@ -113,6 +114,14 @@ dwmmc@12550000 { status = "disabled"; }; + + i2c_fg: fuel-gauge { + compatible = "i2c-gpio"; + gpios = <&gpy4 1 0>, /* sda */ + <&gpy4 0 0>; /* scl */ + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + status = "okay"; + }; }; &i2c_5 { diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts index 188cb939bb..8710747e38 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -213,7 +213,7 @@ buck8_reg: BUCK8 { regulator-name = "VCC_P3V3_2.85V"; - regulator-min-microvolt = <2850000>; + regulator-min-microvolt = <750000>; regulator-max-microvolt = <3300000>; }; }; diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts index 1fbcf8914f..fd9e48c899 100644 --- a/arch/arm/dts/exynos4412-trats2.dts +++ b/arch/arm/dts/exynos4412-trats2.dts @@ -27,6 +27,8 @@ i2c5 = "/i2c@138b0000"; i2c6 = "/i2c@138c0000"; i2c7 = "/i2c@138d0000"; + i2c8 = &i2c_fg; + i2c9 = &i2c_max77693; serial0 = "/serial@13800000"; console = "/serial@13820000"; mmc0 = "/sdhci@12510000"; @@ -34,6 +36,22 @@ mshc0 = "/dwmmc@12550000"; }; + i2c_fg: fuel-gauge { + compatible = "i2c-gpio"; + gpios = <&gpf1 5 0>, /* sda */ + <&gpf1 4 0>; /* scl */ + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + status = "okay"; + }; + + i2c_max77693: max77693 { + compatible = "i2c-gpio"; + gpio = <&gpm2 0 0>, /* sda */ + <&gpm2 1 0>; /* scl */ + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + status = "okay"; + }; + i2c@138d0000 { samsung,i2c-sda-delay = <100>; samsung,i2c-slave-addr = <0x10>; |