lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 2/5] USB: PHY: JZ4770: Unify code style and simplify code.
    Date
    1.Modify the macro definition to unify "#define USBPCR_XXXX n"
    into the "#define USBPCR_XXXX (n << USBPCR_XXXX_LSB)" style,
    so as to unify the code style in the "jz4770_phy_init()" and
    simplify the code.
    2.Remove unused macro definitions to simplify the code.

    Tested-by: 周正 (Zhou Zheng) <sernia.zhou@foxmail.com>
    Suggested-by: Paul Cercueil <paul@crapouillou.net>
    Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
    ---

    Notes:
    v5:
    New patch.

    v5->v6:
    No change.

    drivers/usb/phy/phy-jz4770.c | 34 +++++++++++-----------------------
    1 file changed, 11 insertions(+), 23 deletions(-)

    diff --git a/drivers/usb/phy/phy-jz4770.c b/drivers/usb/phy/phy-jz4770.c
    index 8f62dc2a90ff..00209d5469d3 100644
    --- a/drivers/usb/phy/phy-jz4770.c
    +++ b/drivers/usb/phy/phy-jz4770.c
    @@ -20,8 +20,6 @@
    /* USBPCR */
    #define USBPCR_USB_MODE BIT(31)
    #define USBPCR_AVLD_REG BIT(30)
    -#define USBPCR_INCRM BIT(27)
    -#define USBPCR_CLK12_EN BIT(26)
    #define USBPCR_COMMONONN BIT(25)
    #define USBPCR_VBUSVLDEXT BIT(24)
    #define USBPCR_VBUSVLDEXTSEL BIT(23)
    @@ -32,45 +30,39 @@

    #define USBPCR_IDPULLUP_LSB 28
    #define USBPCR_IDPULLUP_MASK GENMASK(29, USBPCR_IDPULLUP_LSB)
    -#define USBPCR_IDPULLUP_ALWAYS (3 << USBPCR_IDPULLUP_LSB)
    -#define USBPCR_IDPULLUP_SUSPEND (1 << USBPCR_IDPULLUP_LSB)
    -#define USBPCR_IDPULLUP_OTG (0 << USBPCR_IDPULLUP_LSB)
    +#define USBPCR_IDPULLUP_ALWAYS (0x2 << USBPCR_IDPULLUP_LSB)
    +#define USBPCR_IDPULLUP_SUSPEND (0x1 << USBPCR_IDPULLUP_LSB)
    +#define USBPCR_IDPULLUP_OTG (0x0 << USBPCR_IDPULLUP_LSB)

    #define USBPCR_COMPDISTUNE_LSB 17
    #define USBPCR_COMPDISTUNE_MASK GENMASK(19, USBPCR_COMPDISTUNE_LSB)
    -#define USBPCR_COMPDISTUNE_DFT 4
    +#define USBPCR_COMPDISTUNE_DFT (0x4 << USBPCR_COMPDISTUNE_LSB)

    #define USBPCR_OTGTUNE_LSB 14
    #define USBPCR_OTGTUNE_MASK GENMASK(16, USBPCR_OTGTUNE_LSB)
    -#define USBPCR_OTGTUNE_DFT 4
    +#define USBPCR_OTGTUNE_DFT (0x4 << USBPCR_OTGTUNE_LSB)

    #define USBPCR_SQRXTUNE_LSB 11
    #define USBPCR_SQRXTUNE_MASK GENMASK(13, USBPCR_SQRXTUNE_LSB)
    -#define USBPCR_SQRXTUNE_DFT 3
    +#define USBPCR_SQRXTUNE_DFT (0x3 << USBPCR_SQRXTUNE_LSB)

    #define USBPCR_TXFSLSTUNE_LSB 7
    #define USBPCR_TXFSLSTUNE_MASK GENMASK(10, USBPCR_TXFSLSTUNE_LSB)
    -#define USBPCR_TXFSLSTUNE_DFT 3
    +#define USBPCR_TXFSLSTUNE_DFT (0x3 << USBPCR_TXFSLSTUNE_LSB)

    #define USBPCR_TXRISETUNE_LSB 4
    #define USBPCR_TXRISETUNE_MASK GENMASK(5, USBPCR_TXRISETUNE_LSB)
    -#define USBPCR_TXRISETUNE_DFT 3
    +#define USBPCR_TXRISETUNE_DFT (0x3 << USBPCR_TXRISETUNE_LSB)

    #define USBPCR_TXVREFTUNE_LSB 0
    #define USBPCR_TXVREFTUNE_MASK GENMASK(3, USBPCR_TXVREFTUNE_LSB)
    -#define USBPCR_TXVREFTUNE_DFT 5
    +#define USBPCR_TXVREFTUNE_DFT (0x5 << USBPCR_TXVREFTUNE_LSB)

    /* USBRDT */
    #define USBRDT_VBFIL_LD_EN BIT(25)
    #define USBRDT_IDDIG_EN BIT(24)
    #define USBRDT_IDDIG_REG BIT(23)

    -#define USBRDT_USBRDT_LSB 0
    -#define USBRDT_USBRDT_MASK GENMASK(22, USBRDT_USBRDT_LSB)
    -
    -/* USBPCR1 */
    -#define USBPCR1_UHC_POWON BIT(5)
    -
    struct jz4770_phy {
    struct usb_phy phy;
    struct usb_otg otg;
    @@ -136,12 +128,8 @@ static int jz4770_phy_init(struct usb_phy *phy)
    }

    reg = USBPCR_AVLD_REG | USBPCR_COMMONONN | USBPCR_IDPULLUP_ALWAYS |
    - (USBPCR_COMPDISTUNE_DFT << USBPCR_COMPDISTUNE_LSB) |
    - (USBPCR_OTGTUNE_DFT << USBPCR_OTGTUNE_LSB) |
    - (USBPCR_SQRXTUNE_DFT << USBPCR_SQRXTUNE_LSB) |
    - (USBPCR_TXFSLSTUNE_DFT << USBPCR_TXFSLSTUNE_LSB) |
    - (USBPCR_TXRISETUNE_DFT << USBPCR_TXRISETUNE_LSB) |
    - (USBPCR_TXVREFTUNE_DFT << USBPCR_TXVREFTUNE_LSB) |
    + USBPCR_COMPDISTUNE_DFT | USBPCR_OTGTUNE_DFT | USBPCR_SQRXTUNE_DFT |
    + USBPCR_TXFSLSTUNE_DFT | USBPCR_TXRISETUNE_DFT | USBPCR_TXVREFTUNE_DFT |
    USBPCR_POR;
    writel(reg, priv->base + REG_USBPCR_OFFSET);

    --
    2.11.0
    \
     
     \ /
      Last update: 2020-07-25 05:54    [W:2.616 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site