Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2353661pxb; Mon, 20 Sep 2021 19:52:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxR0WBv9innmdD4sLjjAUZfzSW3mZUYwVg6qnSGfhCszMQ+8rAl0AjrsYk9Ofd3qTzIQelc X-Received: by 2002:a92:7f08:: with SMTP id a8mr19080923ild.125.1632192734754; Mon, 20 Sep 2021 19:52:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192734; cv=none; d=google.com; s=arc-20160816; b=1CuGkuM183tfqclGNdLTHQfEXho9JjynLLMILrpuyH5ZmLzRUHJt0aVSLgDKqRe9SN uMd/9Qk+c7ez9THUChxxfvX5J9NJlnOlyCwWqvtTJreTwXO2+9bFtbAlgjobnihn8W72 v7QPE2Lh4fPBIgbUntc39p+CbuVstExii1VgvYl/DSXhC1y7dHbzDYzXnHYNkRkOEn3y LZMNaHNqDOqEmpcL9UyK+IRa3PA3Ws/c62UoVFoF5LtsM/oeIgd0ErxhNk3fn17+0JeM /xoxhj//o6h5awdu/EFPNtDyLLkqSFOA9312ON9Ku7A+gqPr7enHBIbiJ+1WQdSp9eYC W+fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b9owBs/6UKHz+XW+TD16ar9gt4x0SLnL8GnGwxO8afw=; b=o1DBGoGmB8uK8C9/oGlyTa5gkzfDd4InGBYTZT53cNzwNwnjFeH2pQQHBpCo2P649n /n+0oF0L2cE8N9ArTHXUaHA2TsYpwEzDM3zBbchmIypZO6yJSijdtM/NMAEK91C1eUZh FXSeYD3ONFtihcgbaizJ6fhD8DGDbmdkCt+9D0XRuumznD6gNk5xq9AAnpUyNH+ZcZUZ f5nC/qTZfxA7PBe/VuPwgg6OkuupcDz85cipDWB/dLkWyat19OXTH2t601tNMhy9DKD2 QNgVI5f78LVHNMx35bKu+wZS+gpc6gAQGyRgFmAmx4KyxCtgAiyL116GUXwCRfjLwQ3A GYOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UgVUE+mZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c17si16975279jam.29.2021.09.20.19.52.03; Mon, 20 Sep 2021 19:52:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UgVUE+mZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383963AbhITSuO (ORCPT + 99 others); Mon, 20 Sep 2021 14:50:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:33246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353996AbhITSqU (ORCPT ); Mon, 20 Sep 2021 14:46:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 46ED461AF9; Mon, 20 Sep 2021 17:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632159198; bh=BRlBHLG2kkzLdnte+FJn6bWorTzHZ6MCQoCvjzrkQ8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UgVUE+mZrHgmn21XHtOXF+VK6DrUVAxtv+6xdv4tqhsxlileD0wtahymIz95Wykhp Jl8jcl61U/f2HdGHCdiVp+6P2OxoPEXlyNdFf0q+T4h4uVhTgSU3DVtyoWuhablrHY Ou98EDsM5PbZzCQ+D+JHgX3mGc9JT3k0XC0+2yVY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Chen-Yu Tsai , Lee Jones , Sasha Levin , Clamshell Subject: [PATCH 5.14 121/168] mfd: axp20x: Update AXP288 volatile ranges Date: Mon, 20 Sep 2021 18:44:19 +0200 Message-Id: <20210920163925.635890957@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163921.633181900@linuxfoundation.org> References: <20210920163921.633181900@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit f949a9ebce7a18005266b859a17f10c891bb13d7 ] On Cherry Trail devices with an AXP288 PMIC the external SD-card slot used the AXP's DLDO2 as card-voltage and either DLDO3 or GPIO1LDO (GPIO1 pin in low noise LDO mode) as signal-voltage. These regulators are turned on/off and in case of the signal-voltage also have their output-voltage changed by the _PS0 and _PS3 power- management ACPI methods on the MMC-controllers ACPI fwnode as well as by the _DSM ACPI method for changing the signal voltage. The AML code implementing these methods is directly accessing the PMIC through ACPI I2C OpRegion accesses, instead of using the special PMIC OpRegion handled by drivers/acpi/pmic/intel_pmic_xpower.c . This means that the contents of the involved PMIC registers can change without the change being made through the regmap interface, so regmap should not cache the contents of these registers. Mark the regulator power on/off, the regulator voltage control and the GPIO1 control registers as volatile, to avoid regmap caching them. Specifically this fixes an issue on some models where the i915 driver toggles another LDO using the same on/off register on/off through MIPI sequences (through intel_soc_pmic_exec_mipi_pmic_seq_element()) which then writes back a cached on/off register-value where the card-voltage is off causing the external sdcard slot to stop working when the screen goes blank, or comes back on again. The regulator register-range now marked volatile also includes the buck regulator control registers. This is done on purpose these are normally not touched by the AML code, but they are updated directly by the SoC's PUNIT which means that they may also change without going through regmap. Note the AXP288 PMIC is only used on Bay- and Cherry-Trail platforms, so even though this is an ACPI specific problem there is no need to make the new volatile ranges conditional since these platforms always use ACPI. Fixes: dc91c3b6fe66 ("mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile") Fixes: cd53216625a0 ("mfd: axp20x: Fix axp288 volatile ranges") Reported-and-tested-by: Clamshell Signed-off-by: Hans de Goede Reviewed-by: Chen-Yu Tsai Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/axp20x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 4145a38b3890..d0ac019850d1 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -125,12 +125,13 @@ static const struct regmap_range axp288_writeable_ranges[] = { static const struct regmap_range axp288_volatile_ranges[] = { regmap_reg_range(AXP20X_PWR_INPUT_STATUS, AXP288_POWER_REASON), + regmap_reg_range(AXP22X_PWR_OUT_CTRL1, AXP22X_ALDO3_V_OUT), regmap_reg_range(AXP288_BC_GLOBAL, AXP288_BC_GLOBAL), regmap_reg_range(AXP288_BC_DET_STAT, AXP20X_VBUS_IPSOUT_MGMT), regmap_reg_range(AXP20X_CHRG_BAK_CTRL, AXP20X_CHRG_BAK_CTRL), regmap_reg_range(AXP20X_IRQ1_EN, AXP20X_IPSOUT_V_HIGH_L), regmap_reg_range(AXP20X_TIMER_CTRL, AXP20X_TIMER_CTRL), - regmap_reg_range(AXP22X_GPIO_STATE, AXP22X_GPIO_STATE), + regmap_reg_range(AXP20X_GPIO1_CTRL, AXP22X_GPIO_STATE), regmap_reg_range(AXP288_RT_BATT_V_H, AXP288_RT_BATT_V_L), regmap_reg_range(AXP20X_FG_RES, AXP288_FG_CC_CAP_REG), }; -- 2.30.2