From nobody Fri May 9 23:37:48 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1627153533857931.114292153083; Sat, 24 Jul 2021 12:05:33 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229721AbhGXSY7 (ORCPT ); Sat, 24 Jul 2021 14:24:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbhGXSY6 (ORCPT ); Sat, 24 Jul 2021 14:24:58 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6BB5C061757; Sat, 24 Jul 2021 12:05:28 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id z7so5927123wrn.11; Sat, 24 Jul 2021 12:05:28 -0700 (PDT) Received: from monk.home (astrasbourg-157-1-7-84.w90-40.abo.wanadoo.fr. [90.40.218.84]) by smtp.gmail.com with ESMTPSA id j15sm1117798wms.20.2021.07.24.12.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 12:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TFqPeTJizFnfUZM7Q40k9J0nA9MRhn5b8J6dQsSbkSU=; b=g5nY822zTiAYbbkQ4YvFuTxrqBbrNXQb0J6QLorJ6+V4lidZ71xypTmFB5e/wdlDmv Z+S+OLK1FmyQGep01xTB9/9vn1uhuGI15sgbW8RtkRAmwMqqd/9Nr6kTLFB/sVD89NBN GHmttZTJEYENNoHHQu//YH1hsPWfQwXbsz3xoVJY/20eomOzxcPzl0AaNFTgiKwY552B Ea6wuEb/61dxpYp1AbFlCR8kKoW7UyP/W++yhJL/uNRP6DJknEGKGRZ3sjI8qthxEr7z Ecw1XE4wmkW2iui+tO7c2Ngx6ArEqnijunxPClK1wF44rkXMuOdPnLF3JX3jG2D5SjrE IxbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TFqPeTJizFnfUZM7Q40k9J0nA9MRhn5b8J6dQsSbkSU=; b=R+1PviGawqTnxE/gmNIJ4cQ5PLSYy+zPRkHlHTJrv5vnnfBm/q6P1uiUU6gZzR7I5C geoupOK+U7rgoAZ/0eDWD4lzKjsiLNdxWhuTLKeO6iEdWYYjpbAT46TzfpZPWYRTEEYJ mvW5Sq9LXebzF4HeXTsDtYOYgQBsevNJB4Ub3zYgJ42TYaVjTDD7setmmt/4zp8xydxi o43PV6HQtxz+78aL0z4bBF9JqBFArJ093H4ABtCXDUYQ+JnixQTGYrLbjNWISXjT5gJH WRl6+oBLapXx4qi27JuBhUvUJGYsqo/4AsfowFr/UbWSU6COrzDGoPPqhEZoDX9DwKiB 0NNQ== X-Gm-Message-State: AOAM530q+9UHp3WaLC8frgU6DYJYAO6U5Oy3fxDXyMKYdt20aw2wOpol xOBxtbAWFY4qbbLbqc7NpaQ= X-Google-Smtp-Source: ABdhPJyER3AGOSAzaJBWOSY3FIvCmfsIuvtui436ER79FTl14zfHObSDGR1r7fovxH8clCA5FgzmBg== X-Received: by 2002:a5d:4a4c:: with SMTP id v12mr10875840wrs.256.1627153527415; Sat, 24 Jul 2021 12:05:27 -0700 (PDT) From: Christophe Branchereau Cc: jic23@kernel.org, lars@metafoo.de, linux-mips@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@roeck-us.net, contact@artur-rojek.eu, paul@crapouillou.net, Christophe Branchereau Subject: [PATCH v3 1/5] iio/adc: ingenic: rename has_aux2 to has_aux_md Date: Sat, 24 Jul 2021 21:04:45 +0200 Message-Id: <20210724190449.221894-2-cbranchereau@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210724190449.221894-1-cbranchereau@gmail.com> References: <20210724190449.221894-1-cbranchereau@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627153535893100001 Content-Type: text/plain; charset="utf-8" The jz4760(b) socs have 3 aux channels. The purpose of has_aux2 is to set the MD bits used to select the AUX channel to be sampled, not to describe the hardware. Rename it to a more appropriate name. Signed-off-by: Christophe Branchereau --- drivers/iio/adc/ingenic-adc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c index 34c03a264f74..40f2d8c2cf72 100644 --- a/drivers/iio/adc/ingenic-adc.c +++ b/drivers/iio/adc/ingenic-adc.c @@ -92,7 +92,7 @@ struct ingenic_adc_soc_data { const int *battery_scale_avail; size_t battery_scale_avail_size; unsigned int battery_vref_mode: 1; - unsigned int has_aux2: 1; + unsigned int has_aux_md: 1; const struct iio_chan_spec *channels; unsigned int num_channels; int (*init_clk_div)(struct device *dev, struct ingenic_adc *adc); @@ -506,7 +506,7 @@ static const struct ingenic_adc_soc_data jz4725b_adc_so= c_data =3D { .battery_scale_avail =3D jz4725b_adc_battery_scale_avail, .battery_scale_avail_size =3D ARRAY_SIZE(jz4725b_adc_battery_scale_avail), .battery_vref_mode =3D true, - .has_aux2 =3D false, + .has_aux_md =3D false, .channels =3D jz4740_channels, .num_channels =3D ARRAY_SIZE(jz4740_channels), .init_clk_div =3D jz4725b_adc_init_clk_div, @@ -520,7 +520,7 @@ static const struct ingenic_adc_soc_data jz4740_adc_soc= _data =3D { .battery_scale_avail =3D jz4740_adc_battery_scale_avail, .battery_scale_avail_size =3D ARRAY_SIZE(jz4740_adc_battery_scale_avail), .battery_vref_mode =3D true, - .has_aux2 =3D false, + .has_aux_md =3D false, .channels =3D jz4740_channels, .num_channels =3D ARRAY_SIZE(jz4740_channels), .init_clk_div =3D NULL, /* no ADCLK register on JZ4740 */ @@ -534,7 +534,7 @@ static const struct ingenic_adc_soc_data jz4770_adc_soc= _data =3D { .battery_scale_avail =3D jz4770_adc_battery_scale_avail, .battery_scale_avail_size =3D ARRAY_SIZE(jz4770_adc_battery_scale_avail), .battery_vref_mode =3D false, - .has_aux2 =3D true, + .has_aux_md =3D true, .channels =3D jz4770_channels, .num_channels =3D ARRAY_SIZE(jz4770_channels), .init_clk_div =3D jz4770_adc_init_clk_div, @@ -581,7 +581,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_de= v *iio_dev, =20 /* We cannot sample AUX/AUX2 in parallel. */ mutex_lock(&adc->aux_lock); - if (adc->soc_data->has_aux2 && engine =3D=3D 0) { + if (adc->soc_data->has_aux_md && engine =3D=3D 0) { bit =3D BIT(chan->channel =3D=3D INGENIC_ADC_AUX2); ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, bit); } --=20 2.30.2 From nobody Fri May 9 23:37:48 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1627153540802268.67878847386055; Sat, 24 Jul 2021 12:05:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230051AbhGXSZF (ORCPT ); Sat, 24 Jul 2021 14:25:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbhGXSY7 (ORCPT ); Sat, 24 Jul 2021 14:24:59 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BF3AC06175F; Sat, 24 Jul 2021 12:05:30 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id z7so5927205wrn.11; Sat, 24 Jul 2021 12:05:29 -0700 (PDT) Received: from monk.home (astrasbourg-157-1-7-84.w90-40.abo.wanadoo.fr. [90.40.218.84]) by smtp.gmail.com with ESMTPSA id j15sm1117798wms.20.2021.07.24.12.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 12:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1b99s+XXzyVlqy4K1XF76TB2BwMPkK6Mrt1v3Z/4H7k=; b=ZMHxb5tboNRSUMfTtguKTiQZSvX5fwU2InXfxx2j/f+rSB+oRtGQZ+7CiHrIu4QEXy K+ijq/Vs0Ge1wYr+ffRIb180VGme0wxE07tiVItLED2wByNVriO9hkw+8KMOupVYXeGc UrjzGYWB7dXJggMzuypaG1SWQt+wJnkJCFN8teDBGdhzQZYThHGqp9WKhAv/nL3+vviL hlyHvNpDVCzCNFpSUeNwWB/na5gov9355uNbIluPc6xmj++ORTC6JDReuAp7AnUqAai9 t41lFADh7LATAd0yTuiilsvQFq1uLaiYLdALmtAZcqzyKY7VkY/guZhzO7wQg84WJK1w 5XqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1b99s+XXzyVlqy4K1XF76TB2BwMPkK6Mrt1v3Z/4H7k=; b=dZM/oEdnMsEj/DymjqW2Zu4vNBfnHkHnxY/q+ravXuSrMqD+B8U2MfHvo1HTkg2vXN E1UTG4VhjAYNTcEIvhhy0xBf0mIA4bsaoYhQhXot4ARqXLTtDb7J5FndmONtjxtdE3cp uVZi9BcSjhGoCK31FKoyeF5s/4WYKQK1bdOd0JedGNA2letx+T0SWMLixv1MpNd+/ZIv wnDbfHLC9JlGLpkdDZDyU2g91QWbb9lQfiEzUll545Q34lfSrKVkyx0XWOm4Ew2UCvQj F0nOJKnDt2f/9Te8aeWvePJIj61l0wyZ8nzK9k9YCFyThvfvle8IL9STXUMOqmjmL/+X Ch1A== X-Gm-Message-State: AOAM532AwIARaMkTTX/SLmgIkh4Pp1slV3uxTE+y3+DXIwoAuPX+GVf0 F+k0XkooTdgbmbI7wk/QhwA= X-Google-Smtp-Source: ABdhPJzYJ0XEV7X4OHDBuKxkQBv0XNclWfpmKF57dB0MkBDhEMfiQaFYfOcZsxuLoO0W9EPU3N4dCQ== X-Received: by 2002:adf:c409:: with SMTP id v9mr11160020wrf.102.1627153528189; Sat, 24 Jul 2021 12:05:28 -0700 (PDT) From: Christophe Branchereau Cc: jic23@kernel.org, lars@metafoo.de, linux-mips@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@roeck-us.net, contact@artur-rojek.eu, paul@crapouillou.net, Christophe Branchereau Subject: [PATCH v3 2/5] dt-bindings: iio/adc: add an INGENIC_ADC_AUX0 entry Date: Sat, 24 Jul 2021 21:04:46 +0200 Message-Id: <20210724190449.221894-3-cbranchereau@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210724190449.221894-1-cbranchereau@gmail.com> References: <20210724190449.221894-1-cbranchereau@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627153541950100003 Content-Type: text/plain; charset="utf-8" The JZ4760(B) socs have 3 AUX inputs, add an entry to prepare including the= one named AUX in the sadc driver. Leaving the rest untouched as it's ABI. Signed-off-by: Christophe Branchereau --- include/dt-bindings/iio/adc/ingenic,adc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/iio/adc/ingenic,adc.h b/include/dt-binding= s/iio/adc/ingenic,adc.h index 4627a00e369e..a6ccc031635b 100644 --- a/include/dt-bindings/iio/adc/ingenic,adc.h +++ b/include/dt-bindings/iio/adc/ingenic,adc.h @@ -13,5 +13,6 @@ #define INGENIC_ADC_TOUCH_YN 6 #define INGENIC_ADC_TOUCH_XD 7 #define INGENIC_ADC_TOUCH_YD 8 +#define INGENIC_ADC_AUX0 9 =20 #endif --=20 2.30.2 From nobody Fri May 9 23:37:48 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1627153544268842.7368881570907; Sat, 24 Jul 2021 12:05:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230085AbhGXSZH (ORCPT ); Sat, 24 Jul 2021 14:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229745AbhGXSZA (ORCPT ); Sat, 24 Jul 2021 14:25:00 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9FB3C061757; Sat, 24 Jul 2021 12:05:30 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id n11so2753099wmd.2; Sat, 24 Jul 2021 12:05:30 -0700 (PDT) Received: from monk.home (astrasbourg-157-1-7-84.w90-40.abo.wanadoo.fr. [90.40.218.84]) by smtp.gmail.com with ESMTPSA id j15sm1117798wms.20.2021.07.24.12.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 12:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r4l4X9Ml9axxQp0KFzsTd5BH2EID20QmHeunm7jfaaI=; b=EFbKtpEYqM0JbnaWCyMfLkzsjfqn+6n7VqWYEVhYWZ/1W5/DVxhg3o2JDUl8Zv4B5U +RYeF229YNGBTT6REqUCSa0+KeFGYlPVdJaMXozsXgVFl5CyyEt1mCVVh+vto+9VTf8t QJa4+/Sv4R7SgCaI0Xzll8rlQHeBndnCiG/akrLu60rEe89PGtmbwjGACuseUPAh+Ryf tsbYE+6UaBvxD5WmGriGe7inXieEf34KE57VRSj26MAez9w4n7VRQhwQgQPTXopYnTPl 6lB+SGXJEmwvjahEOgl4kpvn+GmvcaNd2NkJxo+Y7fqACiaqvfWCmP7vWItp7Td7KYxa WDOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r4l4X9Ml9axxQp0KFzsTd5BH2EID20QmHeunm7jfaaI=; b=I0nGJqd6Z+DiSj14vuvRElXSIBECu2Xe2Rqdv5XhSs8cXgkSQ1fydDfxGle64TUuv5 QowUqgTBOPsn9tTdc7ldqsP2Zp8EZYooL8ITkXbC82P5T0qiZ6MUSKjhLA9zcJmt2OXG 3cErj/1nWdyxLlU9XLZb07BWBwCo4eocwebzVV4Nc83myBnLvILYSybBE446WgYYja/W qtq1YY/rTVmgeoBA0tjwo0Jvs5Sm1U0cvhBf7MportC/7MsgYrMjPo+1BCnsabKUuUcl NbPr/iJ3BQB+GIRV0tBCmXGy9pSBFjUN8Thazuon85SlFJ439Qp4Ns8D04QoXJqdKhzF tSzQ== X-Gm-Message-State: AOAM530R5NJClGI78x2Fev9InlSZMEY0n9+vEpIXMeHVufZu1zu85KSc DUVNgBny8L96dOZTsB55vb0= X-Google-Smtp-Source: ABdhPJyf2ox5QLWxNIExZYLr3mmgGNJUkVFz4luV6S7JpaNeRe7Kp9Gm/Ag1xINQHYWW1pl0n2wKXg== X-Received: by 2002:a1c:26c4:: with SMTP id m187mr325127wmm.71.1627153529062; Sat, 24 Jul 2021 12:05:29 -0700 (PDT) From: Christophe Branchereau Cc: jic23@kernel.org, lars@metafoo.de, linux-mips@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@roeck-us.net, contact@artur-rojek.eu, paul@crapouillou.net, Christophe Branchereau Subject: [PATCH v3 3/5] iio/adc: ingenic: add JZ4760 support to the sadc driver Date: Sat, 24 Jul 2021 21:04:47 +0200 Message-Id: <20210724190449.221894-4-cbranchereau@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210724190449.221894-1-cbranchereau@gmail.com> References: <20210724190449.221894-1-cbranchereau@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627153546157100001 Content-Type: text/plain; charset="utf-8" The jz4760 sadc is very similar to the jz4770 one, but has a VREF of 2.5V and 3 aux channels. modify ingenic_adc_read_chan_info_raw() needs a change to account for it. Signed-off-by: Christophe Branchereau --- drivers/iio/adc/ingenic-adc.c | 82 +++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c index 40f2d8c2cf72..6b9af0530590 100644 --- a/drivers/iio/adc/ingenic-adc.c +++ b/drivers/iio/adc/ingenic-adc.c @@ -71,6 +71,7 @@ #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS 10 #define JZ4740_ADC_BATTERY_HIGH_VREF (7500 * 0.986) #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS 12 +#define JZ4760_ADC_BATTERY_VREF 2500 #define JZ4770_ADC_BATTERY_VREF 1200 #define JZ4770_ADC_BATTERY_VREF_BITS 12 =20 @@ -295,6 +296,10 @@ static const int jz4740_adc_battery_scale_avail[] =3D { JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS, }; =20 +static const int jz4760_adc_battery_scale_avail[] =3D { + JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS, +}; + static const int jz4770_adc_battery_raw_avail[] =3D { 0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1, }; @@ -400,6 +405,47 @@ static const struct iio_chan_spec jz4740_channels[] = =3D { }, }; =20 +static const struct iio_chan_spec jz4760_channels[] =3D { + { + .extend_name =3D "aux", + .type =3D IIO_VOLTAGE, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed =3D 1, + .channel =3D INGENIC_ADC_AUX0, + .scan_index =3D -1, + }, + { + .extend_name =3D "aux1", + .type =3D IIO_VOLTAGE, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed =3D 1, + .channel =3D INGENIC_ADC_AUX, + .scan_index =3D -1, + }, + { + .extend_name =3D "aux2", + .type =3D IIO_VOLTAGE, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed =3D 1, + .channel =3D INGENIC_ADC_AUX2, + .scan_index =3D -1, + }, + { + .extend_name =3D "battery", + .type =3D IIO_VOLTAGE, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed =3D 1, + .channel =3D INGENIC_ADC_BATTERY, + .scan_index =3D -1, + }, +}; + static const struct iio_chan_spec jz4770_channels[] =3D { { .type =3D IIO_VOLTAGE, @@ -526,6 +572,20 @@ static const struct ingenic_adc_soc_data jz4740_adc_so= c_data =3D { .init_clk_div =3D NULL, /* no ADCLK register on JZ4740 */ }; =20 +static const struct ingenic_adc_soc_data jz4760_adc_soc_data =3D { + .battery_high_vref =3D JZ4760_ADC_BATTERY_VREF, + .battery_high_vref_bits =3D JZ4770_ADC_BATTERY_VREF_BITS, + .battery_raw_avail =3D jz4770_adc_battery_raw_avail, + .battery_raw_avail_size =3D ARRAY_SIZE(jz4770_adc_battery_raw_avail), + .battery_scale_avail =3D jz4760_adc_battery_scale_avail, + .battery_scale_avail_size =3D ARRAY_SIZE(jz4760_adc_battery_scale_avail), + .battery_vref_mode =3D false, + .has_aux_md =3D true, + .channels =3D jz4760_channels, + .num_channels =3D ARRAY_SIZE(jz4760_channels), + .init_clk_div =3D jz4770_adc_init_clk_div, +}; + static const struct ingenic_adc_soc_data jz4770_adc_soc_data =3D { .battery_high_vref =3D JZ4770_ADC_BATTERY_VREF, .battery_high_vref_bits =3D JZ4770_ADC_BATTERY_VREF_BITS, @@ -569,7 +629,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_de= v *iio_dev, struct iio_chan_spec const *chan, int *val) { - int bit, ret, engine =3D (chan->channel =3D=3D INGENIC_ADC_BATTERY); + int cmd, ret, engine =3D (chan->channel =3D=3D INGENIC_ADC_BATTERY); struct ingenic_adc *adc =3D iio_priv(iio_dev); =20 ret =3D clk_enable(adc->clk); @@ -579,11 +639,22 @@ static int ingenic_adc_read_chan_info_raw(struct iio_= dev *iio_dev, return ret; } =20 - /* We cannot sample AUX/AUX2 in parallel. */ + /* We cannot sample the aux channels in parallel. */ mutex_lock(&adc->aux_lock); if (adc->soc_data->has_aux_md && engine =3D=3D 0) { - bit =3D BIT(chan->channel =3D=3D INGENIC_ADC_AUX2); - ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, bit); + switch (chan->channel) { + case INGENIC_ADC_AUX0: + cmd =3D 0; + break; + case INGENIC_ADC_AUX: + cmd =3D 1; + break; + case INGENIC_ADC_AUX2: + cmd =3D 2; + break; + } + + ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, cmd); } =20 ret =3D ingenic_adc_capture(adc, engine); @@ -591,6 +662,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_de= v *iio_dev, goto out; =20 switch (chan->channel) { + case INGENIC_ADC_AUX0: case INGENIC_ADC_AUX: case INGENIC_ADC_AUX2: *val =3D readw(adc->base + JZ_ADC_REG_ADSDAT); @@ -621,6 +693,7 @@ static int ingenic_adc_read_raw(struct iio_dev *iio_dev, return ingenic_adc_read_chan_info_raw(iio_dev, chan, val); case IIO_CHAN_INFO_SCALE: switch (chan->channel) { + case INGENIC_ADC_AUX0: case INGENIC_ADC_AUX: case INGENIC_ADC_AUX2: *val =3D JZ_ADC_AUX_VREF; @@ -832,6 +905,7 @@ static int ingenic_adc_probe(struct platform_device *pd= ev) static const struct of_device_id ingenic_adc_of_match[] =3D { { .compatible =3D "ingenic,jz4725b-adc", .data =3D &jz4725b_adc_soc_data,= }, { .compatible =3D "ingenic,jz4740-adc", .data =3D &jz4740_adc_soc_data, }, + { .compatible =3D "ingenic,jz4760-adc", .data =3D &jz4760_adc_soc_data, }, { .compatible =3D "ingenic,jz4770-adc", .data =3D &jz4770_adc_soc_data, }, { }, }; --=20 2.30.2 From nobody Fri May 9 23:37:48 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1627153548644383.54872796687175; Sat, 24 Jul 2021 12:05:48 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbhGXSZP (ORCPT ); Sat, 24 Jul 2021 14:25:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229834AbhGXSZB (ORCPT ); Sat, 24 Jul 2021 14:25:01 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71C73C061575; Sat, 24 Jul 2021 12:05:31 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id b128so2744294wmb.4; Sat, 24 Jul 2021 12:05:31 -0700 (PDT) Received: from monk.home (astrasbourg-157-1-7-84.w90-40.abo.wanadoo.fr. [90.40.218.84]) by smtp.gmail.com with ESMTPSA id j15sm1117798wms.20.2021.07.24.12.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 12:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CE42oTvnUW/ICeEUw/qu06y5Bh7gLGHxP818wCHu9ZI=; b=Mk98RsKgtx8fgh6/6N2TN1pQqI83pAQTpIiYgI/RF2pEILohyQmi0j5HZWijDjB+Oz 8j634AlbzNZpkazgAYpSaUR1r6rGNJPgrAP9jKQZjrKMQrk2ZBt4ABvijxYGYisePIYM 7DDcxXnjAzNqJ+blfl2SF2KsAAhSB1wajIe5yxKXCqDpA37TZcMyopFNTOBecmhbo+X9 Jh10TFXWWZv8Wk5R8YfDw8Eaku2l3Sk4SqPllrca9hKhI+j+9ZYwIp7xSZCFAIQEefqA H7T/ZiomolCvlHZ2/lj6DqXy3HYd2egsJqx9xl/cABIQj1HmttxgEdcPgydQzw5bjCYw GFLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CE42oTvnUW/ICeEUw/qu06y5Bh7gLGHxP818wCHu9ZI=; b=D5VHy0uKzwawXqhiq1n/wksWH/deA2LUaHWsd6mj5imBpU0DENmdyfv/mTVM3j/mNj y7ACgoVFgEj8IQ31Rcc5cNOHwHjfgnJUa7zpuHRPCotWeRH4zkLMKIUzA5Ic9ZYlMy0u 0dVTTWntbOq910d/7eTIufxoum+ZxEsLz11jGEpCZRurkC3Qx1OUeFkOaBzesVHODq0O MYMATCV/Q3zjP05AE/RwlTbuKJa3cUBn5be4MHeOlGsN0aarTsVTevZbm3oAr2yf0mkt z0f9Mc/YjtOiW75jTdtSKhLZNrKzqzsK7w4qWMY+QbZPxb/icGzvfDpCIzqO29xNi6fT gKwg== X-Gm-Message-State: AOAM5331QGZlLUkIKYM4L3qHov3WFY8aW1sFecktKnvtpbQhtkDrJRyb WWxdpG9z3t0Wh8AIPKJW7OI= X-Google-Smtp-Source: ABdhPJykDBiE5RrChDh5kqaoxp/FTuQNEPvV4Rh5x18J6Pmw1B7bloCOXv/6+TwjXqchDtVFKH+0wQ== X-Received: by 2002:a1c:ed10:: with SMTP id l16mr19345683wmh.8.1627153529906; Sat, 24 Jul 2021 12:05:29 -0700 (PDT) From: Christophe Branchereau Cc: jic23@kernel.org, lars@metafoo.de, linux-mips@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@roeck-us.net, contact@artur-rojek.eu, paul@crapouillou.net, Christophe Branchereau Subject: [PATCH v3 4/5] iio/adc: ingenic: add JZ4760B support to the sadc driver Date: Sat, 24 Jul 2021 21:04:48 +0200 Message-Id: <20210724190449.221894-5-cbranchereau@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210724190449.221894-1-cbranchereau@gmail.com> References: <20210724190449.221894-1-cbranchereau@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627153550492100001 Content-Type: text/plain; charset="utf-8" The JZ4760B variant differs slightly from the JZ4760: it has a bit called V= BAT_SEL in the CFG register. In order to correctly sample the battery voltage on existing handhelds usin= g this SOC, the bit must be cleared. We leave the possibility to set the bit, by using the "ingenic,use-internal= -divider" in the devicetree. Signed-off-by: Christophe Branchereau --- drivers/iio/adc/ingenic-adc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c index 6b9af0530590..eaa8ab36183c 100644 --- a/drivers/iio/adc/ingenic-adc.c +++ b/drivers/iio/adc/ingenic-adc.c @@ -37,6 +37,7 @@ #define JZ_ADC_REG_CFG_SAMPLE_NUM(n) ((n) << 10) #define JZ_ADC_REG_CFG_PULL_UP(n) ((n) << 16) #define JZ_ADC_REG_CFG_CMD_SEL BIT(22) +#define JZ_ADC_REG_CFG_VBAT_SEL BIT(30) #define JZ_ADC_REG_CFG_TOUCH_OPS_MASK (BIT(31) | GENMASK(23, 10)) #define JZ_ADC_REG_ADCLK_CLKDIV_LSB 0 #define JZ4725B_ADC_REG_ADCLK_CLKDIV10US_LSB 16 @@ -879,6 +880,14 @@ static int ingenic_adc_probe(struct platform_device *p= dev) /* Put hardware in a known passive state. */ writeb(0x00, adc->base + JZ_ADC_REG_ENABLE); writeb(0xff, adc->base + JZ_ADC_REG_CTRL); + + /* JZ4760B specific */ + if (device_property_present(dev, "ingenic,use-internal-divider")) + ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_VBAT_SEL, + JZ_ADC_REG_CFG_VBAT_SEL); + else + ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_VBAT_SEL, 0); + usleep_range(2000, 3000); /* Must wait at least 2ms. */ clk_disable(adc->clk); =20 --=20 2.30.2 From nobody Fri May 9 23:37:48 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1627153550233131.78741991248762; Sat, 24 Jul 2021 12:05:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbhGXSZR (ORCPT ); Sat, 24 Jul 2021 14:25:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbhGXSZC (ORCPT ); Sat, 24 Jul 2021 14:25:02 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E18CC06175F; Sat, 24 Jul 2021 12:05:32 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id m20-20020a05600c4f54b029024e75a15716so2691486wmq.2; Sat, 24 Jul 2021 12:05:32 -0700 (PDT) Received: from monk.home (astrasbourg-157-1-7-84.w90-40.abo.wanadoo.fr. [90.40.218.84]) by smtp.gmail.com with ESMTPSA id j15sm1117798wms.20.2021.07.24.12.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 12:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L6mgIBbDERHrkCfdLTeeBkkROy6MNNlPhpbr+IZWCG0=; b=kWO5kTX6qOZhjysoEpAtRpAwW9NLPsN7Xm1DOg6ApYo1yJDVOOy7mGzGWSWqoHnDUG sCGCHK/Qg31NBII+CppsVqz4W5fu9g09DbhK1EDAffkOrsdXWbNYfGvgRuiUmdcApaKu YbiIMUqHx+VriAIpvsFY3LOh95ERz1kc9tPPoJYviYdwcVNDhjm6G7XC859pdQws+Ugs 82TTq6TJzcIwwlVuZdr4G/HUAdFzczbMQJvjtXi9NzMtWSlQnrO5sd/zXYvLMwJ7xNaE dwqJM75lrgsbstFK9xIU7n4Aa1BxH5XE++LME/4zYR0fZHm0sgezUc1nERcZ0DVt0CH9 xvsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L6mgIBbDERHrkCfdLTeeBkkROy6MNNlPhpbr+IZWCG0=; b=Sz6Pg6qEMD7dQykBoE2Fl3Hs4AIYLEV1eoePEEhapOB0zClh2B8fR/XCc41ODDxO+2 d+ro8wgAGzepfxn1X3Gw+yFMFk6ZQPmAV65B5bFLZcWNwhOKELSESqoD+Xx3axBmuqu7 SgB5ipHGxmRr6AMEUwpAoH7SU2YUUN3+twhE5auLwCbcVzwzkfdikWCVIcvoAtNzyLB/ Z1ooSS3tKpENaT230tlTHo0UH5u/F3jnr7iH1yMm445e82OBOzhfeJ/ugHEQE7qNVQgb XitVSDpoq8iK/W/RYGXcWR+qxQ+E/ebcH8rCGEMPg8IuHgD1s73TYXZDbAhdJJRCaaF3 kYSA== X-Gm-Message-State: AOAM530tyaM77WKtEcR0EydGegnpT9tBuIQSZQUZAHBxe4HEhask3pjM +uqoPpx4sQzZjyOIjhKHDuX7BUUCPAEnjIlF X-Google-Smtp-Source: ABdhPJwiri0wRQuVWzxKRd7O64i3yhmC0ux1B5nJV+Lp05qiUNKbpFW6GZHthZto9WkNOLlr0aFMtg== X-Received: by 2002:a1c:f613:: with SMTP id w19mr20214045wmc.136.1627153530699; Sat, 24 Jul 2021 12:05:30 -0700 (PDT) From: Christophe Branchereau Cc: jic23@kernel.org, lars@metafoo.de, linux-mips@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@roeck-us.net, contact@artur-rojek.eu, paul@crapouillou.net, Christophe Branchereau Subject: [PATCH v3 5/5] dt-bindings: iio/adc: ingenic: add the JZ4760(B) socs to the sadc Documentation Date: Sat, 24 Jul 2021 21:04:49 +0200 Message-Id: <20210724190449.221894-6-cbranchereau@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210724190449.221894-1-cbranchereau@gmail.com> References: <20210724190449.221894-1-cbranchereau@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627153550598100002 Content-Type: text/plain; charset="utf-8" Add both the jz4760 and jz4760b, plus a property to use the internal divider on the b variant and document it. Signed-off-by: Christophe Branchereau --- .../bindings/iio/adc/ingenic,adc.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml b/D= ocumentation/devicetree/bindings/iio/adc/ingenic,adc.yaml index 433a3fb55a2e..3eb7aa8822c3 100644 --- a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml @@ -23,6 +23,8 @@ properties: enum: - ingenic,jz4725b-adc - ingenic,jz4740-adc + - ingenic,jz4760-adc + - ingenic,jz4760b-adc - ingenic,jz4770-adc =20 '#io-channel-cells': @@ -43,6 +45,23 @@ properties: interrupts: maxItems: 1 =20 + ingenic,use-internal-divider: + description: + If present, battery voltage is read from the VBAT_IR pin, which has = an + internal 1/4 divider. If absent, it is read through the VBAT_ER pin, + which does not have such a divider. + type: boolean + +if: + not: + properties: + compatible: + contains: + const: ingenic,jz4760b-adc +then: + properties: + ingenic,use-internal-divider: false + required: - compatible - '#io-channel-cells' --=20 2.30.2