From nobody Mon Nov 25 19:49:16 2024 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 468521DD53F for ; Fri, 25 Oct 2024 09:51:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729849866; cv=none; b=ljbth86HtPSb6evkvteg2EgB0cHI54npTrII7WaH9bcusSs9vdTSF+v8AkoMXUAxfE0G3YcK5GYDKzpQOyj/xUz5DZPcX/waWUdYGfo0WTxOI/MI4I1Zg01Mxwnt6AaqhtXwDHe7LOjehEL8k7ulOS+D9MApuHk4GycNeh/4xn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729849866; c=relaxed/simple; bh=t/dNoYyPsk00WJ+Z6LTzlPuEDhwOCIV9BshnuK45DGI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SaJ/gT1GzyI68wtEay2ykwtYHcpsfxaliSNWYr0oAlWCC7qdtqyCp5IM6Q6pHKMH9DXxVu34JPR0+LMx7r2YU/IDPoGGC1tCKX55MzHTxxdXUqXKwcdV4Iw2hB21CfAxN5/V1Kg4xOBjokzYDlUysq2Fnx7WBzFsBfZCg7MfJWs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=DU/GrUv+; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="DU/GrUv+" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4315abed18aso18302155e9.2 for ; Fri, 25 Oct 2024 02:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1729849861; x=1730454661; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BOBvdaI9wOm6bo6Pimz4bWwq5Ue/5MCX88NLsjKCtoo=; b=DU/GrUv+24uI1u3qDUFeZpeDaXF+K4BN0tBpFoDKBLZVfoLJkk80kAk4FvDhQuBJLw dmpT2OrHF5mqcLRrTk/LeDA08s2dvbc58aiOsx8KMElA3RpaFvDK12fsh5rN6B4DtcDi Bg11jiQ1RO2mLBkRpITWCO4OkQO+KOoliedTtTHaNmtWbEEr+q1VdIHuaDzA8v4vpEYX QKOpfbf3lGQf2fMQyhMDTPtGwJA2H+/qUUk9oR6HXlkMgiPa6pJbozDyljFEKp5jhXn/ xnQYmzNANLG6qnbCJVYWwYePhoIxdgatuLK8150vhiS4vr/1V6Rxbov3B6kqzrQ/p8A0 miGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729849861; x=1730454661; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BOBvdaI9wOm6bo6Pimz4bWwq5Ue/5MCX88NLsjKCtoo=; b=k7AlDLeYvemYob/ga+c2KNUI7JiENYFiQ3yfBFzmEykZ61wUTS0sJuK5vMNPOjVHUu 05douhBOrLz8qNML/EDbF8ETLwypZAcDF7GbqDwQ3y4eAaqmGhtDKphGrLI0wqUiNYOM wVf++uuAGbcH59Bbkn/XSA4y6EE/D325pHqaTGwPrjhEgJ1lhz29Rsgddj+Ow9LBr0z/ uGrf1lmPMlb0qpUNnf5HIVXBuGaM5ZaQIz6lo/t+orbZq6uDIXoAXEIIA1lPKJ1JUWyY sHXk87e7K8gVADkdQ7FGO58EBl3pje15P34Ttey2/NB8I6B5jLEDMYORtIBRdjuzToB3 vfDA== X-Forwarded-Encrypted: i=1; AJvYcCU4o/UsoT3tu95UtpokazD79diwJFvAhN0MbXRa6qq31zzluJeQhxEdS1iitLd9ELdlMSXlk7EW64TWKeM=@vger.kernel.org X-Gm-Message-State: AOJu0YwLQvRtn057/szh8ipqPBeQdnwn6eiX3uHBYzZAqM9DdqCizE5e 2HRkgczZsxLcOkeSNpTqCxAE7fxmLzYujuZUCIXywoCUPSekUmAE1K1zdUMWbcQ= X-Google-Smtp-Source: AGHT+IEVEDI5gj+9cjjnpyCT0zgfpeqe8wK0CM2ImfbEj7cmUKRIDteZ1Ki39Fy1cRMnS1GLHteolg== X-Received: by 2002:a05:600c:1c0f:b0:431:3b53:105e with SMTP id 5b1f17b1804b1-431841fda82mr74719375e9.9.1729849861407; Fri, 25 Oct 2024 02:51:01 -0700 (PDT) Received: from [127.0.1.1] (host-79-41-194-153.retail.telecomitalia.it. [79.41.194.153]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431935f6df1sm12895085e9.35.2024.10.25.02.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2024 02:51:00 -0700 (PDT) From: Angelo Dureghello X-Google-Original-From: Angelo Dureghello Date: Fri, 25 Oct 2024 11:49:37 +0200 Subject: [PATCH v8 4/8] iio: dac: adi-axi-dac: extend features Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241025-wip-bl-ad3552r-axi-v0-iio-testing-v8-4-74ca7dd60567@baylibre.com> References: <20241025-wip-bl-ad3552r-axi-v0-iio-testing-v8-0-74ca7dd60567@baylibre.com> In-Reply-To: <20241025-wip-bl-ad3552r-axi-v0-iio-testing-v8-0-74ca7dd60567@baylibre.com> To: Lars-Peter Clausen , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Olivier Moysan Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown , dlechner@baylibre.com, Angelo Dureghello X-Mailer: b4 0.14.1 From: Angelo Dureghello Extend AXI-DAC backend with new features required to interface to the ad3552r DAC. Mainly, a new compatible string is added to support the ad3552r-axi DAC IP, very similar to the generic DAC IP but with some customizations to work with the ad3552r. Then, a series of generic functions has been added to match with ad3552r needs. Function names has been kept generic as much as possible, to allow re-utilization from other frontend drivers. Signed-off-by: Angelo Dureghello --- drivers/iio/dac/adi-axi-dac.c | 244 ++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 230 insertions(+), 14 deletions(-) diff --git a/drivers/iio/dac/adi-axi-dac.c b/drivers/iio/dac/adi-axi-dac.c index 04193a98616e..148e40a8ab2a 100644 --- a/drivers/iio/dac/adi-axi-dac.c +++ b/drivers/iio/dac/adi-axi-dac.c @@ -46,9 +46,28 @@ #define AXI_DAC_CNTRL_1_REG 0x0044 #define AXI_DAC_CNTRL_1_SYNC BIT(0) #define AXI_DAC_CNTRL_2_REG 0x0048 +#define AXI_DAC_CNTRL_2_SDR_DDR_N BIT(16) +#define AXI_DAC_CNTRL_2_SYMB_8B BIT(14) #define ADI_DAC_CNTRL_2_R1_MODE BIT(5) +#define AXI_DAC_CNTRL_2_UNSIGNED_DATA BIT(4) +#define AXI_DAC_STATUS_1_REG 0x0054 +#define AXI_DAC_STATUS_2_REG 0x0058 #define AXI_DAC_DRP_STATUS_REG 0x0074 #define AXI_DAC_DRP_STATUS_DRP_LOCKED BIT(17) +#define AXI_DAC_CUSTOM_RD_REG 0x0080 +#define AXI_DAC_CUSTOM_WR_REG 0x0084 +#define AXI_DAC_CUSTOM_WR_DATA_8 GENMASK(23, 16) +#define AXI_DAC_CUSTOM_WR_DATA_16 GENMASK(23, 8) +#define AXI_DAC_UI_STATUS_REG 0x0088 +#define AXI_DAC_UI_STATUS_IF_BUSY BIT(4) +#define AXI_DAC_CUSTOM_CTRL_REG 0x008C +#define AXI_DAC_CUSTOM_CTRL_ADDRESS GENMASK(31, 24) +#define AXI_DAC_CUSTOM_CTRL_SYNCED_TRANSFER BIT(2) +#define AXI_DAC_CUSTOM_CTRL_STREAM BIT(1) +#define AXI_DAC_CUSTOM_CTRL_TRANSFER_DATA BIT(0) + +#define AXI_DAC_CUSTOM_CTRL_STREAM_ENABLE (AXI_DAC_CUSTOM_CTRL_TRANSFER_DA= TA | \ + AXI_DAC_CUSTOM_CTRL_STREAM) =20 /* DAC Channel controls */ #define AXI_DAC_CHAN_CNTRL_1_REG(c) (0x0400 + (c) * 0x40) @@ -63,12 +82,21 @@ #define AXI_DAC_CHAN_CNTRL_7_REG(c) (0x0418 + (c) * 0x40) #define AXI_DAC_CHAN_CNTRL_7_DATA_SEL GENMASK(3, 0) =20 +#define AXI_DAC_RD_ADDR(x) (BIT(7) | (x)) + /* 360 degrees in rad */ #define AXI_DAC_2_PI_MEGA 6283190 =20 enum { AXI_DAC_DATA_INTERNAL_TONE, AXI_DAC_DATA_DMA =3D 2, + AXI_DAC_DATA_INTERNAL_RAMP_16BIT =3D 11, +}; + +struct axi_dac_info { + unsigned int version; + const struct iio_backend_info *backend_info; + bool has_dac_clk; }; =20 struct axi_dac_state { @@ -79,9 +107,11 @@ struct axi_dac_state { * data/variables. */ struct mutex lock; + const struct axi_dac_info *info; u64 dac_clk; u32 reg_config; bool int_tone; + int dac_clk_rate; }; =20 static int axi_dac_enable(struct iio_backend *back) @@ -471,6 +501,11 @@ static int axi_dac_data_source_set(struct iio_backend = *back, unsigned int chan, AXI_DAC_CHAN_CNTRL_7_REG(chan), AXI_DAC_CHAN_CNTRL_7_DATA_SEL, AXI_DAC_DATA_DMA); + case IIO_BACKEND_INTERNAL_RAMP_16BIT: + return regmap_update_bits(st->regmap, + AXI_DAC_CHAN_CNTRL_7_REG(chan), + AXI_DAC_CHAN_CNTRL_7_DATA_SEL, + AXI_DAC_DATA_INTERNAL_RAMP_16BIT); default: return -EINVAL; } @@ -528,6 +563,142 @@ static int axi_dac_reg_access(struct iio_backend *bac= k, unsigned int reg, return regmap_write(st->regmap, reg, writeval); } =20 +static int axi_dac_ddr_enable(struct iio_backend *back) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + return regmap_clear_bits(st->regmap, AXI_DAC_CNTRL_2_REG, + AXI_DAC_CNTRL_2_SDR_DDR_N); +} + +static int axi_dac_ddr_disable(struct iio_backend *back) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + return regmap_set_bits(st->regmap, AXI_DAC_CNTRL_2_REG, + AXI_DAC_CNTRL_2_SDR_DDR_N); +} + +static int axi_dac_data_stream_enable(struct iio_backend *back) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + return regmap_set_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_STREAM_ENABLE); +} + +static int axi_dac_data_stream_disable(struct iio_backend *back) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + return regmap_clear_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_STREAM_ENABLE); +} + +static int axi_dac_data_transfer_addr(struct iio_backend *back, u32 addres= s) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + if (address > FIELD_MAX(AXI_DAC_CUSTOM_CTRL_ADDRESS)) + return -EINVAL; + + /* + * Sample register address, when the DAC is configured, or stream + * start address when the FSM is in stream state. + */ + return regmap_update_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_ADDRESS, + FIELD_PREP(AXI_DAC_CUSTOM_CTRL_ADDRESS, + address)); +} + +static int axi_dac_data_format_set(struct iio_backend *back, unsigned int = ch, + const struct iio_backend_data_fmt *data) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + + switch (data->type) { + case IIO_BACKEND_DATA_UNSIGNED: + return regmap_clear_bits(st->regmap, AXI_DAC_CNTRL_2_REG, + AXI_DAC_CNTRL_2_UNSIGNED_DATA); + default: + return -EINVAL; + } +} + +static int axi_dac_bus_reg_write(struct iio_backend *back, u32 reg, u32 va= l, + size_t data_size) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + int ret; + u32 ival; + + /* + * Both AXI_DAC_CNTRL_2_REG and AXI_DAC_CUSTOM_WR_REG need to know + * the data size. So keeping data size control here only, + * since data size is mandatory for the current transfer. + * DDR state handled separately by specific backend calls, + * generally all raw register writes are SDR. + */ + if (data_size =3D=3D sizeof(u16)) + ival =3D FIELD_PREP(AXI_DAC_CUSTOM_WR_DATA_16, val); + else + ival =3D FIELD_PREP(AXI_DAC_CUSTOM_WR_DATA_8, val); + + ret =3D regmap_write(st->regmap, AXI_DAC_CUSTOM_WR_REG, ival); + if (ret) + return ret; + + if (data_size =3D=3D sizeof(u8)) + ret =3D regmap_set_bits(st->regmap, AXI_DAC_CNTRL_2_REG, + AXI_DAC_CNTRL_2_SYMB_8B); + else + ret =3D regmap_clear_bits(st->regmap, AXI_DAC_CNTRL_2_REG, + AXI_DAC_CNTRL_2_SYMB_8B); + if (ret) + return ret; + + ret =3D regmap_update_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_ADDRESS, + FIELD_PREP(AXI_DAC_CUSTOM_CTRL_ADDRESS, reg)); + if (ret) + return ret; + + ret =3D regmap_update_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_TRANSFER_DATA, + AXI_DAC_CUSTOM_CTRL_TRANSFER_DATA); + if (ret) + return ret; + + ret =3D regmap_read_poll_timeout(st->regmap, + AXI_DAC_UI_STATUS_REG, ival, + FIELD_GET(AXI_DAC_UI_STATUS_IF_BUSY, ival) =3D=3D 0, + 10, 100 * KILO); + if (ret =3D=3D -ETIMEDOUT) + dev_err(st->dev, "AXI read timeout\n"); + + /* Cleaning always AXI_DAC_CUSTOM_CTRL_TRANSFER_DATA */ + return regmap_clear_bits(st->regmap, AXI_DAC_CUSTOM_CTRL_REG, + AXI_DAC_CUSTOM_CTRL_TRANSFER_DATA); +} + +static int axi_dac_bus_reg_read(struct iio_backend *back, u32 reg, u32 *va= l, + size_t data_size) +{ + struct axi_dac_state *st =3D iio_backend_get_priv(back); + int ret; + + /* + * SPI, we write with read flag, then we read just at the AXI + * io address space to get data read. + */ + ret =3D axi_dac_bus_reg_write(back, AXI_DAC_RD_ADDR(reg), 0, data_size); + if (ret) + return ret; + + return regmap_read(st->regmap, AXI_DAC_CUSTOM_RD_REG, val); +} + static const struct iio_backend_ops axi_dac_generic_ops =3D { .enable =3D axi_dac_enable, .disable =3D axi_dac_disable, @@ -541,11 +712,30 @@ static const struct iio_backend_ops axi_dac_generic_o= ps =3D { .debugfs_reg_access =3D iio_backend_debugfs_ptr(axi_dac_reg_access), }; =20 +static const struct iio_backend_ops axi_ad3552r_ops =3D { + .enable =3D axi_dac_enable, + .disable =3D axi_dac_disable, + .request_buffer =3D axi_dac_request_buffer, + .free_buffer =3D axi_dac_free_buffer, + .data_source_set =3D axi_dac_data_source_set, + .ddr_enable =3D axi_dac_ddr_enable, + .ddr_disable =3D axi_dac_ddr_disable, + .data_stream_enable =3D axi_dac_data_stream_enable, + .data_stream_disable =3D axi_dac_data_stream_disable, + .data_format_set =3D axi_dac_data_format_set, + .data_transfer_addr =3D axi_dac_data_transfer_addr, +}; + static const struct iio_backend_info axi_dac_generic =3D { .name =3D "axi-dac", .ops =3D &axi_dac_generic_ops, }; =20 +static const struct iio_backend_info axi_ad3552r =3D { + .name =3D "axi-ad3552r", + .ops =3D &axi_ad3552r_ops, +}; + static const struct regmap_config axi_dac_regmap_config =3D { .val_bits =3D 32, .reg_bits =3D 32, @@ -555,7 +745,6 @@ static const struct regmap_config axi_dac_regmap_config= =3D { =20 static int axi_dac_probe(struct platform_device *pdev) { - const unsigned int *expected_ver; struct axi_dac_state *st; void __iomem *base; unsigned int ver; @@ -566,14 +755,29 @@ static int axi_dac_probe(struct platform_device *pdev) if (!st) return -ENOMEM; =20 - expected_ver =3D device_get_match_data(&pdev->dev); - if (!expected_ver) + st->info =3D device_get_match_data(&pdev->dev); + if (!st->info) return -ENODEV; + clk =3D devm_clk_get_enabled(&pdev->dev, "s_axi_aclk"); + if (IS_ERR(clk)) { + /* Backward compat., old fdt versions without clock-names. */ + clk =3D devm_clk_get_enabled(&pdev->dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(clk), + "failed to get clock\n"); + } + + if (st->info->has_dac_clk) { + struct clk *dac_clk; =20 - clk =3D devm_clk_get_enabled(&pdev->dev, NULL); - if (IS_ERR(clk)) - return dev_err_probe(&pdev->dev, PTR_ERR(clk), - "failed to get clock\n"); + dac_clk =3D devm_clk_get_enabled(&pdev->dev, "dac_clk"); + if (IS_ERR(dac_clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(dac_clk), + "failed to get dac_clk clock\n"); + + /* We only care about the streaming mode rate */ + st->dac_clk_rate =3D clk_get_rate(dac_clk) / 2; + } =20 base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) @@ -598,12 +802,13 @@ static int axi_dac_probe(struct platform_device *pdev) if (ret) return ret; =20 - if (ADI_AXI_PCORE_VER_MAJOR(ver) !=3D ADI_AXI_PCORE_VER_MAJOR(*expected_v= er)) { + if (ADI_AXI_PCORE_VER_MAJOR(ver) !=3D + ADI_AXI_PCORE_VER_MAJOR(st->info->version)) { dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", - ADI_AXI_PCORE_VER_MAJOR(*expected_ver), - ADI_AXI_PCORE_VER_MINOR(*expected_ver), - ADI_AXI_PCORE_VER_PATCH(*expected_ver), + ADI_AXI_PCORE_VER_MAJOR(st->info->version), + ADI_AXI_PCORE_VER_MINOR(st->info->version), + ADI_AXI_PCORE_VER_PATCH(st->info->version), ADI_AXI_PCORE_VER_MAJOR(ver), ADI_AXI_PCORE_VER_MINOR(ver), ADI_AXI_PCORE_VER_PATCH(ver)); @@ -629,7 +834,8 @@ static int axi_dac_probe(struct platform_device *pdev) return ret; =20 mutex_init(&st->lock); - ret =3D devm_iio_backend_register(&pdev->dev, &axi_dac_generic, st); + + ret =3D devm_iio_backend_register(&pdev->dev, st->info->backend_info, st); if (ret) return dev_err_probe(&pdev->dev, ret, "failed to register iio backend\n"); @@ -642,10 +848,20 @@ static int axi_dac_probe(struct platform_device *pdev) return 0; } =20 -static unsigned int axi_dac_9_1_b_info =3D ADI_AXI_PCORE_VER(9, 1, 'b'); +static const struct axi_dac_info dac_generic =3D { + .version =3D ADI_AXI_PCORE_VER(9, 1, 'b'), + .backend_info =3D &axi_dac_generic, +}; + +static const struct axi_dac_info dac_ad3552r =3D { + .version =3D ADI_AXI_PCORE_VER(9, 1, 'b'), + .backend_info =3D &axi_ad3552r, + .has_dac_clk =3D true, +}; =20 static const struct of_device_id axi_dac_of_match[] =3D { - { .compatible =3D "adi,axi-dac-9.1.b", .data =3D &axi_dac_9_1_b_info }, + { .compatible =3D "adi,axi-dac-9.1.b", .data =3D &dac_generic }, + { .compatible =3D "adi,axi-ad3552r", .data =3D &dac_ad3552r }, {} }; MODULE_DEVICE_TABLE(of, axi_dac_of_match); --=20 2.45.0.rc1