From patchwork Tue Feb 19 11:59:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 10819761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54286139A for ; Tue, 19 Feb 2019 12:00:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40F342B78B for ; Tue, 19 Feb 2019 12:00:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 341942B77E; Tue, 19 Feb 2019 12:00:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B49C72B77E for ; Tue, 19 Feb 2019 12:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728159AbfBSMAX (ORCPT ); Tue, 19 Feb 2019 07:00:23 -0500 Received: from mga01.intel.com ([192.55.52.88]:38297 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726947AbfBSMAJ (ORCPT ); Tue, 19 Feb 2019 07:00:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 04:00:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,388,1544515200"; d="scan'208";a="148009291" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 19 Feb 2019 04:00:02 -0800 From: Heikki Krogerus To: Andy Shevchenko , Hans de Goede Cc: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Date: Tue, 19 Feb 2019 14:59:58 +0300 Message-Id: <20190219115959.55553-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219115959.55553-1-heikki.krogerus@linux.intel.com> References: <20190219115959.55553-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In ACPI, and now also in DT, the USB connectors usually have their own device nodes. In case of USB Type-C, those connector (port) nodes are child nodes of the controller or PHY device, in our case the fusb302. The software fwnodes allow us to create a similar child node for fusb302 that represents the connector also on Intel CHT. This makes it possible replace the fusb302 specific device properties which were deprecated with the common USB connector properties that tcpm.c is able to use directly. Signed-off-by: Heikki Krogerus --- drivers/platform/x86/intel_cht_int33fe.c | 48 ++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 6fa3cced6f8e..4857a57cfff5 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -24,6 +24,7 @@ #include #include #include +#include #define EXPECTED_PTYPE 4 @@ -31,6 +32,8 @@ struct cht_int33fe_data { struct i2c_client *max17047; struct i2c_client *fusb302; struct i2c_client *pi3usb30532; + struct fwnode_handle *port_node; + struct fwnode_handle *fusb302_node; /* Contain a list-head must be per device */ struct device_connection connections[4]; }; @@ -80,9 +83,29 @@ static const struct property_entry max17047_props[] = { static const struct property_entry fusb302_props[] = { PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), - PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000), + { } +}; + +#define PDO_FIXED_FLAGS \ + (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM) + +static const u32 src_pdo[] = { + PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS), +}; + +static const u32 snk_pdo[] = { + PDO_FIXED(5000, 400, PDO_FIXED_FLAGS), + PDO_VAR(5000, 12000, 3000), +}; + +static const struct property_entry usb_connector_props[] = { + PROPERTY_ENTRY_STRING("name", "connector"), + PROPERTY_ENTRY_STRING("data-role", "dual"), + PROPERTY_ENTRY_STRING("power-role", "dual"), + PROPERTY_ENTRY_STRING("try-power-role", "sink"), + PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo), + PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo), + PROPERTY_ENTRY_U32("op-sink-microwatt", 36000000), { } }; @@ -151,6 +174,19 @@ static int cht_int33fe_probe(struct platform_device *pdev) if (!data) return -ENOMEM; + /* Node for the FUSB302 controller */ + data->fusb302_node = fwnode_create_software_node(fusb302_props, NULL); + if (IS_ERR(data->fusb302_node)) + return PTR_ERR(data->fusb302_node); + + /* Node for the connector (FUSB302 is the parent) */ + data->port_node = fwnode_create_software_node(usb_connector_props, + data->fusb302_node); + if (IS_ERR(data->port_node)) { + fwnode_remove_software_node(data->fusb302_node); + return PTR_ERR(data->port_node); + } + /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ max17047 = cht_int33fe_find_max17047(); if (max17047) { @@ -187,7 +223,7 @@ static int cht_int33fe_probe(struct platform_device *pdev) memset(&board_info, 0, sizeof(board_info)); strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE); board_info.dev_name = "fusb302"; - board_info.properties = fusb302_props; + board_info.fwnode = data->fusb302_node; board_info.irq = fusb302_irq; data->fusb302 = i2c_acpi_new_device(dev, 2, &board_info); @@ -217,6 +253,8 @@ static int cht_int33fe_probe(struct platform_device *pdev) i2c_unregister_device(data->max17047); device_connections_remove(data->connections); + fwnode_remove_software_node(data->port_node); + fwnode_remove_software_node(data->fusb302_node); return ret; } @@ -230,6 +268,8 @@ static int cht_int33fe_remove(struct platform_device *pdev) i2c_unregister_device(data->max17047); device_connections_remove(data->connections); + fwnode_remove_software_node(data->port_node); + fwnode_remove_software_node(data->fusb302_node); return 0; } From patchwork Tue Feb 19 11:59:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 10819759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A3706C2 for ; Tue, 19 Feb 2019 12:00:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB21029FF4 for ; Tue, 19 Feb 2019 12:00:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD42B2B77E; Tue, 19 Feb 2019 12:00:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6676429FF4 for ; Tue, 19 Feb 2019 12:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728408AbfBSMAJ (ORCPT ); Tue, 19 Feb 2019 07:00:09 -0500 Received: from mga01.intel.com ([192.55.52.88]:38297 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728347AbfBSMAJ (ORCPT ); Tue, 19 Feb 2019 07:00:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 04:00:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,388,1544515200"; d="scan'208";a="148009350" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 19 Feb 2019 04:00:04 -0800 From: Heikki Krogerus To: Andy Shevchenko , Hans de Goede Cc: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] platform/x86: intel_cht_int33fe: Create fwnode for max17047 Date: Tue, 19 Feb 2019 14:59:59 +0300 Message-Id: <20190219115959.55553-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219115959.55553-1-heikki.krogerus@linux.intel.com> References: <20190219115959.55553-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Creating a software node for max17047 when ACPI tables don't have a device node for it. While here, moving max17047 handling to its own function. Signed-off-by: Heikki Krogerus --- drivers/platform/x86/intel_cht_int33fe.c | 86 +++++++++++++++--------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 4857a57cfff5..81721976b00c 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -34,6 +34,7 @@ struct cht_int33fe_data { struct i2c_client *pi3usb30532; struct fwnode_handle *port_node; struct fwnode_handle *fusb302_node; + struct fwnode_handle *max17047_node; /* Contain a list-head must be per device */ struct device_connection connections[4]; }; @@ -66,14 +67,6 @@ static int cht_int33fe_check_for_max17047(struct device *dev, void *data) return 1; } -static struct i2c_client *cht_int33fe_find_max17047(void) -{ - struct i2c_client *max17047 = NULL; - - i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047); - return max17047; -} - static const char * const max17047_suppliers[] = { "bq24190-charger" }; static const struct property_entry max17047_props[] = { @@ -81,6 +74,43 @@ static const struct property_entry max17047_props[] = { { } }; +static int +cht_int33fe_max17047(struct device *dev, struct cht_int33fe_data *data) +{ + struct i2c_client *max17047 = NULL; + struct i2c_board_info board_info; + int ret; + + i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047); + if (max17047) { + /* Pre-existing i2c-client for the max17047, add device-props */ + ret = device_add_properties(&max17047->dev, max17047_props); + if (ret) + return ret; + /* And re-probe to get the new device-props applied. */ + ret = device_reprobe(&max17047->dev); + if (ret) + dev_warn(dev, "Reprobing max17047 error: %d\n", ret); + return 0; + } + + data->max17047_node = fwnode_create_software_node(max17047_props, NULL); + if (IS_ERR(data->max17047_node)) + return PTR_ERR(data->max17047_node); + + memset(&board_info, 0, sizeof(board_info)); + strlcpy(board_info.type, "max17047", I2C_NAME_SIZE); + board_info.dev_name = "max17047"; + board_info.fwnode = data->max17047_node; + data->max17047 = i2c_acpi_new_device(dev, 1, &board_info); + if (IS_ERR(data->max17047)) { + fwnode_remove_software_node(data->max17047_node); + return PTR_ERR(data->max17047); + } + + return 0; +} + static const struct property_entry fusb302_props[] = { PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), { } @@ -114,7 +144,6 @@ static int cht_int33fe_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct i2c_board_info board_info; struct cht_int33fe_data *data; - struct i2c_client *max17047; struct regulator *regulator; unsigned long long ptyp; acpi_status status; @@ -174,38 +203,25 @@ static int cht_int33fe_probe(struct platform_device *pdev) if (!data) return -ENOMEM; + /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ + ret = cht_int33fe_max17047(dev, data); + if (ret) + return ret; + /* Node for the FUSB302 controller */ data->fusb302_node = fwnode_create_software_node(fusb302_props, NULL); - if (IS_ERR(data->fusb302_node)) - return PTR_ERR(data->fusb302_node); + if (IS_ERR(data->fusb302_node)) { + ret = PTR_ERR(data->fusb302_node); + goto out_remove_max17047_node; + } /* Node for the connector (FUSB302 is the parent) */ data->port_node = fwnode_create_software_node(usb_connector_props, data->fusb302_node); if (IS_ERR(data->port_node)) { fwnode_remove_software_node(data->fusb302_node); - return PTR_ERR(data->port_node); - } - - /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ - max17047 = cht_int33fe_find_max17047(); - if (max17047) { - /* Pre-existing i2c-client for the max17047, add device-props */ - ret = device_add_properties(&max17047->dev, max17047_props); - if (ret) - return ret; - /* And re-probe to get the new device-props applied. */ - ret = device_reprobe(&max17047->dev); - if (ret) - dev_warn(dev, "Reprobing max17047 error: %d\n", ret); - } else { - memset(&board_info, 0, sizeof(board_info)); - strlcpy(board_info.type, "max17047", I2C_NAME_SIZE); - board_info.dev_name = "max17047"; - board_info.properties = max17047_props; - data->max17047 = i2c_acpi_new_device(dev, 1, &board_info); - if (IS_ERR(data->max17047)) - return PTR_ERR(data->max17047); + ret = PTR_ERR(data->port_node); + goto out_remove_max17047_node; } data->connections[0].endpoint[0] = "port0"; @@ -256,6 +272,9 @@ static int cht_int33fe_probe(struct platform_device *pdev) fwnode_remove_software_node(data->port_node); fwnode_remove_software_node(data->fusb302_node); +out_remove_max17047_node: + fwnode_remove_software_node(data->max17047_node); + return ret; } @@ -270,6 +289,7 @@ static int cht_int33fe_remove(struct platform_device *pdev) device_connections_remove(data->connections); fwnode_remove_software_node(data->port_node); fwnode_remove_software_node(data->fusb302_node); + fwnode_remove_software_node(data->max17047_node); return 0; }