| Message ID | 1423088075-10025-5-git-send-email-marek@goldelico.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Wed, Feb 04, 2015 at 11:14:33PM +0100, Marek Belisko wrote: > Signed-off-by: Marek Belisko <marek@goldelico.com> > --- > arch/arm/boot/dts/omap3-gta04.dtsi | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) DTS changes must go via omap-dt tree once the driver changes have been merged. -- Sebastian
* Sebastian Reichel <sre@kernel.org> [150304 16:41]: > Hi, > > On Wed, Feb 04, 2015 at 11:14:33PM +0100, Marek Belisko wrote: > > Signed-off-by: Marek Belisko <marek@goldelico.com> > > --- > > arch/arm/boot/dts/omap3-gta04.dtsi | 30 ++++++++++++++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > DTS changes must go via omap-dt tree once the driver changes have been > merged. And looks like you wanted to add ti, prefix to the binding. I'll mark this one as read, please repost this one separately once the driver changes are in Linux next. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tony, On Mon, Mar 16, 2015 at 9:35 PM, Tony Lindgren <tony@atomide.com> wrote: > * Sebastian Reichel <sre@kernel.org> [150304 16:41]: >> Hi, >> >> On Wed, Feb 04, 2015 at 11:14:33PM +0100, Marek Belisko wrote: >> > Signed-off-by: Marek Belisko <marek@goldelico.com> >> > --- >> > arch/arm/boot/dts/omap3-gta04.dtsi | 30 ++++++++++++++++++++++++++++++ >> > 1 file changed, 30 insertions(+) >> >> DTS changes must go via omap-dt tree once the driver changes have been >> merged. > > And looks like you wanted to add ti, prefix to the binding. I'll > mark this one as read, please repost this one separately once the > driver changes are in Linux next. ti prefix Iis done in v4 series already [1] > > Regards, > > Tony [1] - http://lkml.iu.edu/hypermail/linux/kernel/1503.1/02157.html BR, marek
* Belisko Marek <marek.belisko@gmail.com> [150316 13:47]: > Hi Tony, > > On Mon, Mar 16, 2015 at 9:35 PM, Tony Lindgren <tony@atomide.com> wrote: > > * Sebastian Reichel <sre@kernel.org> [150304 16:41]: > >> Hi, > >> > >> On Wed, Feb 04, 2015 at 11:14:33PM +0100, Marek Belisko wrote: > >> > Signed-off-by: Marek Belisko <marek@goldelico.com> > >> > --- > >> > arch/arm/boot/dts/omap3-gta04.dtsi | 30 ++++++++++++++++++++++++++++++ > >> > 1 file changed, 30 insertions(+) > >> > >> DTS changes must go via omap-dt tree once the driver changes have been > >> merged. > > > > And looks like you wanted to add ti, prefix to the binding. I'll > > mark this one as read, please repost this one separately once the > > driver changes are in Linux next. > ti prefix Iis done in v4 series already [1] > > > > Regards, > > > > Tony > > [1] - http://lkml.iu.edu/hypermail/linux/kernel/1503.1/02157.html OK will pick it from there thanks. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 655d6e9..f81ca27 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -49,6 +49,32 @@ ti,codec = <&twl_audio>; }; + battery { + compatible = "ti,twl4030-madc-battery"; + capacity-uah = <1200000>; + volt-to-capacity-charging-map = <4200 100>, + <4100 75>, + <4000 55>, + <3900 25>, + <3800 5>, + <3700 2>, + <3600 1>, + <3300 0>; + volt-to-capacity-discharging-map = <4200 100>, + <4100 95>, + <4000 70>, + <3800 50>, + <3700 10>, + <3600 5>, + <3300 0>; + io-channels = <&twl_madc 1>, + <&twl_madc 10>, + <&twl_madc 12>; + io-channel-names = "temp", + "ichg", + "vbat"; + }; + spi_lcd { compatible = "spi-gpio"; #address-cells = <0x1>; @@ -449,3 +475,7 @@ }; }; }; + +&twl_madc { + ti,system-uses-second-madc-irq; +};
Signed-off-by: Marek Belisko <marek@goldelico.com> --- arch/arm/boot/dts/omap3-gta04.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)