From patchwork Mon Dec 23 13:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 13918848 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCE7E8BEA; Mon, 23 Dec 2024 13:31:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734960675; cv=none; b=j2Uw3z/Ooi268RoJpC/KHEtm+mf31nabm5o26xlEW3+uoWdTmAOd2T3kM4dQ45jrkX2OFJCa7wRAVEsB2MbmZ9Yehp8EZAiIdl0JXBh2YCh9KTfbd2WZTHZjfv40p9NBwViuahxcfZeqHCH/iiYYgf+FDO7qdVEU++DWgPc3KqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734960675; c=relaxed/simple; bh=/EeD7LqHcTZ3/1Ng4iRA0q/Q9oTbn7vVY0BQy1PKauQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GnNTkk8kmxAeTaZL6qzHARBsZc1MqH+K/REuyoqjViTMHEtUqBbyNoqk2Ln5x9p1ELFC4XEcXMmYMoiGHgu0jrreqvS6lciSGWzeyIGfRMiN1BsRqQ6nWLFFSV3stZg2zDtgro37Y39skeuZulk/KjdYosGkaiNbOE8Z12T4Ydo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kHadZMEE; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kHadZMEE" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-aa679ad4265so936859466b.0; Mon, 23 Dec 2024 05:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734960672; x=1735565472; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RwPuXDf5OOwhnI0ZOOII5GNLjUS47fPFuHS4/Stj1TM=; b=kHadZMEEVZsqnDWfP/qdMXLWyLDD3JtOoSmSA0n7y3m5bOFtwA0dc+LZTNfCORIl21 gQZtn49vDW679r4dsWVuU+tg6SZ+/qPFal2SidmWhyK8X3FA6A4v7mAq/TGtzDkTMSy2 Wqxl//fweDk+PFrk4F2Qv9xFm7leTS9xaVUlE0alykLoav3wEYnlYmZoqSLMTacZAj+N XYb/bvvEf4i192ehfFDNO1OUKrMIVk0eyJTsjQNSLZuTRXc5D1vkyyY/frffoU0UQPCk x/mKSn6r3AeWC47ZM5xHbeMTMftB7e8Q6aHXHo7P4W4mjxtUpP9i6Xff7Y3YnItQTffM ScZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734960672; x=1735565472; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RwPuXDf5OOwhnI0ZOOII5GNLjUS47fPFuHS4/Stj1TM=; b=gxrG/FWf+a6hSy3ryEr4W+5tGyqkEJ6vjEOXxNuojQBHGE162G9KDGdzgeq7SIG/B3 RdqyzwMHpdxi0QlXN7Khl0gazeNu4UDJ3YuA5V1yeQg46aPeGqE9Yx1GJJJibYDDrgrK YtSK8Ycz2v+ZpUGOTcX9OOAnVvhQFEIJO41tnE1MjZYfRVS8UtAhZhsVJuxdYIz3mdWj 3HdjWNT0wmeq6pkWNLapi2/tV8z6ENYU6/J35Pa3XNizxkyzG4Qy3QZ7O3WLuCw9/O3r FQYNbYsXhSDy+mzsB9ynVUPyZvNCqtGScLUSzeacUD2B3LeaQS5Eh0PL4R9Y8a7F9WkD 2ynA== X-Forwarded-Encrypted: i=1; AJvYcCUMZbJcCqZFvuPa4UZhAsM8ndjxmbdOZgad+agP1rcs78rvR7JGPvWGzdEhmvGiF+gnu8Rx9J7AgGq1TDkU@vger.kernel.org, AJvYcCUtg03EwRZ3SJmrm2uXr3wHv0lJBQCftBmKtbxdA9I8TIK9QrFlLb0LFDJunrxx8OprS5bYpk7CGqz3@vger.kernel.org, AJvYcCXOPnMFSw4fEHF+5knowEZ2+GysQqSc0ofUC0QzHUVR+hJnCpFJK7m06t6WW/38PCiUkvlro2X8G5zHTx9RCf30eyA=@vger.kernel.org, AJvYcCXtQ2Xic2imys8yErwxiX8piUOetMDpRb5jD+YCr2UC8GqOaRwh3ijJJ3YR4HRZM2KvaI4PEAu4wGWrQipD6A==@vger.kernel.org X-Gm-Message-State: AOJu0Yyv9DPCZjzwodfuowGrSWaH6rUP/vtTzXQ5bBli5wWTxjApJzX4 A+F81PnBGIgZgXnekPp5T6TKJ/lB2tX/zHvKm1k4xiY8xB5VNZ+5 X-Gm-Gg: ASbGncveYtIPjNw7OjbFTJuo+IRYbf4IaY3t5ZM5uXjupwCS7fMQayvBvRU0ANPIf11 atTFo91ZnPGGHYHliQLYiB/XSE2TwSNxpprqBTvL3vKl+HOSQkNQ9t8xNO0BhAUpLvu/IsnjO4w i8x9y6EKzJ0ZQx70WzZlm4WRVmcozU3m2It0jvDs3u270MyHEXrUJ4VLcXHlImfi06CXaKT+Vko oBRGjAx/ih0gRKbLol/mj4WEziUlZy2RbnCxtiqIEHU7+lLTjd/qb08n3q4yG6NyhA+s2wT+KKQ ZeHKBLeR1FYeaFuFal1R1rVb1A== X-Google-Smtp-Source: AGHT+IEAjOSElAIIGrGWGIQMWdMK2o7RI6v/y07lVKjYb6AqUZp1yJSKckWfo1Bm53K/zjmZVsKLjg== X-Received: by 2002:a17:907:3faa:b0:aa6:9540:570f with SMTP id a640c23a62f3a-aac081579eemr1553450066b.18.1734960671961; Mon, 23 Dec 2024 05:31:11 -0800 (PST) Received: from [127.0.1.1] (nat6-minsk-pool-46-53-210-232.telecom.by. [46.53.210.232]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-aac0e895502sm523749966b.63.2024.12.23.05.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2024 05:31:11 -0800 (PST) From: Dzmitry Sankouski Date: Mon, 23 Dec 2024 16:30:39 +0300 Subject: [PATCH v5 1/2] power: supply: max17042: make interrupt shared Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241223-b4-max17042-v5-1-e4e409723bce@gmail.com> References: <20241223-b4-max17042-v5-0-e4e409723bce@gmail.com> In-Reply-To: <20241223-b4-max17042-v5-0-e4e409723bce@gmail.com> To: Hans de Goede , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team , Sebastian Reichel , Rob Herring , Conor Dooley , Alim Akhtar , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Bjorn Andersson , Konrad Dybcio Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1734960669; l=1055; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=/EeD7LqHcTZ3/1Ng4iRA0q/Q9oTbn7vVY0BQy1PKauQ=; b=ltc3kA6HcpduIZKYmVftqNij2lf7rbl9PER+OdeUoULkpB6JPpKkulYdc4j7/w7rYHRt1LhYp zt4lvjE87Z+B8qqX5eyIYMrKZZuAMRSM/NZnPIuV9vCF2JBkS3lLuE7 X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Fuelgauge blocks often are incorporated in bigger chip, which may use only 1 line for interrupts. Make interrupt shared. Signed-off-by: Dzmitry Sankouski Reviewed-by: Krzysztof Kozlowski --- drivers/power/supply/max17042_battery.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index 496c3e1f2ee6..99bf6915aa23 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -1103,14 +1103,7 @@ static int max17042_probe(struct i2c_client *client) } if (client->irq) { - unsigned int flags = IRQF_ONESHOT; - - /* - * On ACPI systems the IRQ may be handled by ACPI-event code, - * so we need to share (if the ACPI code is willing to share). - */ - if (acpi_id) - flags |= IRQF_SHARED | IRQF_PROBE_SHARED; + unsigned int flags = IRQF_ONESHOT | IRQF_SHARED | IRQF_PROBE_SHARED; ret = devm_request_threaded_irq(&client->dev, client->irq, NULL, From patchwork Mon Dec 23 13:30:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 13918849 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 109691AF0CE; Mon, 23 Dec 2024 13:31:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734960678; cv=none; b=iQ0aCExaGeM99eAAl3jUEluvL6pSE+C06NSo5eNSzzk58p61dEdD9TREYC2cc2URTFREnPrYpNpIz1XwTYm/qhqgTJzAZnMhw0PMkBQpD907f53H7WvC6hGfR/EUnx9qhIGLqaZiuL2Fxi6TZYbcrtQeRYIwPSktwfMjTZj3TKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734960678; c=relaxed/simple; bh=CsA8p5yHzaSIiP1c2/pE9CLJULSv0HYY6su7li6YTA8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RFtMYVAfIKznFhFjHq3txbnkS7QwWFVkCJX7gtF9GOraDGKmF0hP3HTHC8R2xSCQfa5Dy24gCpAE+AEJlsiFyC9AGK/rorfMzdjB0/yg2FzlCosICHcyMcd940igLEVXrATQkNaa6mRQE9BwGfjOSA1/ACkZwCMr1jBHMZhwfKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bx1JECWt; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bx1JECWt" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-aaee2c5ee6eso80874566b.1; Mon, 23 Dec 2024 05:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734960674; x=1735565474; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7ajg7xx/d8ESd5hASRxHgzAQg5WAudGbS8KuIMOLuqU=; b=Bx1JECWtCDo3etR8Cr573tXnYeG007N6dXn+MNU4KMKEQVGgXdwm6VBd/tWpLosU8W R9HkPglDqcoNmGQmC026uVrD8XkrhbF0CVu9KRCnadJkVE/5GnV/ArBHjG2dDTeNGDG3 +N5fYUamTPn+tc3H0gIA1DQrFRXIrJPDxn5+QINo0ISH+Lrg+DplpqLNjRAVPngH/B86 t7uBjb6nNBPzS0JIFuM/1FRsKZylx3+WFp80P5e0cN/MKKWgT7lz7E5vdVG0SnxSBLyn 05HTzNTOiz0OLgIrbqLLs9v6bk73av3Qfi5hdHquLIxXYXTYEIeWwolOGtajtL+URpk0 7jng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734960674; x=1735565474; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ajg7xx/d8ESd5hASRxHgzAQg5WAudGbS8KuIMOLuqU=; b=wNmAn5xWMCe8aRFb0eAJCiJkM3aMtWkoaXezKPQu/8U+Z3ueIa9yNt9FjDXezjOIZo 7YlR2qUAbGvoQo94egmJgvMfaooL7b1aKwQSIr2MXlEZo6yO0GrEjv59RqAZ5DRopnBt 62Ntg8qoyJT2MRZRWAeKPIaCbbVxzQHWUSbU6w43ZUe7qOuGT3QP5iwlOhVvbkM/94Q7 Jcw4lkv/kCXPkt0wyUMBYuJWqSUnFhiKByN0pb5MRW5i1ZEx6d9DlPjf1v+gD2MhJjMK d3Ia1srV3oid8DIHDIrdNNKsVkOLFFtxZS0R1WHfVmtNbG1+w/Tm5q/zfYgfDvM/Y5Qj 3K9Q== X-Forwarded-Encrypted: i=1; AJvYcCUdlfcy4OpPM9h4VVY6l0lgBZCCoPDxdaJl/nBAdbKEZJwAAZOMEykAsPeTp2wYv2oiAxPC9OS6MnCqjYleqwCxNm0=@vger.kernel.org, AJvYcCVj4o9aq8HAV5yLFk0TGR0uaw/jD6P/OOjx1jN2Kk8rcLDGEi0r2g1tBrOsImPSNkCaauktHXUVxrNn@vger.kernel.org, AJvYcCWqpUt4HSCeBRqZM1nKpLinpSz6smCMlheYFKyli+oeZjre4AcQ6s80WkCfoKOrW59dCyWAH7ASR6WfZxLD@vger.kernel.org, AJvYcCXxnzVALWa4KWtY1S760k7Dd/fOJpr6NpOFcLMcBpJAuETMMjeraOrqlKVRnyl30zOmI/lmeF112ZcMilFZiA==@vger.kernel.org X-Gm-Message-State: AOJu0YzWpfsPJ5TJLWyUQ6N52Z0z1DGtr+b2+ygo+AZQ50IwtSr6jA+Y gqthgpELmGJLixdP04brUXW2YR0/NbJU5cJkivTCpt+jBSZiz2ZG X-Gm-Gg: ASbGncuwmIFGN9MFb2gcn1T0fxDijciO8Bp1HKpO45iSqVykw8qD20g/eiNgEIovHPG kuD1kfyhCg08o4fDHwc/JJLhqv7cV3Tk2gyLIXMPvgo58al1xuFHsjOV1KIvvZOyGExafEmZdnw YazWGRmiS5Pk/faTPCE5PUJFmKpuZtRIrY9aKO453KlJ4mzrys1zu5rsAt1A792dIS9G+ZOu8P5 TLtunLyW0Kyfm6Ax1evqIyql/XSSLJySq5E463DNuDGe29EVlU7NqxwRxDLjc2KhA9UsEzGO/Yh QW9DcJTMEAWQtqlTinIuz3kXRg== X-Google-Smtp-Source: AGHT+IHEjo3x7fD8aSiXxOmFUV3hV1/DIPle/JX4NtwkWVI7TfmAfR2G3lYPFinPk/RyEV7fRoWnxQ== X-Received: by 2002:a17:907:6096:b0:aa6:800a:128b with SMTP id a640c23a62f3a-aac271305cemr1109984466b.9.1734960673411; Mon, 23 Dec 2024 05:31:13 -0800 (PST) Received: from [127.0.1.1] (nat6-minsk-pool-46-53-210-232.telecom.by. [46.53.210.232]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-aac0e895502sm523749966b.63.2024.12.23.05.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2024 05:31:13 -0800 (PST) From: Dzmitry Sankouski Date: Mon, 23 Dec 2024 16:30:40 +0300 Subject: [PATCH v5 2/2] power: supply: max17042: add platform driver variant Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241223-b4-max17042-v5-2-e4e409723bce@gmail.com> References: <20241223-b4-max17042-v5-0-e4e409723bce@gmail.com> In-Reply-To: <20241223-b4-max17042-v5-0-e4e409723bce@gmail.com> To: Hans de Goede , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team , Sebastian Reichel , Rob Herring , Conor Dooley , Alim Akhtar , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Bjorn Andersson , Konrad Dybcio Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1734960669; l=14031; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=CsA8p5yHzaSIiP1c2/pE9CLJULSv0HYY6su7li6YTA8=; b=Keb/p3VYxjVZja9jO9lwQQEdinxhirqOLuxsH5MHwjI27znBDcpWQoKTHZx3tZtxhXnayJngg u3oXVH4JoDcDqTpWmQCHEJtKAFzg6u1rgJT9PtgMNhcPdpz/hVeCq7Q X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Maxim PMICs may include fuel gauge with additional features, which is out of single Linux power supply driver scope. For example, in max77705 PMIC fuelgauge has additional registers, like IIN_REG, VSYS_REG, ISYS_REG. Those needed to measure PMIC input current, system voltage and current respectively. Those measurements cannot be bound to any of fuelgauge properties. The solution here add and option to use max17042 driver as a MFD sub device, thus allowing any additional functionality be implemented as another sub device. This will help to reduce code duplication in MFD fuel gauge drivers. Signed-off-by: Dzmitry Sankouski Acked-by: Krzysztof Kozlowski --- Changes in v6: - use parent device of_node Changes in v5: - replace *client field on *dev and irq in driver data struct this needed to provide correct dev and irq from platform probe - s/&chip->client->dev/chip->dev/ - s/chip->client->irq/chip->irq/ - add regmap name to avoid possible conflicts in debugfs - get i2c_client with common to_i2c_client(pdev->dev.parent); approach, not from platform data - add device types to `of_device_id max17042_dt_match`, for platform version to be able to set platform device id, like in `clk-s2mps11.c` driver. Changes in v4: - rename module_init and module_exit fuctions - rework max17042_init - assign chip_type in probe function - pass i2c_client as pointer on pointer, to use same pointer created in MFD. This allows devm_regmap_init_i2c to cleanup gracefully. Changes in v3: - pass dev pointer in max17042_probe - remove prints --- drivers/power/supply/max17042_battery.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- 1 file changed, 141 insertions(+), 50 deletions(-) diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index 99bf6915aa23..4037843e25bb 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -52,13 +53,14 @@ #define MAX17042_VMAX_TOLERANCE 50 /* 50 mV */ struct max17042_chip { - struct i2c_client *client; + struct device *dev; struct regmap *regmap; struct power_supply *battery; enum max170xx_chip_type chip_type; struct max17042_platform_data *pdata; struct work_struct work; int init_complete; + int irq; }; static enum power_supply_property max17042_battery_props[] = { @@ -573,11 +575,11 @@ static inline int max17042_model_data_compare(struct max17042_chip *chip, int i; if (memcmp(data1, data2, size)) { - dev_err(&chip->client->dev, "%s compare failed\n", __func__); + dev_err(chip->dev, "%s compare failed\n", __func__); for (i = 0; i < size; i++) - dev_info(&chip->client->dev, "0x%x, 0x%x", + dev_info(chip->dev, "0x%x, 0x%x", data1[i], data2[i]); - dev_info(&chip->client->dev, "\n"); + dev_info(chip->dev, "\n"); return -EINVAL; } return 0; @@ -812,14 +814,14 @@ static int max17042_init_chip(struct max17042_chip *chip) /* write cell characterization data */ ret = max17042_init_model(chip); if (ret) { - dev_err(&chip->client->dev, "%s init failed\n", + dev_err(chip->dev, "%s init failed\n", __func__); return -EIO; } ret = max17042_verify_model_lock(chip); if (ret) { - dev_err(&chip->client->dev, "%s lock verify failed\n", + dev_err(chip->dev, "%s lock verify failed\n", __func__); return -EIO; } @@ -875,7 +877,7 @@ static irqreturn_t max17042_thread_handler(int id, void *dev) return IRQ_HANDLED; if ((val & STATUS_SMN_BIT) || (val & STATUS_SMX_BIT)) { - dev_dbg(&chip->client->dev, "SOC threshold INTR\n"); + dev_dbg(chip->dev, "SOC threshold INTR\n"); max17042_set_soc_threshold(chip, 1); } @@ -907,7 +909,7 @@ static void max17042_init_worker(struct work_struct *work) static struct max17042_platform_data * max17042_get_of_pdata(struct max17042_chip *chip) { - struct device *dev = &chip->client->dev; + struct device *dev = chip->dev; struct device_node *np = dev->of_node; u32 prop; struct max17042_platform_data *pdata; @@ -949,7 +951,7 @@ static struct max17042_reg_data max17047_default_pdata_init_regs[] = { static struct max17042_platform_data * max17042_get_default_pdata(struct max17042_chip *chip) { - struct device *dev = &chip->client->dev; + struct device *dev = chip->dev; struct max17042_platform_data *pdata; int ret, misc_cfg; @@ -990,7 +992,7 @@ max17042_get_default_pdata(struct max17042_chip *chip) static struct max17042_platform_data * max17042_get_pdata(struct max17042_chip *chip) { - struct device *dev = &chip->client->dev; + struct device *dev = chip->dev; #ifdef CONFIG_OF if (dev->of_node) @@ -1003,6 +1005,7 @@ max17042_get_pdata(struct max17042_chip *chip) } static const struct regmap_config max17042_regmap_config = { + .name = "max17042", .reg_bits = 8, .val_bits = 16, .val_format_endian = REGMAP_ENDIAN_NATIVE, @@ -1029,14 +1032,12 @@ static const struct power_supply_desc max17042_no_current_sense_psy_desc = { .num_properties = ARRAY_SIZE(max17042_battery_props) - 2, }; -static int max17042_probe(struct i2c_client *client) +static int max17042_probe(struct i2c_client *client, struct device *dev, int irq, + enum max170xx_chip_type chip_type) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); struct i2c_adapter *adapter = client->adapter; const struct power_supply_desc *max17042_desc = &max17042_psy_desc; struct power_supply_config psy_cfg = {}; - const struct acpi_device_id *acpi_id = NULL; - struct device *dev = &client->dev; struct max17042_chip *chip; int ret; int i; @@ -1045,33 +1046,25 @@ static int max17042_probe(struct i2c_client *client) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) return -EIO; - chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; - chip->client = client; - if (id) { - chip->chip_type = id->driver_data; - } else { - acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!acpi_id) - return -ENODEV; - - chip->chip_type = acpi_id->driver_data; - } + chip->dev = dev; + chip->chip_type = chip_type; chip->regmap = devm_regmap_init_i2c(client, &max17042_regmap_config); if (IS_ERR(chip->regmap)) { - dev_err(&client->dev, "Failed to initialize regmap\n"); + dev_err(dev, "Failed to initialize regmap\n"); return -EINVAL; } chip->pdata = max17042_get_pdata(chip); if (!chip->pdata) { - dev_err(&client->dev, "no platform data provided\n"); + dev_err(dev, "no platform data provided\n"); return -EINVAL; } - i2c_set_clientdata(client, chip); + dev_set_drvdata(dev, chip); psy_cfg.drv_data = chip; psy_cfg.of_node = dev->of_node; @@ -1095,17 +1088,17 @@ static int max17042_probe(struct i2c_client *client) regmap_write(chip->regmap, MAX17042_LearnCFG, 0x0007); } - chip->battery = devm_power_supply_register(&client->dev, max17042_desc, + chip->battery = devm_power_supply_register(dev, max17042_desc, &psy_cfg); if (IS_ERR(chip->battery)) { - dev_err(&client->dev, "failed: power supply register\n"); + dev_err(dev, "failed: power supply register\n"); return PTR_ERR(chip->battery); } - if (client->irq) { + if (irq) { unsigned int flags = IRQF_ONESHOT | IRQF_SHARED | IRQF_PROBE_SHARED; - ret = devm_request_threaded_irq(&client->dev, client->irq, + ret = devm_request_threaded_irq(dev, irq, NULL, max17042_thread_handler, flags, chip->battery->desc->name, @@ -1116,18 +1109,20 @@ static int max17042_probe(struct i2c_client *client) CFG_ALRT_BIT_ENBL); max17042_set_soc_threshold(chip, 1); } else { - client->irq = 0; + irq = 0; if (ret != -EBUSY) - dev_err(&client->dev, "Failed to get IRQ\n"); + dev_err(dev, "Failed to get IRQ\n"); } } /* Not able to update the charge threshold when exceeded? -> disable */ - if (!client->irq) + if (!irq) regmap_write(chip->regmap, MAX17042_SALRT_Th, 0xff00); + chip->irq = irq; + regmap_read(chip->regmap, MAX17042_STATUS, &val); if (val & STATUS_POR_BIT) { - ret = devm_work_autocancel(&client->dev, &chip->work, + ret = devm_work_autocancel(dev, &chip->work, max17042_init_worker); if (ret) return ret; @@ -1139,6 +1134,44 @@ static int max17042_probe(struct i2c_client *client) return 0; } +static int max17042_i2c_probe(struct i2c_client *client) +{ + const struct i2c_device_id *id = i2c_client_get_device_id(client); + const struct acpi_device_id *acpi_id = NULL; + struct device *dev = &client->dev; + enum max170xx_chip_type chip_type; + + if (id) { + chip_type = id->driver_data; + } else { + acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); + if (!acpi_id) + return -ENODEV; + + chip_type = acpi_id->driver_data; + } + + return max17042_probe(client, dev, client->irq, chip_type); +} + +static int max17042_platform_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct i2c_client *i2c; + const struct platform_device_id *id; + int irq; + + i2c = to_i2c_client(pdev->dev.parent); + if (!i2c) + return -EINVAL; + + dev->of_node = dev->parent->of_node; + id = platform_get_device_id(pdev); + irq = platform_get_irq(pdev, 0); + + return max17042_probe(i2c, dev, irq, id->driver_data); +} + #ifdef CONFIG_PM_SLEEP static int max17042_suspend(struct device *dev) { @@ -1148,9 +1181,9 @@ static int max17042_suspend(struct device *dev) * disable the irq and enable irq_wake * capability to the interrupt line. */ - if (chip->client->irq) { - disable_irq(chip->client->irq); - enable_irq_wake(chip->client->irq); + if (chip->irq) { + disable_irq(chip->irq); + enable_irq_wake(chip->irq); } return 0; @@ -1160,9 +1193,9 @@ static int max17042_resume(struct device *dev) { struct max17042_chip *chip = dev_get_drvdata(dev); - if (chip->client->irq) { - disable_irq_wake(chip->client->irq); - enable_irq(chip->client->irq); + if (chip->irq) { + disable_irq_wake(chip->irq); + enable_irq(chip->irq); /* re-program the SOC thresholds to 1% change */ max17042_set_soc_threshold(chip, 1); } @@ -1183,12 +1216,26 @@ MODULE_DEVICE_TABLE(acpi, max17042_acpi_match); #endif #ifdef CONFIG_OF -static const struct of_device_id max17042_dt_match[] = { - { .compatible = "maxim,max17042" }, - { .compatible = "maxim,max17047" }, - { .compatible = "maxim,max17050" }, - { .compatible = "maxim,max17055" }, - { .compatible = "maxim,max77849-battery" }, +/* + * Device may be instantiated through parent MFD device and device matching is done + * through platform_device_id. + * + * However if device's DT node contains proper clock compatible and driver is + * built as a module, then the *module* matching will be done trough DT aliases. + * This requires of_device_id table. In the same time this will not change the + * actual *device* matching so do not add .of_match_table. + */ +static const struct of_device_id max17042_dt_match[] __used = { + { .compatible = "maxim,max17042", + .data = (void *) MAXIM_DEVICE_TYPE_MAX17042 }, + { .compatible = "maxim,max17047", + .data = (void *) MAXIM_DEVICE_TYPE_MAX17047 }, + { .compatible = "maxim,max17050", + .data = (void *) MAXIM_DEVICE_TYPE_MAX17050 }, + { .compatible = "maxim,max17055", + .data = (void *) MAXIM_DEVICE_TYPE_MAX17055 }, + { .compatible = "maxim,max77849-battery", + .data = (void *) MAXIM_DEVICE_TYPE_MAX17047 }, { }, }; MODULE_DEVICE_TABLE(of, max17042_dt_match); @@ -1204,6 +1251,16 @@ static const struct i2c_device_id max17042_id[] = { }; MODULE_DEVICE_TABLE(i2c, max17042_id); +static const struct platform_device_id max17042_platform_id[] = { + { "max17042", MAXIM_DEVICE_TYPE_MAX17042 }, + { "max17047", MAXIM_DEVICE_TYPE_MAX17047 }, + { "max17050", MAXIM_DEVICE_TYPE_MAX17050 }, + { "max17055", MAXIM_DEVICE_TYPE_MAX17055 }, + { "max77849-battery", MAXIM_DEVICE_TYPE_MAX17047 }, + { } +}; +MODULE_DEVICE_TABLE(platform, max17042_platform_id); + static struct i2c_driver max17042_i2c_driver = { .driver = { .name = "max17042", @@ -1211,10 +1268,44 @@ static struct i2c_driver max17042_i2c_driver = { .of_match_table = of_match_ptr(max17042_dt_match), .pm = &max17042_pm_ops, }, - .probe = max17042_probe, + .probe = max17042_i2c_probe, .id_table = max17042_id, }; -module_i2c_driver(max17042_i2c_driver); + +static struct platform_driver max17042_platform_driver = { + .driver = { + .name = "max17042", + .acpi_match_table = ACPI_PTR(max17042_acpi_match), + .pm = &max17042_pm_ops, + }, + .probe = max17042_platform_probe, + .id_table = max17042_platform_id, +}; + +static int __init max17042_init(void) +{ + int ret; + + ret = platform_driver_register(&max17042_platform_driver); + if (ret) + return ret; + + ret = i2c_add_driver(&max17042_i2c_driver); + if (ret) { + platform_driver_unregister(&max17042_platform_driver); + return ret; + } + + return 0; +} +module_init(max17042_init); + +static void __exit max17042_exit(void) +{ + i2c_del_driver(&max17042_i2c_driver); + platform_driver_unregister(&max17042_platform_driver); +} +module_exit(max17042_exit); MODULE_AUTHOR("MyungJoo Ham "); MODULE_DESCRIPTION("MAX17042 Fuel Gauge");