From patchwork Tue Sep 15 05:08:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1364130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eQZqlFk2; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BrB8M6cxMz9sVT; Tue, 15 Sep 2020 15:08:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kI3Cf-0004mS-5t; Tue, 15 Sep 2020 05:08:29 +0000 Received: from mail-pg1-f194.google.com ([209.85.215.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kI3Cb-0004ld-Et for kernel-team@lists.ubuntu.com; Tue, 15 Sep 2020 05:08:25 +0000 Received: by mail-pg1-f194.google.com with SMTP id y1so1339725pgk.8 for ; Mon, 14 Sep 2020 22:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OkHzUBq9kaba/766+vORiDU8b+ucVwVe0YFwv0L3O7w=; b=eQZqlFk2lyy1NJsYy1Mi8R/pxmj4o7va1CHvnhEYyi74hDfzKdNfTMmTW5ixNYA3zn Pim9LAheGDs6ogHXb+foH0z8NvPRAWzqXfkL7VPlzk/0QM/LpEmgMpeza+mTDSzOe12B cAUulLq33TIvNJZ1OeNg9ZJMsQzBrhpganNaY88sOqqyD12fMS3U7lXTMMNWK46NTH1t yqAHmuf6J70DmFoIElhpk1Pq+CMKyDFexzvmMMHkjOM+y6maIHd0tA7Htn7y6fu1ExIU XQSSYfiPV9lYyjHZvfYNdhtiFPvquwDWvnRw/0kaQUaONIqR2xadBPK7JLfRhhXEgXYy xsIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OkHzUBq9kaba/766+vORiDU8b+ucVwVe0YFwv0L3O7w=; b=AGSvOK6MOIWvpn3Qvc+ymkiraetiKFA+gneC797+pRuoerdNT/ieMy//5OuKD/iFN5 2ssoD3IYV+qD/c64//j504eshs/e9x9Hh5j5uee1NPC8ddRS2SoaDPq23VOcUhO8ju8p pAQ+7LldxB2d/GdSTTqtNC+Vck/szzTnja+hno+QrmkB6d+O3xmmfZOBRFOpC8/RQyhI fyP0KCy6rKwoSeedKGn3QeBMIMxRqDUhF0rl/eQ2ji/lc1vzlgZLw3jY7ahgjeGguICu 2vnYdIJUAOMe9g5a9vKmSVK6gQfCNMVqSJXXAkXe0tdkRpQNW+2eVzy1hpq2KaSzHggU w+4A== X-Gm-Message-State: AOAM530JrANPh2sLFxnC2CFx2T5oQsClHNC51TUclmZO8n2MpqPf+slb /qGEOEAahQk24cNxMDXtd98eyWWFigw= X-Google-Smtp-Source: ABdhPJwcC+/lx8wG6lipYNK0VKaJrw3cx7+5qlIMpeWgUuLAbCADg+qyJ8ElskUOXlW/rfu9SCEy/A== X-Received: by 2002:a62:7eca:0:b029:142:2501:39eb with SMTP id z193-20020a627eca0000b0290142250139ebmr286693pfc.58.1600146503204; Mon, 14 Sep 2020 22:08:23 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id w185sm12470702pfc.36.2020.09.14.22.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 22:08:22 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com, William Sung Subject: [PATCH 1/1][SRU][F] UBUNTU: SAUCE: iio: dac: ad5593r: Dynamically set AD5593R channel modes Date: Tue, 15 Sep 2020 13:08:19 +0800 Message-Id: <20200915050819.172357-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915050819.172357-1-acelan.kao@canonical.com> References: <20200915050819.172357-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.194; envelope-from=acelan@gmail.com; helo=mail-pg1-f194.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: William Sung BugLink: https://bugs.launchpad.net/bugs/1895612 To use ad5593r more flexibly, we use the module parameter to setting the channel modes dynamically whenever the module probe up. Users can pass the channel modes to the module parameter for allocating the functionality of channels as desired. For example: * Use in the kernel command line: Users can add the module parameter in the kernel command line such as "ad5593r.ch_mode=88001122" "88001122" means the channel mode setting for each channel. The most left side indicates the mode of channel 7, and the most right side indicates the mode of channel 0. * Use when manually probe the module: Similar to the kernel command line usage, users can enter "modprobe ad5593r ch_mode=88001122" to start the ad5593r module with the desired channel mode setting. v2: Fix the patch description and remove redundant for loop Signed-off-by: William Sung Signed-off-by: AceLan Kao Acked-by: Kleber Sacilotto de Souza --- drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++--- drivers/iio/dac/ad5592r-base.h | 4 ++++ drivers/iio/dac/ad5593r.c | 44 ++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c index 424922cad1e3..25ff9f5df5dd 100644 --- a/drivers/iio/dac/ad5592r-base.c +++ b/drivers/iio/dac/ad5592r-base.c @@ -22,6 +22,10 @@ #include "ad5592r-base.h" +/* Parameters for dynamic channel mode setting */ +static u8 update_channel_mode; +static u8 new_channel_modes[AD559XR_CHANNEL_NR]; + static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset) { struct ad5592r_state *st = gpiochip_get_data(chip); @@ -133,7 +137,7 @@ static int ad5592r_gpio_init(struct ad5592r_state *st) st->gpiochip.label = dev_name(st->dev); st->gpiochip.base = -1; - st->gpiochip.ngpio = 8; + st->gpiochip.ngpio = AD559XR_CHANNEL_NR; st->gpiochip.parent = st->dev; st->gpiochip.can_sleep = true; st->gpiochip.direction_input = ad5592r_gpio_direction_input; @@ -535,6 +539,10 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st) st->channel_offstate[reg] = tmp; } + /* Update default channel modes set by external module */ + if (update_channel_mode == 1) + memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes)); + channels = devm_kcalloc(st->dev, 1 + 2 * num_channels, sizeof(*channels), GFP_KERNEL); @@ -570,7 +578,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st) } channels[curr_channel].type = IIO_TEMP; - channels[curr_channel].channel = 8; + channels[curr_channel].channel = AD559XR_CHANNEL_NR; channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_OFFSET); @@ -592,6 +600,13 @@ static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV) div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]); } +void ad5592r_update_default_channel_modes(u8 *new_modes) +{ + update_channel_mode = 1; + memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR); +} +EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes); + int ad5592r_probe(struct device *dev, const char *name, const struct ad5592r_rw_ops *ops) { @@ -606,7 +621,7 @@ int ad5592r_probe(struct device *dev, const char *name, st = iio_priv(iio_dev); st->dev = dev; st->ops = ops; - st->num_channels = 8; + st->num_channels = AD559XR_CHANNEL_NR; dev_set_drvdata(dev, iio_dev); st->reg = devm_regulator_get_optional(dev, "vref"); diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h index 4774e4cd9c11..6fc120dc341e 100644 --- a/drivers/iio/dac/ad5592r-base.h +++ b/drivers/iio/dac/ad5592r-base.h @@ -39,6 +39,9 @@ enum ad5592r_registers { #define AD5592R_REG_CTRL_ADC_RANGE BIT(5) #define AD5592R_REG_CTRL_DAC_RANGE BIT(4) +/* Define quantity of channels of AD5592R/AD5593R */ +#define AD559XR_CHANNEL_NR 8 + struct ad5592r_rw_ops { int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value); int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value); @@ -68,6 +71,7 @@ struct ad5592r_state { __be16 spi_msg_nop; }; +void ad5592r_update_default_channel_modes(u8 *new_modes); int ad5592r_probe(struct device *dev, const char *name, const struct ad5592r_rw_ops *ops); int ad5592r_remove(struct device *dev); diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c index 44ea3b8117d0..7511949278ac 100644 --- a/drivers/iio/dac/ad5593r.c +++ b/drivers/iio/dac/ad5593r.c @@ -21,6 +21,10 @@ #define AD5593R_MODE_GPIO_READBACK (6 << 4) #define AD5593R_MODE_REG_READBACK (7 << 4) +/* Parameters for dynamic channel mode setting */ +static char *ch_mode = ""; +module_param(ch_mode, charp, 0400); + static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value) { struct i2c_client *i2c = to_i2c_client(st->dev); @@ -92,9 +96,49 @@ static const struct ad5592r_rw_ops ad5593r_rw_ops = { .gpio_read = ad5593r_gpio_read, }; +static void ad5593r_check_new_channel_mode(void) +{ + char *new_mode, tmp[2]; + u8 new_ch_modes[AD559XR_CHANNEL_NR]; + int idx; + + if (strlen(ch_mode) != AD559XR_CHANNEL_NR) + return; + + new_mode = ch_mode; + + /* Check if all channel modes are valid */ + for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) { + switch (new_mode[idx]) { + case '0': + case '1': + case '2': + case '3': + case '8': + continue; + default: + /* Invalid setting exist, ignore the settings */ + return; + } + } + + /* Set the new modes to ad5592r-base driver to setup the new channel modes */ + memset(tmp, 0, 2); + for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) { + tmp[0] = new_mode[idx]; + if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) { + /* Converting error, ignore the settings */ + return; + } + } + + ad5592r_update_default_channel_modes(new_ch_modes); +} + static int ad5593r_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { + ad5593r_check_new_channel_mode(); return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops); }