power: bq2419x:add vendor id to charger parameters

add vendor name prefix ti to the BQ2491x charger
driver platform data parameters.
Update the binding doc and all the dts files
accordingly.

Change-Id: I61097c80cdfa4e6b6cfd98fc63b8c13c96d09cf9
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/362738
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/Documentation/devicetree/bindings/power/bq2419x-charger.txt b/Documentation/devicetree/bindings/power/bq2419x-charger.txt
index a806a7b2af61f1632d7098c5e89a63c7c831124c..52cfaa124dcd782e1099d6d0c1d6a24ccb27e672 100644 (file)
--- a/Documentation/devicetree/bindings/power/bq2419x-charger.txt
+++ b/Documentation/devicetree/bindings/power/bq2419x-charger.txt
@@ -34,20 +34,20 @@ There is two optional subnodes, vbus and charger.
 
 vbus properties:
 ================
-otg-iusb-gpio-isub-gpio: The GPIO which is connected to OTG/IUSB pin.
+otg-iusb-gpio: The GPIO which is connected to OTG/IUSB pin.
 
 
 Example
 bq2419x: bq2419x@6b {
        compatible = "ti,bq2419x";
        reg = <0x6b>;
-       charging-term-current-mA = <100>;
+       ti,charging-term-current-mA = <100>;
        charger {
                        regulator-name = "batt_regulator";
                        regulator-max-microamp = <3000>;
-                       watchdog-timeout = <40>;
-                       rtc-alarm-time = <3600>;
-                       auto-recharge-time = <1800>;
+                       ti,watchdog-timeout = <40>;
+                       ti,rtc-alarm-time = <3600>;
+                       ti,auto-recharge-time = <1800>;
                        consumers {
                                c1 {
                                        regulator-consumer-supply = "usb_bat_chg";

diff --git a/arch/arm/boot/dts/tegra124-loki.dts b/arch/arm/boot/dts/tegra124-loki.dts
index 026e5c285c45c3297d93a36a01342511ccf5c177..20e75691460ddebeaf189e9645611b9d25c64869 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki.dts
+++ b/arch/arm/boot/dts/tegra124-loki.dts
@@ -47,11 +47,11 @@
                        reg = <0x6b>;
                        interrupt-parent = <&gpio>;
                        interrupts = <72 0x0>;
-                       charging-term-current-mA = <100>;
+                       ti,charging-term-current-mA = <100>;
 
                        vbus {
                                regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               ti,otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_vbus";
@@ -68,9 +68,9 @@
                        charger {
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                ti,temp-polling-time-sec = <5>;
                                ti,disbale-suspend-during-charging;
                                ti,pre-charge-current-limit-milliamp = <768>;

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-p1761-battery.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-p1761-battery.dtsi
index 0859f1be49f371e8963779d32180a8103fc73d2f..05ca0486fdac79ebb03b4e8db3aeccd0080b3b9c 100644 (file)
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-p1761-battery.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-p1761-battery.dtsi
@@ -40,9 +40,9 @@
                        charger {
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_bat_chg";

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1736-pmic.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1736-pmic.dtsi
index a875cff4ff125a8a907e86540c0f446c4b3105d0..e875559ec58ba77746f5be9a870883fe088cb1e9 100644 (file)
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1736-pmic.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1736-pmic.dtsi
@@ -828,9 +828,9 @@
                                status = "disabled";
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_bat_chg";
@@ -841,7 +841,7 @@
 
                        vbus {
                                regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               ti,otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_vbus";

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1769-pmic.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1769-pmic.dtsi
index beaa6db3b0a1ec2f7cf22ee417c4112fe36bada0..e4a0ef24e1643a1d1598ce41efb125711c02e412 100644 (file)
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1769-pmic.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1769-pmic.dtsi
@@ -799,9 +799,9 @@
                                status = "disabled";
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_bat_chg";
@@ -812,7 +812,7 @@
 
                        vbus {
                                regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               ti,otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_vbus";

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-pmic.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-pmic.dtsi
index 9b3c4c817dfdc12ec2ba9f2f3146341551218a72..bd63999ef239a2d4868652189004306b7c17619d 100644 (file)
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-pmic.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-pmic.dtsi
@@ -661,9 +661,9 @@
                                status = "disabled";
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb _bat_chg";
@@ -674,7 +674,7 @@
 
                        vbus {
                                regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               ti,otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_vbus";

diff --git a/arch/arm/boot/dts/tegra124-thor195.dts b/arch/arm/boot/dts/tegra124-thor195.dts
index 2d490f2d886147f428fd4a75a3898c989c6c1938..ded313553078e64e6a010d6962b79eb4d3849e3d 100644 (file)
--- a/arch/arm/boot/dts/tegra124-thor195.dts
+++ b/arch/arm/boot/dts/tegra124-thor195.dts
@@ -44,11 +44,11 @@
                        reg = <0x6b>;
                        interrupt-parent = <&gpio>;
                        interrupts = <72 0x0>;
-                       charging-term-current-mA = <100>;
+                       ti,charging-term-current-mA = <100>;
 
                        vbus {
                                regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               ti,otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_vbus";
@@ -65,9 +65,9 @@
                        charger {
                                regulator-name = "batt_regulator";
                                regulator-max-microamp = <3000000>;
-                               watchdog-timeout = <40>;
-                               rtc-alarm-time = <3600>;
-                               auto-recharge-time = <1800>;
+                               ti,watchdog-timeout = <40>;
+                               ti,rtc-alarm-time = <3600>;
+                               ti,auto-recharge-time = <1800>;
                                consumers {
                                        c1 {
                                                regulator-consumer-supply = "usb_bat_chg";

diff --git a/drivers/power/bq2419x-charger.c b/drivers/power/bq2419x-charger.c
index 8e2b2768a02e3fc85386cf53d3ee845f6016e352..594f55be2ada5dbfe3c2e387a93b8c2f84d8450b 100644 (file)
--- a/drivers/power/bq2419x-charger.c
+++ b/drivers/power/bq2419x-charger.c
@@ -1260,12 +1260,12 @@ static struct bq2419x_platform_data *bq2419x_dt_parse(struct i2c_client *client)
                                "ti,disbale-suspend-during-charging");
 
                ret = of_property_read_u32(batt_reg_node,
-                               "watchdog-timeout", &wdt_timeout);
+                               "ti,watchdog-timeout", &wdt_timeout);
                if (!ret)
                        pdata->bcharger_pdata->wdt_timeout = wdt_timeout;
 
                ret = of_property_read_u32(batt_reg_node,
-                               "auto-recharge-time", &chg_restart_time);
+                               "ti,auto-recharge-time", &chg_restart_time);
                if (!ret)
                        pdata->bcharger_pdata->chg_restart_time =
                                                        chg_restart_time;
@@ -1307,7 +1307,7 @@ vbus_node:
                                vbus_init_data->num_consumer_supplies;
                pdata->vbus_pdata->gpio_otg_iusb =
                                of_get_named_gpio(vbus_reg_node,
-                                       "otg-iusb-gpio", 0);
+                                       "ti,otg-iusb-gpio", 0);
        }
 
        return pdata;