Merge "power: smb5: update IRQ configuration" into msm-4.14 (baeef428) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/qpnp-smb5.c

+8 −32

Original line number	Diff line number	Diff line
		@@ -1716,30 +1716,25 @@ static struct smb_irq_info smb5_irqs[] = {
		[CHG_STATE_CHANGE_IRQ] = {
		.name = "chg-state-change",
		.handler = chg_state_change_irq_handler,
		.wake = true,
		},
		[STEP_CHG_STATE_CHANGE_IRQ] = {
		.name = "step-chg-state-change",
		.handler = default_irq_handler,
		},
		[STEP_CHG_SOC_UPDATE_FAIL_IRQ] = {
		.name = "step-chg-soc-update-fail",
		.handler = default_irq_handler,
		},
		[STEP_CHG_SOC_UPDATE_REQ_IRQ] = {
		.name = "step-chg-soc-update-req",
		.handler = default_irq_handler,
		},
		[FG_FVCAL_QUALIFIED_IRQ] = {
		.name = "fg-fvcal-qualified",
		.handler = default_irq_handler,
		},
		[VPH_ALARM_IRQ] = {
		.name = "vph-alarm",
		.handler = default_irq_handler,
		},
		[VPH_DROP_PRECHG_IRQ] = {
		.name = "vph-drop-prechg",
		.handler = default_irq_handler,
		},
		/* DCDC IRQs */
		[OTG_FAIL_IRQ] = {
		@@ -1748,19 +1743,17 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[OTG_OC_DISABLE_SW_IRQ] = {
		.name = "otg-oc-disable-sw",
		.handler = default_irq_handler,
		},
		[OTG_OC_HICCUP_IRQ] = {
		.name = "otg-oc-hiccup",
		.handler = default_irq_handler,
		},
		[BSM_ACTIVE_IRQ] = {
		.name = "bsm-active",
		.handler = default_irq_handler,
		},
		[HIGH_DUTY_CYCLE_IRQ] = {
		.name = "high-duty-cycle",
		.handler = high_duty_cycle_irq_handler,
		.wake = true,
		},
		[INPUT_CURRENT_LIMITING_IRQ] = {
		.name = "input-current-limiting",
		@@ -1768,7 +1761,6 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[CONCURRENT_MODE_DISABLE_IRQ] = {
		.name = "concurrent-mode-disable",
		.handler = default_irq_handler,
		},
		[SWITCHER_POWER_OK_IRQ] = {
		.name = "switcher-power-ok",
		@@ -1778,10 +1770,10 @@ static struct smb_irq_info smb5_irqs[] = {
		[BAT_TEMP_IRQ] = {
		.name = "bat-temp",
		.handler = batt_temp_changed_irq_handler,
		.wake = true,
		},
		[ALL_CHNL_CONV_DONE_IRQ] = {
		.name = "all-chnl-conv-done",
		.handler = default_irq_handler,
		},
		[BAT_OV_IRQ] = {
		.name = "bat-ov",
		@@ -1801,11 +1793,9 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[BUCK_OC_IRQ] = {
		.name = "buck-oc",
		.handler = default_irq_handler,
		},
		[VPH_OV_IRQ] = {
		.name = "vph-ov",
		.handler = default_irq_handler,
		},
		/* USB INPUT IRQs */
		[USBIN_COLLAPSE_IRQ] = {
		@@ -1827,23 +1817,24 @@ static struct smb_irq_info smb5_irqs[] = {
		[USBIN_PLUGIN_IRQ] = {
		.name = "usbin-plugin",
		.handler = usb_plugin_irq_handler,
		.wake = true,
		},
		[USBIN_REVI_CHANGE_IRQ] = {
		.name = "usbin-revi-change",
		.handler = default_irq_handler,
		},
		[USBIN_SRC_CHANGE_IRQ] = {
		.name = "usbin-src-change",
		.handler = usb_source_change_irq_handler,
		.wake = true,
		},
		[USBIN_ICL_CHANGE_IRQ] = {
		.name = "usbin-icl-change",
		.handler = icl_change_irq_handler,
		.wake = true,
		},
		/* DC INPUT IRQs */
		[DCIN_VASHDN_IRQ] = {
		.name = "dcin-vashdn",
		.handler = default_irq_handler,
		},
		[DCIN_UV_IRQ] = {
		.name = "dcin-uv",
		@@ -1860,7 +1851,6 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[DCIN_REVI_IRQ] = {
		.name = "dcin-revi",
		.handler = default_irq_handler,
		},
		[DCIN_PON_IRQ] = {
		.name = "dcin-pon",
		@@ -1874,14 +1864,15 @@ static struct smb_irq_info smb5_irqs[] = {
		[TYPEC_OR_RID_DETECTION_CHANGE_IRQ] = {
		.name = "typec-or-rid-detect-change",
		.handler = typec_or_rid_detection_change_irq_handler,
		.wake = true,
		},
		[TYPEC_VPD_DETECT_IRQ] = {
		.name = "typec-vpd-detect",
		.handler = default_irq_handler,
		},
		[TYPEC_CC_STATE_CHANGE_IRQ] = {
		.name = "typec-cc-state-change",
		.handler = typec_state_change_irq_handler,
		.wake = true,
		},
		[TYPEC_VCONN_OC_IRQ] = {
		.name = "typec-vconn-oc",
		@@ -1889,11 +1880,9 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[TYPEC_VBUS_CHANGE_IRQ] = {
		.name = "typec-vbus-change",
		.handler = default_irq_handler,
		},
		[TYPEC_ATTACH_DETACH_IRQ] = {
		.name = "typec-attach-detach",
		.handler = typec_attach_detach_irq_handler,
		},
		[TYPEC_LEGACY_CABLE_DETECT_IRQ] = {
		.name = "typec-legacy-cable-detect",
		@@ -1901,12 +1890,10 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[TYPEC_TRY_SNK_SRC_DETECT_IRQ] = {
		.name = "typec-try-snk-src-detect",
		.handler = default_irq_handler,
		},
		/* MISCELLANEOUS IRQs */
		[WDOG_SNARL_IRQ] = {
		.name = "wdog-snarl",
		.handler = NULL,
		},
		[WDOG_BARK_IRQ] = {
		.name = "wdog-bark",
		@@ -1914,7 +1901,6 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[AICL_FAIL_IRQ] = {
		.name = "aicl-fail",
		.handler = default_irq_handler,
		},
		[AICL_DONE_IRQ] = {
		.name = "aicl-done",
		@@ -1922,24 +1908,19 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[SMB_EN_IRQ] = {
		.name = "smb-en",
		.handler = default_irq_handler,
		},
		[IMP_TRIGGER_IRQ] = {
		.name = "imp-trigger",
		.handler = default_irq_handler,
		},
		[TEMP_CHANGE_IRQ] = {
		.name = "temp-change",
		.handler = default_irq_handler,
		},
		[TEMP_CHANGE_SMB_IRQ] = {
		.name = "temp-change-smb",
		.handler = default_irq_handler,
		},
		/* FLASH */
		[VREG_OK_IRQ] = {
		.name = "vreg-ok",
		.handler = schgm_flash_default_irq_handler,
		},
		[ILIM_S2_IRQ] = {
		.name = "ilim2-s2",
		@@ -1947,15 +1928,12 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[ILIM_S1_IRQ] = {
		.name = "ilim1-s1",
		.handler = schgm_flash_default_irq_handler,
		},
		[VOUT_DOWN_IRQ] = {
		.name = "vout-down",
		.handler = schgm_flash_default_irq_handler,
		},
		[VOUT_UP_IRQ] = {
		.name = "vout-up",
		.handler = schgm_flash_default_irq_handler,
		},
		[FLASH_STATE_CHANGE_IRQ] = {
		.name = "flash-state-change",
		@@ -1963,11 +1941,9 @@ static struct smb_irq_info smb5_irqs[] = {
		},
		[TORCH_REQ_IRQ] = {
		.name = "torch-req",
		.handler = schgm_flash_default_irq_handler,
		},
		[FLASH_EN_IRQ] = {
		.name = "flash-en",
		.handler = schgm_flash_default_irq_handler,
		},
		};