lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch net-next v1 12/12] net: dsa: microchip: ptp: add support for perout programmable pins
    Date
    There are two programmable pins available for Trigger output unit to
    generate periodic pulses. This patch add verify_pin for the available 2
    pins and configure it with respect to GPIO index for the TOU unit.

    Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
    ---
    Patch v1
    - patch is new
    ---
    drivers/net/dsa/microchip/ksz_ptp.c | 41 +++++++++++++++++++++++++++--
    drivers/net/dsa/microchip/ksz_ptp.h | 3 +++
    2 files changed, 42 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c
    index 15b863c85cb1..445d220f1a1b 100644
    --- a/drivers/net/dsa/microchip/ksz_ptp.c
    +++ b/drivers/net/dsa/microchip/ksz_ptp.c
    @@ -30,12 +30,14 @@ static int ksz_ptp_tou_gpio(struct ksz_device *dev)
    {
    int ret;

    - ret = ksz_rmw32(dev, REG_SW_GLOBAL_LED_OVR__4, LED_OVR_1, LED_OVR_1);
    + ret = ksz_rmw32(dev, REG_SW_GLOBAL_LED_OVR__4, LED_OVR_1 | LED_OVR_2,
    + LED_OVR_1 | LED_OVR_2);
    if (ret)
    return ret;

    return ksz_rmw32(dev, REG_SW_GLOBAL_LED_SRC__4,
    - LED_SRC_PTP_GPIO_1, LED_SRC_PTP_GPIO_1);
    + LED_SRC_PTP_GPIO_1 | LED_SRC_PTP_GPIO_2,
    + LED_SRC_PTP_GPIO_1 | LED_SRC_PTP_GPIO_2);
    }

    static int ksz_ptp_tou_reset(struct ksz_device *dev, u8 unit)
    @@ -181,6 +183,10 @@ static int ksz_ptp_enable_perout(struct ksz_device *dev,
    ptp_data->tou_mode != KSZ_PTP_TOU_IDLE)
    return -EBUSY;

    + pin = ptp_find_pin(ptp_data->clock, PTP_PF_PEROUT, request->index);
    + if (pin < 0)
    + return -EINVAL;
    +
    data32 = FIELD_PREP(PTP_GPIO_INDEX, pin) |
    FIELD_PREP(PTP_TOU_INDEX, request->index);
    ret = ksz_rmw32(dev, REG_PTP_UNIT_INDEX__4,
    @@ -708,6 +714,23 @@ static int ksz_ptp_enable(struct ptp_clock_info *ptp,
    return ret;
    }

    +static int ksz_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin,
    + enum ptp_pin_function func, unsigned int chan)
    +{
    + int ret = 0;
    +
    + switch (func) {
    + case PTP_PF_NONE:
    + case PTP_PF_PEROUT:
    + break;
    + default:
    + ret = -1;
    + break;
    + }
    +
    + return ret;
    +}
    +
    /* Function is pointer to the do_aux_work in the ptp_clock capability */
    static long ksz_ptp_do_aux_work(struct ptp_clock_info *ptp)
    {
    @@ -824,6 +847,8 @@ static const struct ptp_clock_info ksz_ptp_caps = {
    .adjtime = ksz_ptp_adjtime,
    .do_aux_work = ksz_ptp_do_aux_work,
    .enable = ksz_ptp_enable,
    + .verify = ksz_ptp_verify_pin,
    + .n_pins = KSZ_PTP_N_GPIO,
    .n_per_out = 3,
    };

    @@ -832,6 +857,7 @@ int ksz_ptp_clock_register(struct dsa_switch *ds)
    struct ksz_device *dev = ds->priv;
    struct ksz_ptp_data *ptp_data;
    int ret;
    + u8 i;

    ptp_data = &dev->ptp_data;
    mutex_init(&ptp_data->lock);
    @@ -843,6 +869,17 @@ int ksz_ptp_clock_register(struct dsa_switch *ds)
    if (ret)
    return ret;

    + for (i = 0; i < KSZ_PTP_N_GPIO; i++) {
    + struct ptp_pin_desc *ptp_pin = &ptp_data->pin_config[i];
    +
    + snprintf(ptp_pin->name,
    + sizeof(ptp_pin->name), "ksz_ptp_pin_%02d", i);
    + ptp_pin->index = i;
    + ptp_pin->func = PTP_PF_NONE;
    + }
    +
    + ptp_data->caps.pin_config = ptp_data->pin_config;
    +
    ptp_data->clock = ptp_clock_register(&ptp_data->caps, dev->dev);
    if (IS_ERR_OR_NULL(ptp_data->clock))
    return PTR_ERR(ptp_data->clock);
    diff --git a/drivers/net/dsa/microchip/ksz_ptp.h b/drivers/net/dsa/microchip/ksz_ptp.h
    index 94ffd8bc0603..390364a177ea 100644
    --- a/drivers/net/dsa/microchip/ksz_ptp.h
    +++ b/drivers/net/dsa/microchip/ksz_ptp.h
    @@ -10,6 +10,8 @@

    #include <linux/ptp_clock_kernel.h>

    +#define KSZ_PTP_N_GPIO 2
    +
    enum ksz_ptp_tou_mode {
    KSZ_PTP_TOU_IDLE,
    KSZ_PTP_TOU_PEROUT,
    @@ -18,6 +20,7 @@ enum ksz_ptp_tou_mode {
    struct ksz_ptp_data {
    struct ptp_clock_info caps;
    struct ptp_clock *clock;
    + struct ptp_pin_desc pin_config[KSZ_PTP_N_GPIO];
    /* Serializes all operations on the PTP hardware clock */
    struct mutex lock;
    /* lock for accessing the clock_time */
    --
    2.36.1
    \
     
     \ /
      Last update: 2022-11-28 11:37    [W:4.054 / U:1.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site