From patchwork Wed Mar 10 10:46:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 397154 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, 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 AC7FBC433DB for ; Wed, 10 Mar 2021 10:47:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 719C664FE1 for ; Wed, 10 Mar 2021 10:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232585AbhCJKqm (ORCPT ); Wed, 10 Mar 2021 05:46:42 -0500 Received: from mga05.intel.com ([192.55.52.43]:7688 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232471AbhCJKqY (ORCPT ); Wed, 10 Mar 2021 05:46:24 -0500 IronPort-SDR: QmUlBH2fK7e8KEd8Iy3fJkqVOSoIBKgfFoiFvTyqYw88Q6MJrYLxoYbjIfbmUuycXXOfTG0Pxp HRpUneebUaBw== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="273475504" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="273475504" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 02:46:20 -0800 IronPort-SDR: ApU4qK6LtOIro+Kf5cwj0tzPJAzYmtNqJjM7njPUT90k7eEBWcWjst0TLAQhQouOsvnxvrLgCk jonrzWjrgvvQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="509624562" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 10 Mar 2021 02:46:19 -0800 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Subject: [PATCH 1/3] usb: typec: tps6598x: Fix tracepoint header file Date: Wed, 10 Mar 2021 13:46:28 +0300 Message-Id: <20210310104630.77945-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> References: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org There were two typos in the precompiler conditions. Fixes: 65a2f67d9945 ("usb: typec: tps6598x: Add trace event for IRQ events") Signed-off-by: Heikki Krogerus --- drivers/usb/typec/tps6598x_trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/tps6598x_trace.h b/drivers/usb/typec/tps6598x_trace.h index 38bfb2f04e46d..21917751d61ee 100644 --- a/drivers/usb/typec/tps6598x_trace.h +++ b/drivers/usb/typec/tps6598x_trace.h @@ -9,7 +9,7 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM tps6598x -#if !defined(_TPS6598x_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) +#if !defined(_TPS6598X_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) #define _TPS6598X_TRACE_H_ #include "tps6598x.h" @@ -276,7 +276,7 @@ TRACE_EVENT(tps6598x_data_status, #endif /* _TPS6598X_TRACE_H_ */ /* This part must be outside protection */ -#undef TRACE_INCLUDE_PATH +#undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE tps6598x_trace #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . From patchwork Wed Mar 10 10:46:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 398135 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, 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 46C20C43331 for ; Wed, 10 Mar 2021 10:47:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C930A64FE1 for ; Wed, 10 Mar 2021 10:47:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232548AbhCJKql (ORCPT ); Wed, 10 Mar 2021 05:46:41 -0500 Received: from mga05.intel.com ([192.55.52.43]:7693 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232479AbhCJKqY (ORCPT ); Wed, 10 Mar 2021 05:46:24 -0500 IronPort-SDR: ll5occjZCgfP0SfP2S8egqtCuxI7m+TZqs96F2+YQgu1wqi9w2RLHTTtiUKxESIHXMfkmrZnOt Q7+PGlugrz9w== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="273475515" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="273475515" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 02:46:22 -0800 IronPort-SDR: HED9vh6w4cbmKlzQ7FW161o/QwLYWx+iHKz3hbKx4nN5I5eYwDi07deKu9sSVEm4LAwoNSJK4G cy8zhtLluUEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="509624568" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 10 Mar 2021 02:46:20 -0800 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Subject: [PATCH 2/3] usb: typec: tps6598x: Move the driver under its own subdirectory Date: Wed, 10 Mar 2021 13:46:29 +0300 Message-Id: <20210310104630.77945-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> References: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The driver consist of multiple files. Grouping all of them under a separate directory drivers/usb/typec/tipd/. Signed-off-by: Heikki Krogerus --- drivers/usb/typec/Kconfig | 15 ++------------- drivers/usb/typec/Makefile | 5 +---- drivers/usb/typec/tipd/Kconfig | 12 ++++++++++++ drivers/usb/typec/tipd/Makefile | 4 ++++ drivers/usb/typec/{ => tipd}/tps6598x.c | 0 drivers/usb/typec/{ => tipd}/tps6598x.h | 0 drivers/usb/typec/{ => tipd}/tps6598x_trace.h | 0 7 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 drivers/usb/typec/tipd/Kconfig create mode 100644 drivers/usb/typec/tipd/Makefile rename drivers/usb/typec/{ => tipd}/tps6598x.c (100%) rename drivers/usb/typec/{ => tipd}/tps6598x.h (100%) rename drivers/usb/typec/{ => tipd}/tps6598x_trace.h (100%) diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig index 270e81c087e92..a0418f23b4aae 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -50,6 +50,8 @@ source "drivers/usb/typec/tcpm/Kconfig" source "drivers/usb/typec/ucsi/Kconfig" +source "drivers/usb/typec/tipd/Kconfig" + config TYPEC_HD3SS3220 tristate "TI HD3SS3220 Type-C DRP Port controller driver" depends on I2C @@ -61,19 +63,6 @@ config TYPEC_HD3SS3220 If you choose to build this driver as a dynamically linked module, the module will be called hd3ss3220.ko. -config TYPEC_TPS6598X - tristate "TI TPS6598x USB Power Delivery controller driver" - depends on I2C - select POWER_SUPPLY - select REGMAP_I2C - select USB_ROLE_SWITCH - help - Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power - Delivery controller. - - If you choose to build this driver as a dynamically linked module, the - module will be called tps6598x.ko. - config TYPEC_STUSB160X tristate "STMicroelectronics STUSB160x Type-C controller driver" depends on I2C diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 27aa121291907..1fb8b6668b1ba 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -1,14 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -# define_trace.h needs to know how to find our header -CFLAGS_tps6598x.o := -I$(src) - obj-$(CONFIG_TYPEC) += typec.o typec-y := class.o mux.o bus.o obj-$(CONFIG_TYPEC) += altmodes/ obj-$(CONFIG_TYPEC_TCPM) += tcpm/ obj-$(CONFIG_TYPEC_UCSI) += ucsi/ +obj-$(CONFIG_TYPEC_TPS6598X) += tipd/ obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o -obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o obj-$(CONFIG_TYPEC) += mux/ diff --git a/drivers/usb/typec/tipd/Kconfig b/drivers/usb/typec/tipd/Kconfig new file mode 100644 index 0000000000000..b827152930728 --- /dev/null +++ b/drivers/usb/typec/tipd/Kconfig @@ -0,0 +1,12 @@ +config TYPEC_TPS6598X + tristate "TI TPS6598x USB Power Delivery controller driver" + depends on I2C + select POWER_SUPPLY + select REGMAP_I2C + select USB_ROLE_SWITCH + help + Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power + Delivery controller. + + If you choose to build this driver as a dynamically linked module, the + module will be called tps6598x.ko. diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makefile new file mode 100644 index 0000000000000..4c19eadb5f466 --- /dev/null +++ b/drivers/usb/typec/tipd/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +CFLAGS_tps6598x.o := -I$(src) + +obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o diff --git a/drivers/usb/typec/tps6598x.c b/drivers/usb/typec/tipd/tps6598x.c similarity index 100% rename from drivers/usb/typec/tps6598x.c rename to drivers/usb/typec/tipd/tps6598x.c diff --git a/drivers/usb/typec/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h similarity index 100% rename from drivers/usb/typec/tps6598x.h rename to drivers/usb/typec/tipd/tps6598x.h diff --git a/drivers/usb/typec/tps6598x_trace.h b/drivers/usb/typec/tipd/tps6598x_trace.h similarity index 100% rename from drivers/usb/typec/tps6598x_trace.h rename to drivers/usb/typec/tipd/tps6598x_trace.h From patchwork Wed Mar 10 10:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 397153 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, 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 D13ECC4160E for ; Wed, 10 Mar 2021 10:47:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B05A864FE4 for ; Wed, 10 Mar 2021 10:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232552AbhCJKqm (ORCPT ); Wed, 10 Mar 2021 05:46:42 -0500 Received: from mga05.intel.com ([192.55.52.43]:7695 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232481AbhCJKqY (ORCPT ); Wed, 10 Mar 2021 05:46:24 -0500 IronPort-SDR: mTUDrahXsfBTYqgqDYxO1jkLhytOQl3DLoFIaV/svV+qzoT6aQyfOZtfoz0cujPMqItaFs8jhx 1+tuCbie6U4Q== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="273475526" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="273475526" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 02:46:23 -0800 IronPort-SDR: 6g/pVKzKbrQ38mKK/76vODT+0OdaU4H4YjTOeJI4epDWJwP9D5V1vLuftv85WTAxAXVJrgym26 RV1Sa1WJ70iA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="509624575" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 10 Mar 2021 02:46:22 -0800 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Subject: [PATCH 3/3] usb: typec: tipd: Separate file for tracepoint creation Date: Wed, 10 Mar 2021 13:46:30 +0300 Message-Id: <20210310104630.77945-4-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> References: <20210310104630.77945-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Creating the tracepoints only when tracing is enabled. Signed-off-by: Heikki Krogerus --- drivers/usb/typec/tipd/Makefile | 4 +++- drivers/usb/typec/tipd/{tps6598x.c => core.c} | 6 ++---- drivers/usb/typec/tipd/trace.c | 9 +++++++++ drivers/usb/typec/tipd/{tps6598x_trace.h => trace.h} | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) rename drivers/usb/typec/tipd/{tps6598x.c => core.c} (99%) create mode 100644 drivers/usb/typec/tipd/trace.c rename drivers/usb/typec/tipd/{tps6598x_trace.h => trace.h} (99%) diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makefile index 4c19eadb5f466..aa439f80a889e 100644 --- a/drivers/usb/typec/tipd/Makefile +++ b/drivers/usb/typec/tipd/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS_tps6598x.o := -I$(src) +CFLAGS_trace.o := -I$(src) obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o +tps6598x-y := core.o +tps6598x-$(CONFIG_TRACING) += trace.o diff --git a/drivers/usb/typec/tipd/tps6598x.c b/drivers/usb/typec/tipd/core.c similarity index 99% rename from drivers/usb/typec/tipd/tps6598x.c rename to drivers/usb/typec/tipd/core.c index 2c4ab90e16e79..9e924db421794 100644 --- a/drivers/usb/typec/tipd/tps6598x.c +++ b/drivers/usb/typec/tipd/core.c @@ -6,8 +6,6 @@ * Author: Heikki Krogerus */ -#include "tps6598x.h" - #include #include #include @@ -17,8 +15,8 @@ #include #include -#define CREATE_TRACE_POINTS -#include "tps6598x_trace.h" +#include "tps6598x.h" +#include "trace.h" /* Register offsets */ #define TPS_REG_VID 0x00 diff --git a/drivers/usb/typec/tipd/trace.c b/drivers/usb/typec/tipd/trace.c new file mode 100644 index 0000000000000..016e68048dc24 --- /dev/null +++ b/drivers/usb/typec/tipd/trace.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * TI TPS6598x USB Power Delivery Controller Trace Support + * + * Copyright (C) 2021, Intel Corporation + * Author: Heikki Krogerus + */ +#define CREATE_TRACE_POINTS +#include "trace.h" diff --git a/drivers/usb/typec/tipd/tps6598x_trace.h b/drivers/usb/typec/tipd/trace.h similarity index 99% rename from drivers/usb/typec/tipd/tps6598x_trace.h rename to drivers/usb/typec/tipd/trace.h index 21917751d61ee..5d09d6f789300 100644 --- a/drivers/usb/typec/tipd/tps6598x_trace.h +++ b/drivers/usb/typec/tipd/trace.h @@ -277,7 +277,7 @@ TRACE_EVENT(tps6598x_data_status, /* This part must be outside protection */ #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE tps6598x_trace +#define TRACE_INCLUDE_FILE trace #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . #include