Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752241AbdHFMji (ORCPT ); Sun, 6 Aug 2017 08:39:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49454 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704AbdHFMgR (ORCPT ); Sun, 6 Aug 2017 08:36:17 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D0F9D80F94 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=hdegoede@redhat.com From: Hans de Goede To: Darren Hart , Andy Shevchenko , Wolfram Sang , Sebastian Reichel , Greg Kroah-Hartman , Guenter Roeck , Heikki Krogerus Cc: Hans de Goede , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, Liam Breck , Tony Lindgren , linux-pm@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 06/18] staging: typec: fusb302: Get max snk mv/ma/mw from device-properties Date: Sun, 6 Aug 2017 14:35:43 +0200 Message-Id: <20170806123555.5124-7-hdegoede@redhat.com> In-Reply-To: <20170806123555.5124-1-hdegoede@redhat.com> References: <20170806123555.5124-1-hdegoede@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sun, 06 Aug 2017 12:36:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2989 Lines: 84 This is board specific info so it should come from board config, such as devicetree. I've chosen to prefix these with "fcs," treating them as fusb302 driver specific. We may want to revisit to replace these with properties which are part of a (to be written) generic type-c controller devicetree binding. Signed-off-by: Hans de Goede --- drivers/staging/typec/TODO | 5 +++++ drivers/staging/typec/fusb302/fusb302.c | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO index bc1f97a2d1bf..98b0dbd5752b 100644 --- a/drivers/staging/typec/TODO +++ b/drivers/staging/typec/TODO @@ -11,5 +11,10 @@ tcpm: tcpci: - Test with real hardware +fusb302: +- We may want to replace the "fcs,max-snk-mv", "fcs,max-snk-ma", + "fcs,max-snk-mw" and "fcs,operating-snk-mw" device(tree) properties with + properties which are part of a generic type-c controller devicetree binding. + Please send patches to Guenter Roeck and copy Heikki Krogerus . diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c index 6baed06a3c0d..8ceaef8ecf17 100644 --- a/drivers/staging/typec/fusb302/fusb302.c +++ b/drivers/staging/typec/fusb302/fusb302.c @@ -90,6 +90,7 @@ struct fusb302_chip { struct i2c_client *i2c_client; struct tcpm_port *tcpm_port; struct tcpc_dev tcpc_dev; + struct tcpc_config tcpc_config; struct regulator *vbus; @@ -1198,7 +1199,6 @@ static const struct tcpc_config fusb302_tcpc_config = { static void init_tcpc_dev(struct tcpc_dev *fusb302_tcpc_dev) { - fusb302_tcpc_dev->config = &fusb302_tcpc_config; fusb302_tcpc_dev->init = tcpm_init; fusb302_tcpc_dev->get_vbus = tcpm_get_vbus; fusb302_tcpc_dev->set_cc = tcpm_set_cc; @@ -1684,7 +1684,9 @@ static int fusb302_probe(struct i2c_client *client, { struct fusb302_chip *chip; struct i2c_adapter *adapter; + struct device *dev = &client->dev; int ret = 0; + u32 val; adapter = to_i2c_adapter(client->dev.parent); if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) { @@ -1699,8 +1701,22 @@ static int fusb302_probe(struct i2c_client *client, chip->i2c_client = client; i2c_set_clientdata(client, chip); chip->dev = &client->dev; + chip->tcpc_config = fusb302_tcpc_config; + chip->tcpc_dev.config = &chip->tcpc_config; mutex_init(&chip->lock); + if (device_property_read_u32(dev, "fcs,max-snk-mv", &val) == 0) + chip->tcpc_config.max_snk_mv = val; + + if (device_property_read_u32(dev, "fcs,max-snk-ma", &val) == 0) + chip->tcpc_config.max_snk_ma = val; + + if (device_property_read_u32(dev, "fcs,max-snk-mw", &val) == 0) + chip->tcpc_config.max_snk_mw = val; + + if (device_property_read_u32(dev, "fcs,operating-snk-mw", &val) == 0) + chip->tcpc_config.operating_snk_mw = val; + ret = fusb302_debugfs_init(chip); if (ret < 0) return ret; -- 2.13.3