From patchwork Wed Nov 18 23:40:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 1402653 X-Patchwork-Delegate: patchwork@peda.user.lysator.liu.se Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IRh3QYaL; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cbzpj3yLwz9sTL for ; Thu, 19 Nov 2020 10:41:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727171AbgKRXkx (ORCPT ); Wed, 18 Nov 2020 18:40:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727167AbgKRXkw (ORCPT ); Wed, 18 Nov 2020 18:40:52 -0500 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6139BC0613D6 for ; Wed, 18 Nov 2020 15:40:52 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id t18so1921998plo.0 for ; Wed, 18 Nov 2020 15:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KbXmC12vCkyVcsuizMiLb6hd66fnVjvjA5q9X2HN7hs=; b=IRh3QYaLc1sLq4WKPbB+pxnO9Emyq7Ia5jPXAIqMNITYy/CplxB5C9j37uZQq4XFAw blJSwLjOMwCIyFQ5Y0jvSEnxYruEZUQmA/juFOQUUVCFuOFgaMzhji45odXNreNAJq+W jo5Yw3abrXP7N+nh4OxVcfgUZJ9gPvN4KpSdo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KbXmC12vCkyVcsuizMiLb6hd66fnVjvjA5q9X2HN7hs=; b=KEeZ4za6gJGk62KfMzi5yeopEMcL0ahyft3Dl0h5IUGUZOXzT7E5PsbCtesozfruYu Nm2cByPls5+2K5YCfjwy2zH9iRU2VveEgvnQXAmyEInyWd3sliLe3jLbhatZQFIUU7xG +LKcVa+Xq+qdlEKKVcuOXpM9j14WI35sbw/cmQf/yz+9zs32XvE0Mx7pVIJ9r1/ZSxpq cvqkk7xG3+IJlE0SNJPPuwbydCpAoJmJWKYZ2jYpJNAN5ZRNnavfrEUDTnTHTsksoK7g b1CCrYn8lkIhZ7qij+y1Pk58X4R7F1h5wcCMvZRh/8804tVQoarfxpzYn4PS9u+vxoHc 4ddg== X-Gm-Message-State: AOAM533rc/XjbkgU00vOqGInvU3Z75CrspAfvsI6benXc5+kdgqqEulP oPO4S1KrteipIsVhIGMxb5EFPA== X-Google-Smtp-Source: ABdhPJxkVUr5lowpShV5uuRPaBia5ZA6H23xv2nxKwOlLdb2YsZ28cJaydQHLSiTLKhftp93Rc9L7A== X-Received: by 2002:a17:902:9a4c:b029:d6:a250:ab9f with SMTP id x12-20020a1709029a4cb02900d6a250ab9fmr6762939plv.20.1605742851984; Wed, 18 Nov 2020 15:40:51 -0800 (PST) Received: from evgreen-glaptop.cheshire.ch ([2601:646:c780:1404:250:b6ff:fee1:7d4c]) by smtp.gmail.com with ESMTPSA id t200sm5210979pfc.143.2020.11.18.15.40.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Nov 2020 15:40:51 -0800 (PST) From: Evan Green To: Peter Rosin Cc: Andy Shevchenko , Wolfram Sang , Randy Dunlap , Evan Green , Peter Korsgaard , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v3 1/2] i2c: i2c-mux-gpio: Factor out pdev->dev in _probe_dt() Date: Wed, 18 Nov 2020 15:40:24 -0800 Message-Id: <20201118153951.RESEND.v3.1.Ia45846771c63de3f2418d2b9c767cd95938a164c@changeid> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201118234025.376412-1-evgreen@chromium.org> References: <20201118234025.376412-1-evgreen@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Factor out &pdev->dev into a local variable in preparation for the ACPI enablement of this function, which will utilize the variable more. Signed-off-by: Evan Green Acked-by: Peter Rosin --- Changes in v3: - Introduced minor &pdev->dev to dev refactor (Peter) drivers/i2c/muxes/i2c-mux-gpio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 4effe563e9e8d..caaa782b50d83 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -53,6 +53,7 @@ static int i2c_mux_gpio_deselect(struct i2c_mux_core *muxc, u32 chan) static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, struct platform_device *pdev) { + struct device *dev = &pdev->dev; struct device_node *np = pdev->dev.of_node; struct device_node *adapter_np, *child; struct i2c_adapter *adapter; @@ -77,11 +78,11 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, mux->data.n_values = of_get_child_count(np); - values = devm_kcalloc(&pdev->dev, + values = devm_kcalloc(dev, mux->data.n_values, sizeof(*mux->data.values), GFP_KERNEL); if (!values) { - dev_err(&pdev->dev, "Cannot allocate values array"); + dev_err(dev, "Cannot allocate values array"); return -ENOMEM; } From patchwork Wed Nov 18 23:40:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 1402654 X-Patchwork-Delegate: patchwork@peda.user.lysator.liu.se Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UCboUK2a; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cbzpk0GwPz9sTc for ; Thu, 19 Nov 2020 10:41:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727226AbgKRXlA (ORCPT ); Wed, 18 Nov 2020 18:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726847AbgKRXlA (ORCPT ); Wed, 18 Nov 2020 18:41:00 -0500 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2891C0613D4 for ; Wed, 18 Nov 2020 15:40:59 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id j19so2481757pgg.5 for ; Wed, 18 Nov 2020 15:40:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GUNYTlRoxTShJaXBCFij617nWR8IGqxqOLzeQGRazD4=; b=UCboUK2a2V4QL6IpRSxdyNWmJNtbg6YgJSaC2q9+GijH/CvsXObYIuVqXRfM2bgvTJ VSp5eAkU+GNliNGBV/z1/sWeNa4zqpbA/g3kubC3GPrb9lZvq2/EBE47i7XW0tTV9FP6 bXbdxdTQQXnV6ZEuQULhLzbaUXGA/EM+mEbVA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GUNYTlRoxTShJaXBCFij617nWR8IGqxqOLzeQGRazD4=; b=PtWyBy5nx4quUFWGpG0QqMMr+61ZDfH9CLxtb7bQzXbeQU+hCfyw3BljWtb6PjeTsV xHlFYCsyHbH9mve8slxioCFxfQTD3fvKowZXqYv1RQR1i8sUNrmauzze/AhX7OVedMEP 2uxeXMVDRaxdTt2wzCo5MsbtXgjHTXZuffmZ8Xssf/PR7tJnsO2hZZpVBpKtbIMhk+Hz dKcRtE+97V7seCoCxnguiIdlu1bS3qRhvArI/2XP+34UG36k5G8h+mUK1p9ONsW/TRPI vtlOh1UeysxT+WGklaKNqqzb4UlfsQAn/zQ4dw8BnWMHfy6YbyB87RprXaIGOXTdKtBZ df4g== X-Gm-Message-State: AOAM531N+wZYaR4+fKtsSUyfuAiRVOzcI4GIeoJbqlvBpNnLMajE5Eeh +T9LZUn5VK6srmIuGBGfynrfUw== X-Google-Smtp-Source: ABdhPJyBXpH8+Vhc6lbduBkiETriLLO5FBOGdoei5wuyD0wjVw9/nLcOQaAubkNQ9sKwYvZXHDXgfA== X-Received: by 2002:a63:f404:: with SMTP id g4mr10525718pgi.144.1605742859205; Wed, 18 Nov 2020 15:40:59 -0800 (PST) Received: from evgreen-glaptop.cheshire.ch ([2601:646:c780:1404:250:b6ff:fee1:7d4c]) by smtp.gmail.com with ESMTPSA id t200sm5210979pfc.143.2020.11.18.15.40.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Nov 2020 15:40:58 -0800 (PST) From: Evan Green To: Peter Rosin Cc: Andy Shevchenko , Wolfram Sang , Randy Dunlap , Evan Green , Peter Korsgaard , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v3 2/2] i2c: i2c-mux-gpio: Enable this driver in ACPI land Date: Wed, 18 Nov 2020 15:40:25 -0800 Message-Id: <20201118153951.RESEND.v3.2.Idef164c23d326f5e5edecfc5d3eb2a68fcf18be1@changeid> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201118234025.376412-1-evgreen@chromium.org> References: <20201118234025.376412-1-evgreen@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Enable i2c-mux-gpio devices to be defined via ACPI. The idle-state property translates directly to a fwnode_property_*() call. The child reg property translates naturally into _ADR in ACPI. The i2c-parent binding is a relic from the days when the bindings dictated that all direct children of an I2C controller had to be I2C devices. These days that's no longer required. The i2c-mux can sit as a direct child of its parent controller, which is where it makes the most sense from a hardware description perspective. For the ACPI implementation we'll assume that's always how the i2c-mux-gpio is instantiated. Signed-off-by: Evan Green Acked-by: Peter Rosin --- Changes in v3: - Update commit message again (Peter) - Added missing \n (Peter) - adr64 overflow check (Peter) - Don't initialize child (Peter) - Limit scope of dev_handle (Peter) Changes in v2: - Make it compile properly when !CONFIG_ACPI (Randy) - Update commit message regarding i2c-parent (Peter) drivers/i2c/muxes/i2c-mux-gpio.c | 107 +++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 28 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index caaa782b50d83..bac415a52b780 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -49,35 +49,85 @@ static int i2c_mux_gpio_deselect(struct i2c_mux_core *muxc, u32 chan) return 0; } -#ifdef CONFIG_OF -static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, - struct platform_device *pdev) +#ifdef CONFIG_ACPI + +static int i2c_mux_gpio_get_acpi_adr(struct device *dev, + struct fwnode_handle *fwdev, + unsigned int *adr) + +{ + unsigned long long adr64; + acpi_status status; + + status = acpi_evaluate_integer(ACPI_HANDLE_FWNODE(fwdev), + METHOD_NAME__ADR, + NULL, &adr64); + + if (!ACPI_SUCCESS(status)) { + dev_err(dev, "Cannot get address\n"); + return -EINVAL; + } + + *adr = adr64; + if (*adr != adr64) { + dev_err(dev, "Address out of range\n"); + return -ERANGE; + } + + return 0; +} + +#else + +static int i2c_mux_gpio_get_acpi_adr(struct device *dev, + struct fwnode_handle *fwdev, + unsigned int *adr) +{ + return -EINVAL; +} + +#endif + +static int i2c_mux_gpio_probe_fw(struct gpiomux *mux, + struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *np = pdev->dev.of_node; - struct device_node *adapter_np, *child; - struct i2c_adapter *adapter; + struct device_node *np = dev->of_node; + struct device_node *adapter_np; + struct i2c_adapter *adapter = NULL; + struct fwnode_handle *child; unsigned *values; - int i = 0; + int rc, i = 0; + + if (is_of_node(dev->fwnode)) { + if (!np) + return -ENODEV; - if (!np) - return -ENODEV; + adapter_np = of_parse_phandle(np, "i2c-parent", 0); + if (!adapter_np) { + dev_err(&pdev->dev, "Cannot parse i2c-parent\n"); + return -ENODEV; + } + adapter = of_find_i2c_adapter_by_node(adapter_np); + of_node_put(adapter_np); + + } else if (is_acpi_node(dev->fwnode)) { + /* + * In ACPI land the mux should be a direct child of the i2c + * bus it muxes. + */ + acpi_handle dev_handle = ACPI_HANDLE(dev->parent); - adapter_np = of_parse_phandle(np, "i2c-parent", 0); - if (!adapter_np) { - dev_err(&pdev->dev, "Cannot parse i2c-parent\n"); - return -ENODEV; + adapter = i2c_acpi_find_adapter_by_handle(dev_handle); } - adapter = of_find_i2c_adapter_by_node(adapter_np); - of_node_put(adapter_np); + if (!adapter) return -EPROBE_DEFER; mux->data.parent = i2c_adapter_id(adapter); put_device(&adapter->dev); - mux->data.n_values = of_get_child_count(np); - + mux->data.n_values = device_get_child_node_count(dev); values = devm_kcalloc(dev, mux->data.n_values, sizeof(*mux->data.values), GFP_KERNEL); @@ -86,24 +136,25 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, return -ENOMEM; } - for_each_child_of_node(np, child) { - of_property_read_u32(child, "reg", values + i); + device_for_each_child_node(dev, child) { + if (is_of_node(child)) { + fwnode_property_read_u32(child, "reg", values + i); + + } else if (is_acpi_node(child)) { + rc = i2c_mux_gpio_get_acpi_adr(dev, child, values + i); + if (rc) + return rc; + } + i++; } mux->data.values = values; - if (of_property_read_u32(np, "idle-state", &mux->data.idle)) + if (fwnode_property_read_u32(dev->fwnode, "idle-state", &mux->data.idle)) mux->data.idle = I2C_MUX_GPIO_NO_IDLE; return 0; } -#else -static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, - struct platform_device *pdev) -{ - return 0; -} -#endif static int i2c_mux_gpio_probe(struct platform_device *pdev) { @@ -119,7 +170,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev) return -ENOMEM; if (!dev_get_platdata(&pdev->dev)) { - ret = i2c_mux_gpio_probe_dt(mux, pdev); + ret = i2c_mux_gpio_probe_fw(mux, pdev); if (ret < 0) return ret; } else {