Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F610C433EF for ; Fri, 18 Mar 2022 11:57:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236016AbiCRL65 (ORCPT ); Fri, 18 Mar 2022 07:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233226AbiCRL64 (ORCPT ); Fri, 18 Mar 2022 07:58:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21EEE151D0E for ; Fri, 18 Mar 2022 04:57:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B038E614CB for ; Fri, 18 Mar 2022 11:57:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5BBEC340E8; Fri, 18 Mar 2022 11:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647604657; bh=SqQTq56FvgmWsaQVfREvbioWlSSlYaY91BKl2ggxDHw=; h=Subject:To:From:Date:From; b=uC86fQkHLcx4XL0lul3Ha+dxNg12ZxMAeyuHBXQBSVrAOil3eftkCvy/LT4rKxmMm 8Y7mk7TkosoKn0+R9gHA7aahaJDjT3OrBC/tNTFL5X8s7/hU5tSdYjirT5hJI5iV0E HK0ZFC+aRhwFJICAVLeu5Ts2l6GHfYeUIDI9sMxg= Subject: patch "iio: adc: xilinx-ams: Fixed missing PS channels" added to char-misc-testing To: robert.hancock@calian.com, Jonathan.Cameron@huawei.com, Stable@vger.kernel.org, m.tretter@pengutronix.de, michal.simek@xilinx.com From: Date: Fri, 18 Mar 2022 12:43:50 +0100 Message-ID: <1647603830132195@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled iio: adc: xilinx-ams: Fixed missing PS channels to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the char-misc-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. From 1f21a41578062d439cc485bce2d8b664f9a6170e Mon Sep 17 00:00:00 2001 From: Robert Hancock Date: Thu, 27 Jan 2022 11:34:48 -0600 Subject: iio: adc: xilinx-ams: Fixed missing PS channels The code forgot to increment num_channels for the PS channel inputs, resulting in them not being enabled as they should. Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver") Signed-off-by: Robert Hancock Reviewed-by: Michael Tretter Acked-by: Michal Simek Link: https://lore.kernel.org/r/20220127173450.3684318-3-robert.hancock@calian.com Cc: Signed-off-by: Jonathan Cameron --- drivers/iio/adc/xilinx-ams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c index 6ffddf4038b8..6746bc966bfd 100644 --- a/drivers/iio/adc/xilinx-ams.c +++ b/drivers/iio/adc/xilinx-ams.c @@ -1225,6 +1225,7 @@ static int ams_init_module(struct iio_dev *indio_dev, /* add PS channels to iio device channels */ memcpy(channels, ams_ps_channels, sizeof(ams_ps_channels)); + num_channels = ARRAY_SIZE(ams_ps_channels); } else if (fwnode_property_match_string(fwnode, "compatible", "xlnx,zynqmp-ams-pl") == 0) { ams->pl_base = fwnode_iomap(fwnode, 0); -- 2.35.1