power-supply: sync supply properties and type

This patch fixes to sync supply properties and their type to avoid
int type in string type position.

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 600b368..7d842bc 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -205,12 +205,16 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(time_to_full_avg),
        POWER_SUPPLY_ATTR(type),
        POWER_SUPPLY_ATTR(scope),
+       POWER_SUPPLY_ATTR(system_temp_level),
+       POWER_SUPPLY_ATTR(resistance),
        POWER_SUPPLY_ATTR(charge_term_current),
        POWER_SUPPLY_ATTR(calibrate),
+       POWER_SUPPLY_ATTR(input_voltage_regulation),
        /* Local extensions */
        POWER_SUPPLY_ATTR(usb_hc),
        POWER_SUPPLY_ATTR(usb_otg),
        POWER_SUPPLY_ATTR(charge_enabled),
+       POWER_SUPPLY_ATTR(charge_counter_shadow),
        /* Local extensions of type int64_t */
        POWER_SUPPLY_ATTR(charge_counter_ext),
        /* Properties of type `const char *' */
@@ -218,6 +222,7 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(manufacturer),
        POWER_SUPPLY_ATTR(serial_number),
        POWER_SUPPLY_ATTR(afc_charger_mode),
+       POWER_SUPPLY_ATTR(charge_aicl_control),
 };
 
 static struct attribute *

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index bb455c2..c8c6fcf 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -163,6 +163,7 @@ enum power_supply_property {
        POWER_SUPPLY_PROP_RESISTANCE,
        POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
        POWER_SUPPLY_PROP_CALIBRATE,
+       POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,
        /* Local extensions */
        POWER_SUPPLY_PROP_USB_HC,
        POWER_SUPPLY_PROP_USB_OTG,
@@ -176,7 +177,6 @@ enum power_supply_property {
        POWER_SUPPLY_PROP_SERIAL_NUMBER,
        POWER_SUPPLY_PROP_AFC_CHARGER_MODE,
        POWER_SUPPLY_PROP_CHARGE_AICL_CONTROL,
-       POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,
 };
 
 enum power_supply_type {