From: Todd Broch Date: Thu, 21 Feb 2013 15:44:40 +0000 (-0800) Subject: CHROMIUM: exynos: dts: Move TPS65090 to per board configs. X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=36c592b91a97c924bbdef7adcd72c0277babc9e7;p=cascardo%2Flinux.git CHROMIUM: exynos: dts: Move TPS65090 to per board configs. Move the TPS65090 specification from the common cros5250 to each board. This will allow for spring to place TPS65090 behind the EC. BUG=chrome-os-partner:17813 TEST=manual, 1. Boot kernel, login as root 2a. On Snow see regulators still enumerated in sysfs, cat /sys/devices/s3c2440-i2c.4/i2c-4/4-0048/tps65090-regulator/regulator/regulator.*/name 2b. On Spring device still functions but devices are NOT in sysfs Signed-off-by: Todd Broch Change-Id: I9837062a851b677c3c8844e6b6503450aa4ed555 Reviewed-on: https://gerrit.chromium.org/gerrit/43718 Reviewed-by: Vincent Palatin --- diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index a43f7f2d5ef6..47e3efe41719 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -264,73 +264,6 @@ gpios = <&gpa2 0 3 3 0>, <&gpa2 1 3 3 0>; - power-regulator { - compatible = "ti,tps65090"; - reg = <0x48>; - interrupts = <22 0>; - interrupt-parent = <&wakeup_eint>; - no-ack-irq; - - voltage-regulators { - VFET1 { - tps65090-control-reg-offset = <15>; - tps65090-overcurrent-wait = <3>; - regulator-name = "vcd_led"; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - VFET2 { - tps65090-control-reg-offset = <16>; - tps65090-overcurrent-wait = <3>; - regulator-name = "video_mid"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - }; - VFET3 { - tps65090-control-reg-offset = <17>; - tps65090-overcurrent-wait = <3>; - regulator-name = "wwan_r"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - VFET4 { - tps65090-control-reg-offset = <18>; - tps65090-overcurrent-wait = <3>; - regulator-name = "sdcard"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - VFET5 { - tps65090-control-reg-offset = <19>; - tps65090-overcurrent-wait = <3>; - regulator-name = "camout"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - VFET6 { - tps65090-control-reg-offset = <20>; - tps65090-overcurrent-wait = <3>; - regulator-name = "lcd_vdd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - VFET7 { - tps65090-control-reg-offset = <21>; - tps65090-overcurrent-wait = <3>; - regulator-name = "ts"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - VBAT: charger { - tps65090-control-reg-offset = <4>; - regulator-name = "vinchg"; - }; - }; - }; - ec: chromeos-ec@0 { compatible = "google,chromeos-ec-i2c"; reg = <0x1e>; diff --git a/arch/arm/boot/dts/exynos5250-daisy.dts b/arch/arm/boot/dts/exynos5250-daisy.dts index 9eed1a428881..d321aa502e1d 100644 --- a/arch/arm/boot/dts/exynos5250-daisy.dts +++ b/arch/arm/boot/dts/exynos5250-daisy.dts @@ -59,6 +59,75 @@ }; }; + i2c@12CA0000 { + power-regulator { + compatible = "ti,tps65090"; + reg = <0x48>; + interrupts = <22 0>; + interrupt-parent = <&wakeup_eint>; + no-ack-irq; + + voltage-regulators { + VFET1 { + tps65090-control-reg-offset = <15>; + tps65090-overcurrent-wait = <3>; + regulator-name = "vcd_led"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + VFET2 { + tps65090-control-reg-offset = <16>; + tps65090-overcurrent-wait = <3>; + regulator-name = "video_mid"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + VFET3 { + tps65090-control-reg-offset = <17>; + tps65090-overcurrent-wait = <3>; + regulator-name = "wwan_r"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + VFET4 { + tps65090-control-reg-offset = <18>; + tps65090-overcurrent-wait = <3>; + regulator-name = "sdcard"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + VFET5 { + tps65090-control-reg-offset = <19>; + tps65090-overcurrent-wait = <3>; + regulator-name = "camout"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + VFET6 { + tps65090-control-reg-offset = <20>; + tps65090-overcurrent-wait = <3>; + regulator-name = "lcd_vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + VFET7 { + tps65090-control-reg-offset = <21>; + tps65090-overcurrent-wait = <3>; + regulator-name = "ts"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + VBAT: charger { + tps65090-control-reg-offset = <4>; + regulator-name = "vinchg"; + }; + }; + }; + }; + i2c@12CD0000 { codec { compatible = "maxim,max98095"; diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 83ea0356d4b5..2bafa289730d 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -55,7 +55,75 @@ samsung,wait-free-us = <500000>; samsung,arbitration-gpios = <&gpf0 3 1 0 0>, <&gpe0 4 0 3 0>; + + power-regulator { + compatible = "ti,tps65090"; + reg = <0x48>; + interrupts = <22 0>; + interrupt-parent = <&wakeup_eint>; + no-ack-irq; + + voltage-regulators { + VFET1 { + tps65090-control-reg-offset = <15>; + tps65090-overcurrent-wait = <3>; + regulator-name = "vcd_led"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + VFET2 { + tps65090-control-reg-offset = <16>; + tps65090-overcurrent-wait = <3>; + regulator-name = "video_mid"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + VFET3 { + tps65090-control-reg-offset = <17>; + tps65090-overcurrent-wait = <3>; + regulator-name = "wwan_r"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + VFET4 { + tps65090-control-reg-offset = <18>; + tps65090-overcurrent-wait = <3>; + regulator-name = "sdcard"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + VFET5 { + tps65090-control-reg-offset = <19>; + tps65090-overcurrent-wait = <3>; + regulator-name = "camout"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + VFET6 { + tps65090-control-reg-offset = <20>; + tps65090-overcurrent-wait = <3>; + regulator-name = "lcd_vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + VFET7 { + tps65090-control-reg-offset = <21>; + tps65090-overcurrent-wait = <3>; + regulator-name = "ts"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + VBAT: charger { + tps65090-control-reg-offset = <4>; + regulator-name = "vinchg"; + }; + }; + }; }; + i2c@12CD0000 { ptn3460-bridge@20 { compatible = "nxp,ptn3460";