Merge "power_supply: Add CP_ISNS_SLAVE power supply property" (9b3346c7) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/power/supply/power_supply_sysfs.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -463,9 +463,12 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(cp_switcher_en),
		POWER_SUPPLY_ATTR(cp_die_temp),
		POWER_SUPPLY_ATTR(cp_isns),
		POWER_SUPPLY_ATTR(cp_isns_slave),
		POWER_SUPPLY_ATTR(cp_toggle_switcher),
		POWER_SUPPLY_ATTR(cp_irq_status),
		POWER_SUPPLY_ATTR(cp_ilim),
		POWER_SUPPLY_ATTR(irq_status),
		POWER_SUPPLY_ATTR(parallel_output_mode),
		/* Local extensions of type int64_t */
		POWER_SUPPLY_ATTR(charge_counter_ext),
		/* Properties of type `const char ' /

+10 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,13 @@ enum {
		POWER_SUPPLY_PL_NON_STACKED_BATFET,
		};

		/* Parallel output connection topology */
		enum {
		POWER_SUPPLY_PL_OUTPUT_NONE,
		POWER_SUPPLY_PL_OUTPUT_VPH,
		POWER_SUPPLY_PL_OUTPUT_VBAT,
		};

		enum {
		POWER_SUPPLY_PD_INACTIVE = 0,
		POWER_SUPPLY_PD_ACTIVE,
		@@ -336,9 +343,12 @@ enum power_supply_property {
		POWER_SUPPLY_PROP_CP_SWITCHER_EN,
		POWER_SUPPLY_PROP_CP_DIE_TEMP,
		POWER_SUPPLY_PROP_CP_ISNS,
		POWER_SUPPLY_PROP_CP_ISNS_SLAVE,
		POWER_SUPPLY_PROP_CP_TOGGLE_SWITCHER,
		POWER_SUPPLY_PROP_CP_IRQ_STATUS,
		POWER_SUPPLY_PROP_CP_ILIM,
		POWER_SUPPLY_PROP_IRQ_STATUS,
		POWER_SUPPLY_PROP_PARALLEL_OUTPUT_MODE,
		/* Local extensions of type int64_t */
		POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
		/* Properties of type `const char ' /