From nobody Sun Feb 8 01:33:47 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0760C7BAEC for ; Fri, 9 Feb 2024 16:03:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707494621; cv=none; b=hdpSzqg+4qQujqF7GL7GnDShrGf0MXAob+iVrg3rK/mXzHqEIrlX7VaNYiyjtop5xU1ECCE2RXjdT4k/1viMGLqm57UrQZn+WWS9LayaYuNd5LXL4DFc/y0Q26q+4oqhUWruR7GJEtLn7x18ryGYZmme9qPaXejsAMWGP0pFA8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707494621; c=relaxed/simple; bh=oFboq00H8ywFMlj9Lu+qJdyelySfWg8PLVHXZ2Kn1ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qAQoOwNnq7uP0koEsEc74M66QayU2tnnmgWa2bbzUr2W9thsn3oYowxFWxyoLCVVjdOwCl4KbFtqIEQBPk1+p3bIalL2YjZWosz0OtuFIwZPjQIQQ3yT1RwUirKyDmegs1pS3U/OLQOJtvHGAlN3+/luZlZMkN/sOlFM9LaRl1A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=IBwbBdxC; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IBwbBdxC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707494620; x=1739030620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oFboq00H8ywFMlj9Lu+qJdyelySfWg8PLVHXZ2Kn1ao=; b=IBwbBdxCCJ/EeGEQNBEhPNzwpfpzypVLhrIFs/WEiJoRarfMpX4n1FvB xh7O+ICVrcbDLHRzM6SEIcOM50af2MjJAc2r+4EesvskrNgusPf5nuYbr xiu2lfaqRz+pQG39Rco0sTdMZfuIyf49gLdRck+KJ05JojeYcq6dkGADc rSLKrIbLUgT9CjaC3dmNsnLgrLK0RlB6k1mYHH8s8kNVHVmKldl940ns0 ob8aZQDz8Itaay4e1AQkvcWgJPd58rAOlQW/psYOY8m0aReWDeD4I8plT 2azKFrByTauqHCCexhAsqholhbMqfA6fp2cEk3JontLP5b9DZFhCy1wYz Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="4432015" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="4432015" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 08:03:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="934459657" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="934459657" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 09 Feb 2024 08:03:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8E3BAF7; Fri, 9 Feb 2024 18:03:36 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Vinod Koul , Kishon Vijay Abraham I Subject: [PATCH v1 1/2] phy: ti: tusb1210: Use temporary variable for struct device Date: Fri, 9 Feb 2024 18:02:14 +0200 Message-ID: <20240209160334.2304230-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240209160334.2304230-1-andriy.shevchenko@linux.intel.com> References: <20240209160334.2304230-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use temporary variable for struct device to make code neater. Signed-off-by: Andy Shevchenko --- drivers/phy/ti/phy-tusb1210.c | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/phy/ti/phy-tusb1210.c b/drivers/phy/ti/phy-tusb1210.c index b4881cb34475..7232b104a62d 100644 --- a/drivers/phy/ti/phy-tusb1210.c +++ b/drivers/phy/ti/phy-tusb1210.c @@ -52,7 +52,7 @@ enum tusb1210_chg_det_state { }; =20 struct tusb1210 { - struct ulpi *ulpi; + struct device *dev; struct phy *phy; struct gpio_desc *gpio_reset; struct gpio_desc *gpio_cs; @@ -71,26 +71,27 @@ struct tusb1210 { =20 static int tusb1210_ulpi_write(struct tusb1210 *tusb, u8 reg, u8 val) { + struct device *dev =3D tusb->dev; int ret; =20 - ret =3D ulpi_write(tusb->ulpi, reg, val); + ret =3D ulpi_write(to_ulpi_dev(dev), reg, val); if (ret) - dev_err(&tusb->ulpi->dev, "error %d writing val 0x%02x to reg 0x%02x\n", - ret, val, reg); + dev_err(dev, "error %d writing val 0x%02x to reg 0x%02x\n", ret, val, re= g); =20 return ret; } =20 static int tusb1210_ulpi_read(struct tusb1210 *tusb, u8 reg, u8 *val) { + struct device *dev =3D tusb->dev; int ret; =20 - ret =3D ulpi_read(tusb->ulpi, reg); + ret =3D ulpi_read(to_ulpi_dev(dev), reg); if (ret >=3D 0) { *val =3D ret; ret =3D 0; } else { - dev_err(&tusb->ulpi->dev, "error %d reading reg 0x%02x\n", ret, reg); + dev_err(dev, "error %d reading reg 0x%02x\n", ret, reg); } =20 return ret; @@ -178,7 +179,7 @@ static void tusb1210_reset(struct tusb1210 *tusb) static void tusb1210_chg_det_set_type(struct tusb1210 *tusb, enum power_supply_usb_type type) { - dev_dbg(&tusb->ulpi->dev, "charger type: %d\n", type); + dev_dbg(tusb->dev, "charger type: %d\n", type); tusb->chg_type =3D type; tusb->chg_det_retries =3D 0; power_supply_changed(tusb->psy); @@ -189,7 +190,7 @@ static void tusb1210_chg_det_set_state(struct tusb1210 = *tusb, int delay_ms) { if (delay_ms) - dev_dbg(&tusb->ulpi->dev, "chg_det new state %s in %d ms\n", + dev_dbg(tusb->dev, "chg_det new state %s in %d ms\n", tusb1210_chg_det_states[new_state], delay_ms); =20 tusb->chg_det_state =3D new_state; @@ -253,7 +254,7 @@ static void tusb1210_chg_det_work(struct work_struct *w= ork) int ret; u8 val; =20 - dev_dbg(&tusb->ulpi->dev, "chg_det state %s vbus_present %d\n", + dev_dbg(tusb->dev, "chg_det state %s vbus_present %d\n", tusb1210_chg_det_states[tusb->chg_det_state], vbus_present); =20 switch (tusb->chg_det_state) { @@ -261,9 +262,9 @@ static void tusb1210_chg_det_work(struct work_struct *w= ork) tusb->chg_type =3D POWER_SUPPLY_USB_TYPE_UNKNOWN; tusb->chg_det_retries =3D 0; /* Power on USB controller for ulpi_read()/_write() */ - ret =3D pm_runtime_resume_and_get(tusb->ulpi->dev.parent); + ret =3D pm_runtime_resume_and_get(tusb->dev->parent); if (ret < 0) { - dev_err(&tusb->ulpi->dev, "error %d runtime-resuming\n", ret); + dev_err(tusb->dev, "error %d runtime-resuming\n", ret); /* Should never happen, skip charger detection */ tusb1210_chg_det_set_state(tusb, TUSB1210_CHG_DET_CONNECTED, 0); return; @@ -332,7 +333,7 @@ static void tusb1210_chg_det_work(struct work_struct *w= ork) =20 mutex_unlock(&tusb->phy->mutex); =20 - pm_runtime_put(tusb->ulpi->dev.parent); + pm_runtime_put(tusb->dev->parent); tusb1210_chg_det_set_state(tusb, TUSB1210_CHG_DET_CONNECTED, 0); break; case TUSB1210_CHG_DET_CONNECTED: @@ -428,13 +429,14 @@ static const struct power_supply_desc tusb1210_psy_de= sc =3D { static void tusb1210_probe_charger_detect(struct tusb1210 *tusb) { struct power_supply_config psy_cfg =3D { .drv_data =3D tusb }; - struct device *dev =3D &tusb->ulpi->dev; + struct device *dev =3D tusb->dev; + struct ulpi *ulpi =3D to_ulpi_dev(dev); int ret; =20 if (!device_property_read_bool(dev->parent, "linux,phy_charger_detect")) return; =20 - if (tusb->ulpi->id.product !=3D 0x1508) { + if (ulpi->id.product !=3D 0x1508) { dev_err(dev, "error charger detection is only supported on the TUSB1211\= n"); return; } @@ -485,25 +487,24 @@ static const struct phy_ops phy_ops =3D { =20 static int tusb1210_probe(struct ulpi *ulpi) { + struct device *dev =3D &ulpi->dev; struct tusb1210 *tusb; u8 val, reg; int ret; =20 - tusb =3D devm_kzalloc(&ulpi->dev, sizeof(*tusb), GFP_KERNEL); + tusb =3D devm_kzalloc(dev, sizeof(*tusb), GFP_KERNEL); if (!tusb) return -ENOMEM; =20 - tusb->ulpi =3D ulpi; + tusb->dev =3D dev; =20 - tusb->gpio_reset =3D devm_gpiod_get_optional(&ulpi->dev, "reset", - GPIOD_OUT_LOW); + tusb->gpio_reset =3D devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(tusb->gpio_reset)) return PTR_ERR(tusb->gpio_reset); =20 gpiod_set_value_cansleep(tusb->gpio_reset, 1); =20 - tusb->gpio_cs =3D devm_gpiod_get_optional(&ulpi->dev, "cs", - GPIOD_OUT_LOW); + tusb->gpio_cs =3D devm_gpiod_get_optional(dev, "cs", GPIOD_OUT_LOW); if (IS_ERR(tusb->gpio_cs)) return PTR_ERR(tusb->gpio_cs); =20 @@ -519,15 +520,15 @@ static int tusb1210_probe(struct ulpi *ulpi) return ret; =20 /* High speed output drive strength configuration */ - if (!device_property_read_u8(&ulpi->dev, "ihstx", &val)) + if (!device_property_read_u8(dev, "ihstx", &val)) u8p_replace_bits(®, val, (u8)TUSB1210_VENDOR_SPECIFIC2_IHSTX_MASK); =20 /* High speed output impedance configuration */ - if (!device_property_read_u8(&ulpi->dev, "zhsdrv", &val)) + if (!device_property_read_u8(dev, "zhsdrv", &val)) u8p_replace_bits(®, val, (u8)TUSB1210_VENDOR_SPECIFIC2_ZHSDRV_MASK); =20 /* DP/DM swap control */ - if (!device_property_read_u8(&ulpi->dev, "datapolarity", &val)) + if (!device_property_read_u8(dev, "datapolarity", &val)) u8p_replace_bits(®, val, (u8)TUSB1210_VENDOR_SPECIFIC2_DP_MASK); =20 ret =3D tusb1210_ulpi_write(tusb, TUSB1210_VENDOR_SPECIFIC2, reg); --=20 2.43.0.rc1.1.gbec44491f096 From nobody Sun Feb 8 01:33:47 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C24577BB08 for ; Fri, 9 Feb 2024 16:03:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707494624; cv=none; b=iivLV2e+B8ERMwaIDSSUVxncK0B1XOf5LmvK7hujm43iila+YBHRNVlRr3B9y8qHyj3Io+hD9+VTON7WgPUzO6BoUJ/Eu/jjcZ9oxHfsmSAXyzGDL7unPCAjNbHdV4L/O5lvKMjdu7k5aj5KVQ5nsNTtF8lU+50eyEk9e0U+OSw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707494624; c=relaxed/simple; bh=rwEsgngaV9IDPY5c2M3rnBWaSuyjqeEB7+v3YF0TYSY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aqsM3k+lIkiXrvr9uq9k3p7knDEl7KG5Wlrh8mmaj522M3ZXBHy/lY/XeaJnjBQWz3UjkdZMqoXChkHBnbxvdBW6gGj/m3e/MoDaI5ROGooOZ56VhNPIXl4ohOkkbiNvBc76PQU1FfWHDjG+jkxBaQtdMdovWLd8f2tfdAYiWus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HN67/GcG; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HN67/GcG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707494623; x=1739030623; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rwEsgngaV9IDPY5c2M3rnBWaSuyjqeEB7+v3YF0TYSY=; b=HN67/GcGiSrph1/H5Z0oJfN5kPLDBU1my0dHm/iCDnbHWxKYJytIQ/bQ bu51FvuohZUPyFxPXzkzmsrC20zFr0S+I3puUHVluawEVfWBTwvedfuv8 cUtvf9KBYpZWhTv1L5dz42NANY5FL3RXLrMVCllAxoVg9XK2H1yIvEG6H 3DqfCpZaaj7coW/aUfFkep5vrfqTxe37IxSv5TEOAmv/7BPHDERodr9P3 Mp2hHxRzPlcAdGKpLBBVwawy8BJ6/qi66E8Nvag+NErHzTVmwFo9jBjBX 5mejw4TbILO6sA+LFhK7yuPY6yZwT4A5FB5j+Fn8rmnILoH8vDju7csta Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="4432022" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="4432022" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 08:03:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="934459659" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="934459659" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 09 Feb 2024 08:03:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9AAE3161; Fri, 9 Feb 2024 18:03:36 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Vinod Koul , Kishon Vijay Abraham I Subject: [PATCH v1 2/2] phy: ti: tusb1210: Define device IDs Date: Fri, 9 Feb 2024 18:02:15 +0200 Message-ID: <20240209160334.2304230-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240209160334.2304230-1-andriy.shevchenko@linux.intel.com> References: <20240209160334.2304230-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define device IDs since some of them are being used more than once. Signed-off-by: Andy Shevchenko --- drivers/phy/ti/phy-tusb1210.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/phy/ti/phy-tusb1210.c b/drivers/phy/ti/phy-tusb1210.c index 7232b104a62d..13cd614e12a1 100644 --- a/drivers/phy/ti/phy-tusb1210.c +++ b/drivers/phy/ti/phy-tusb1210.c @@ -17,6 +17,10 @@ #include #include =20 +#define TI_VENDOR_ID 0x0451 +#define TI_DEVICE_TUSB1210 0x1507 +#define TI_DEVICE_TUSB1211 0x1508 + #define TUSB1211_POWER_CONTROL 0x3d #define TUSB1211_POWER_CONTROL_SET 0x3e #define TUSB1211_POWER_CONTROL_CLEAR 0x3f @@ -436,7 +440,7 @@ static void tusb1210_probe_charger_detect(struct tusb12= 10 *tusb) if (!device_property_read_bool(dev->parent, "linux,phy_charger_detect")) return; =20 - if (ulpi->id.product !=3D 0x1508) { + if (ulpi->id.product !=3D TI_DEVICE_TUSB1211) { dev_err(dev, "error charger detection is only supported on the TUSB1211\= n"); return; } @@ -562,11 +566,9 @@ static void tusb1210_remove(struct ulpi *ulpi) tusb1210_remove_charger_detect(tusb); } =20 -#define TI_VENDOR_ID 0x0451 - static const struct ulpi_device_id tusb1210_ulpi_id[] =3D { - { TI_VENDOR_ID, 0x1507, }, /* TUSB1210 */ - { TI_VENDOR_ID, 0x1508, }, /* TUSB1211 */ + { TI_VENDOR_ID, TI_DEVICE_TUSB1210 }, + { TI_VENDOR_ID, TI_DEVICE_TUSB1211 }, { }, }; MODULE_DEVICE_TABLE(ulpi, tusb1210_ulpi_id); --=20 2.43.0.rc1.1.gbec44491f096