From: Dmitry Osipenko <digetx@gmail.com>
To: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Peter Chen" <Peter.Chen@nxp.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Felipe Balbi" <balbi@kernel.org>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 12/20] usb: phy: tegra: Use u32 for hardware register variables
Date: Mon, 6 Jan 2020 04:34:08 +0300 [thread overview]
Message-ID: <20200106013416.9604-13-digetx@gmail.com> (raw)
In-Reply-To: <20200106013416.9604-1-digetx@gmail.com>
There is a mix of u32/ULONG usage in the driver's code. Let's switch to
u32 uniformly, for consistency.
Suggested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/phy/phy-tegra-usb.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 9adbcdf8d3a1..f9acbab477cf 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -204,7 +204,7 @@ static inline struct tegra_usb_phy *to_tegra_usb_phy(struct usb_phy *u_phy)
static void set_pts(struct tegra_usb_phy *phy, u8 pts_val)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
if (phy->soc_config->has_hostpc) {
val = readl_relaxed(base + TEGRA_USB_HOSTPC1_DEVLC);
@@ -223,7 +223,7 @@ static void set_pts(struct tegra_usb_phy *phy, u8 pts_val)
static void set_phcd(struct tegra_usb_phy *phy, bool enable)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
if (phy->soc_config->has_hostpc) {
val = readl_relaxed(base + TEGRA_USB_HOSTPC1_DEVLC);
@@ -310,7 +310,8 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
{
struct tegra_utmip_config *config = phy->config;
void __iomem *base = phy->pad_regs;
- unsigned long val, flags;
+ unsigned long flags;
+ u32 val;
int err;
err = clk_prepare_enable(phy->pad_clk);
@@ -345,7 +346,8 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
static int utmip_pad_power_off(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->pad_regs;
- unsigned long val, flags;
+ unsigned long flags;
+ u32 val;
int err;
if (!utmip_pad_count) {
@@ -383,7 +385,7 @@ static int utmi_wait_register(void __iomem *reg, u32 mask, u32 result)
static void utmi_phy_clk_disable(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
/*
* The USB driver may have already initiated the phy clock
@@ -415,7 +417,7 @@ static void utmi_phy_clk_disable(struct tegra_usb_phy *phy)
static void utmi_phy_clk_enable(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
/*
* The USB driver may have already initiated the phy clock
@@ -450,7 +452,7 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
{
struct tegra_utmip_config *config = phy->config;
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
int err;
val = readl_relaxed(base + USB_SUSP_CTRL);
@@ -601,7 +603,7 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
static int utmi_phy_power_off(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
utmi_phy_clk_disable(phy);
@@ -636,7 +638,7 @@ static int utmi_phy_power_off(struct tegra_usb_phy *phy)
static void utmi_phy_preresume(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
val = readl_relaxed(base + UTMIP_TX_CFG0);
val |= UTMIP_HS_DISCON_DISABLE;
@@ -646,7 +648,7 @@ static void utmi_phy_preresume(struct tegra_usb_phy *phy)
static void utmi_phy_postresume(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
val = readl_relaxed(base + UTMIP_TX_CFG0);
val &= ~UTMIP_HS_DISCON_DISABLE;
@@ -657,7 +659,7 @@ static void utmi_phy_restore_start(struct tegra_usb_phy *phy,
enum tegra_usb_phy_port_speed port_speed)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
val = readl_relaxed(base + UTMIP_MISC_CFG0);
val &= ~UTMIP_DPDM_OBSERVE_SEL(~0);
@@ -677,7 +679,7 @@ static void utmi_phy_restore_start(struct tegra_usb_phy *phy,
static void utmi_phy_restore_end(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
val = readl_relaxed(base + UTMIP_MISC_CFG0);
val &= ~UTMIP_DPDM_OBSERVE;
@@ -688,7 +690,7 @@ static void utmi_phy_restore_end(struct tegra_usb_phy *phy)
static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->regs;
- unsigned long val;
+ u32 val;
int err;
err = gpio_direction_output(phy->reset_gpio, 0);
--
2.24.0
next prev parent reply other threads:[~2020-01-06 1:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 1:33 [PATCH v4 00/20] NVIDIA Tegra USB2 drivers clean up Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 01/20] dt-binding: usb: ci-hdrc-usb2: Document NVIDIA Tegra support Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 02/20] usb: host: ehci-tegra: Correct teardown order of driver's removal Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 03/20] usb: phy: tegra: Clean up ulpi_phy_power_off Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 04/20] usb: phy: tegra: Keep track of power on-off state Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 05/20] usb: phy: tegra: Hook up init/shutdown callbacks Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 06/20] usb: phy: tegra: Perform general clean up of the code Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 07/20] usb: phy: tegra: Clean up included headers Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 08/20] usb: phy: tegra: Use relaxed versions of readl/writel Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 09/20] usb: phy: tegra: Use generic stub for a missing VBUS regulator Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 10/20] usb: ulpi: Add resource-managed variant of otg_ulpi_create() Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 11/20] usb: phy: tegra: Use devm_otg_ulpi_create() Dmitry Osipenko
2020-01-06 1:34 ` Dmitry Osipenko [this message]
2020-01-06 1:34 ` [PATCH v4 13/20] usb: phy: tegra: Use device-tree notion of reset-GPIO's active-state Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 14/20] usb: phy: tegra: Disable VBUS regulator on tegra_usb_phy_init failure Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 15/20] usb: phy: tegra: Move utmip_pad_count checking under lock Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 16/20] usb: phy: tegra: Keep CPU interrupts enabled Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 17/20] usb: chipidea: tegra: Stop managing PHY's power Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 18/20] usb: chipidea: tegra: Add USB_TEGRA_PHY to driver's dependencies Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 19/20] usb: host: ehci-tegra: Stop managing PHY's power Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 20/20] usb: host: ehci-tegra: Remove unused fields from tegra_ehci_hcd Dmitry Osipenko
2020-01-06 15:16 ` Alan Stern
2020-01-07 16:13 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200106013416.9604-13-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=Peter.Chen@nxp.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).