Commit be3a60a9 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ux500: Switch battery nodes to standard 



This force-converts the per-device battery node into the standard
properties using "simple-battery" for the HREF machines and the
corresponding Samsung battery for the mobile phones.

This is fine to do since the battery data in the DTS files has never
been deployed or used. In commit a1149ae9
"ARM: ux500: Disable Power Supply and Battery Management by default"
it was turned off and has not been switched back on since. In
the meantime standardized bindings for batteries have appeared
making the old AB8500 battery bindings obsolete.

The battery node which is now in the middle of an included file
is obviously a per-device piece of information so push this down
to each board. The HREF machines all have the same battery and can
share a single node in the HREF dtsi file.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 41b086b2

arch/arm/boot/dts/ste-ab8500.dtsi

+4 −9
Original line number Diff line number Diff line
@@ -129,11 +129,6 @@ ab8500_temp { 
					io-channel-names = "aux1", "aux2";

				};



				ab8500_battery: ab8500_battery {

					stericsson,battery-type = "LIPO";

					thermistor-on-batctrl;

				};



				ab8500_fg {

					compatible = "stericsson,ab8500-fg";

					interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
@@ -146,7 +141,7 @@ ab8500_fg { 
							  "LOW_BAT_F",

							  "CC_INT_CALIB",

							  "CCEOC";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

					io-channels = <&gpadc 0x08>;

					io-channel-names = "main_bat_v";

				};
@@ -163,7 +158,7 @@ ab8500_btemp { 
							  "BTEMP_HIGH",

							  "BTEMP_LOW_MEDIUM",

							  "BTEMP_MEDIUM_HIGH";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

					io-channels = <&gpadc 0x02>,

						      <&gpadc 0x01>;

					io-channel-names = "btemp_ball",
@@ -200,7 +195,7 @@ ab8500_charger { 
							  "VBUS_OVV",

							  "CH_WD_EXP",

							  "VBUS_CH_DROP_END";

					battery		= <&ab8500_battery>;

					monitored-battery = <&battery>;

					vddadc-supply	= <&ab8500_ldo_tvout_reg>;

					io-channels = <&gpadc 0x03>,

						      <&gpadc 0x0a>,
@@ -214,7 +209,7 @@ ab8500_charger { 


				ab8500_chargalg {

					compatible	= "stericsson,ab8500-chargalg";

					battery		= <&ab8500_battery>;

					monitored-battery	= <&battery>;

				};



				ab8500_usb: ab8500_usb {

arch/arm/boot/dts/ste-ab8505.dtsi

+4 −9
Original line number Diff line number Diff line
@@ -92,11 +92,6 @@ usb_id: channel@e { 
					};

				};



				ab8500_battery: ab8500_battery {

					stericsson,battery-type = "LIPO";

					thermistor-on-batctrl;

				};



				ab8500_fg {

					status = "disabled";

					compatible = "stericsson,ab8500-fg";
@@ -110,7 +105,7 @@ ab8500_fg { 
							  "LOW_BAT_F",

							  "CC_INT_CALIB",

							  "CCEOC";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

					io-channels = <&gpadc 0x08>;

					io-channel-names = "main_bat_v";

				};
@@ -128,7 +123,7 @@ ab8500_btemp { 
							  "BTEMP_HIGH",

							  "BTEMP_LOW_MEDIUM",

							  "BTEMP_MEDIUM_HIGH";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

					io-channels = <&gpadc 0x02>,

						      <&gpadc 0x01>;

					io-channel-names = "btemp_ball",
@@ -166,7 +161,7 @@ ab8500_charger { 
							  "VBUS_OVV",

							  "CH_WD_EXP",

							  "VBUS_CH_DROP_END";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

					vddadc-supply = <&ab8500_ldo_adc_reg>;

					io-channels = <&gpadc 0x09>,

						      <&gpadc 0x0b>;
@@ -177,7 +172,7 @@ ab8500_charger { 
				ab8500_chargalg {

					status = "disabled";

					compatible = "stericsson,ab8500-chargalg";

					battery = <&ab8500_battery>;

					monitored-battery = <&battery>;

				};



				ab8500_usb: ab8500_usb {

arch/arm/boot/dts/ste-href.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ memory { 
		reg = <0x00000000 0x20000000>;

	};



	battery: battery {

		compatible = "simple-battery";

		battery-type = "lithium-ion-polymer";

		thermistor-on-batctrl;

	};



	soc {

		uart@80120000 {

			pinctrl-names = "default", "sleep";

arch/arm/boot/dts/ste-snowball.dts

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ memory { 
		reg = <0x00000000 0x20000000>;

	};



	battery: battery {

		compatible = "simple-battery";

		battery-type = "lithium-ion-polymer";

		thermistor-on-batctrl;

	};



	en_3v3_reg: en_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "en-3v3-fixed-supply";

arch/arm/boot/dts/ste-ux500-samsung-codina.dts

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ chosen { 
		stdout-path = &serial2;

	};



	battery: battery {

		compatible = "samsung,eb425161lu";

	};



	/* TI TXS0206 level translator for 2.9 V */

	sd_level_translator: regulator-gpio {

		compatible = "regulator-fixed";