From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,1/7] i2c: nvidia-gpu: Supply CCGx driver the fw build info From: Heikki Krogerus Message-Id: <20190415120931.61328-2-heikki.krogerus@linux.intel.com> Date: Mon, 15 Apr 2019 15:09:25 +0300 To: Greg Kroah-Hartman Cc: Ajay Gupta , linux-usb@vger.kernel.org List-ID: RnJvbTogQWpheSBHdXB0YSA8YWpheWdAbnZpZGlhLmNvbT4KCkFkZGluZyBkZXZpY2UgcHJvcGVy dHkgImNjZ3gsZmlybXdhcmUtYnVpbGQiIGZvciB0aGUgQ0NHeApkZXZpY2UsIHNvIHRoZSBDQ0d4 IGRyaXZlciBrbm93cyB3aGljaCBmaXJtd2FyZSBiaW5hcnkgdG8KdXNlIGZvciBhIHNwZWNpZmlj IHZlbmRvci4KClN1Z2dlc3RlZC1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNA bGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBamF5IEd1cHRhIDxhamF5Z0BudmlkaWEu Y29tPgpTaWduZWQtb2ZmLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1udmlkaWEtZ3B1LmMgfCA3 ICsrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2kyYy9idXNzZXMvaTJjLW52aWRpYS1ncHUuYyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9p MmMtbnZpZGlhLWdwdS5jCmluZGV4IDRlNjdkNWVkNDgwZS4uMWM4ZjcwOGYyMTJiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2kyYy9idXNzZXMvaTJjLW52aWRpYS1ncHUuYworKysgYi9kcml2ZXJzL2ky Yy9idXNzZXMvaTJjLW52aWRpYS1ncHUuYwpAQCAtMjUzLDYgKzI1MywxMiBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgZ3B1X2kyY19pZHNbXSA9IHsKIH07CiBNT0RVTEVfREVW SUNFX1RBQkxFKHBjaSwgZ3B1X2kyY19pZHMpOwogCitzdGF0aWMgY29uc3Qgc3RydWN0IHByb3Bl cnR5X2VudHJ5IGNjZ3hfcHJvcHNbXSA9IHsKKwkvKiBVc2UgRlcgYnVpbHQgZm9yIE5WSURJQSAo bnYpIG9ubHkgKi8KKwlQUk9QRVJUWV9FTlRSWV9VMTYoImNjZ3gsZmlybXdhcmUtYnVpbGQiLCAo J24nIDw8IDgpIHwgJ3YnKSwKKwl7IH0KK307CisKIHN0YXRpYyBpbnQgZ3B1X3BvcHVsYXRlX2Ns aWVudChzdHJ1Y3QgZ3B1X2kyY19kZXYgKmkyY2QsIGludCBpcnEpCiB7CiAJc3RydWN0IGkyY19j bGllbnQgKmNjZ3hfY2xpZW50OwpAQCAtMjY3LDYgKzI3Myw3IEBAIHN0YXRpYyBpbnQgZ3B1X3Bv cHVsYXRlX2NsaWVudChzdHJ1Y3QgZ3B1X2kyY19kZXYgKmkyY2QsIGludCBpcnEpCiAJCXNpemVv ZihpMmNkLT5ncHVfY2NneF91Y3NpLT50eXBlKSk7CiAJaTJjZC0+Z3B1X2NjZ3hfdWNzaS0+YWRk ciA9IDB4ODsKIAlpMmNkLT5ncHVfY2NneF91Y3NpLT5pcnEgPSBpcnE7CisJaTJjZC0+Z3B1X2Nj Z3hfdWNzaS0+cHJvcGVydGllcyA9IGNjZ3hfcHJvcHM7CiAJY2NneF9jbGllbnQgPSBpMmNfbmV3 X2RldmljZSgmaTJjZC0+YWRhcHRlciwgaTJjZC0+Z3B1X2NjZ3hfdWNzaSk7CiAJaWYgKCFjY2d4 X2NsaWVudCkKIAkJcmV0dXJuIC1FTk9ERVY7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3DAAC10F0E for ; Mon, 15 Apr 2019 12:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4DD62075B for ; Mon, 15 Apr 2019 12:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbfDOMJg (ORCPT ); Mon, 15 Apr 2019 08:09:36 -0400 Received: from mga12.intel.com ([192.55.52.136]:10510 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbfDOMJf (ORCPT ); Mon, 15 Apr 2019 08:09:35 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Apr 2019 05:09:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,353,1549958400"; d="scan'208";a="164850769" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 15 Apr 2019 05:09:33 -0700 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: Ajay Gupta , linux-usb@vger.kernel.org Subject: [PATCH v2 1/7] i2c: nvidia-gpu: Supply CCGx driver the fw build info Date: Mon, 15 Apr 2019 15:09:25 +0300 Message-Id: <20190415120931.61328-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190415120931.61328-1-heikki.krogerus@linux.intel.com> References: <20190415120931.61328-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190415120925.k73dejRlsWL41B_GmfYc62BWez3XTCLBCXAKy_xCxy4@z> From: Ajay Gupta Adding device property "ccgx,firmware-build" for the CCGx device, so the CCGx driver knows which firmware binary to use for a specific vendor. Suggested-by: Heikki Krogerus Signed-off-by: Ajay Gupta Signed-off-by: Heikki Krogerus --- drivers/i2c/busses/i2c-nvidia-gpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 4e67d5ed480e..1c8f708f212b 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -253,6 +253,12 @@ static const struct pci_device_id gpu_i2c_ids[] = { }; MODULE_DEVICE_TABLE(pci, gpu_i2c_ids); +static const struct property_entry ccgx_props[] = { + /* Use FW built for NVIDIA (nv) only */ + PROPERTY_ENTRY_U16("ccgx,firmware-build", ('n' << 8) | 'v'), + { } +}; + static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq) { struct i2c_client *ccgx_client; @@ -267,6 +273,7 @@ static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq) sizeof(i2cd->gpu_ccgx_ucsi->type)); i2cd->gpu_ccgx_ucsi->addr = 0x8; i2cd->gpu_ccgx_ucsi->irq = irq; + i2cd->gpu_ccgx_ucsi->properties = ccgx_props; ccgx_client = i2c_new_device(&i2cd->adapter, i2cd->gpu_ccgx_ucsi); if (!ccgx_client) return -ENODEV; -- 2.20.1