* [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles
@ 2022-04-14 0:23 Samuel Holland
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Samuel Holland @ 2022-04-14 0:23 UTC (permalink / raw)
To: Dmitry Torokhov, Hans de Goede
Cc: Samuel Holland, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi
The R329 and D1 SoCs each contain an LRADC with a programming interface
compatible to earlier LRADCs. However, the LRADC now has its own clock
gate and reset line, instead of being always active.
To support this, add clock/reset properties to the binding, and require
them for the variant in the new SoCs.
Acked-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
(no changes since v1)
.../input/allwinner,sun4i-a10-lradc-keys.yaml | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
index d74f2002409e..3399fc288afb 100644
--- a/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
+++ b/Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
@@ -18,10 +18,20 @@ properties:
- items:
- const: allwinner,sun50i-a64-lradc
- const: allwinner,sun8i-a83t-r-lradc
+ - const: allwinner,sun50i-r329-lradc
+ - items:
+ - const: allwinner,sun20i-d1-lradc
+ - const: allwinner,sun50i-r329-lradc
reg:
maxItems: 1
+ clocks:
+ maxItems: 1
+
+ resets:
+ maxItems: 1
+
interrupts:
maxItems: 1
@@ -68,6 +78,18 @@ required:
- interrupts
- vref-supply
+if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - allwinner,sun50i-r329-lradc
+
+then:
+ required:
+ - clocks
+ - resets
+
additionalProperties: false
examples:
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support
2022-04-14 0:23 [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Samuel Holland
@ 2022-04-14 0:23 ` Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
2022-04-14 0:23 ` [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1 Samuel Holland
2022-04-25 3:39 ` [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Dmitry Torokhov
2 siblings, 2 replies; 8+ messages in thread
From: Samuel Holland @ 2022-04-14 0:23 UTC (permalink / raw)
To: Dmitry Torokhov, Hans de Goede
Cc: Samuel Holland, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi, Philipp Zabel
Until the R329, the LRADC hardware was always active. Now it requires
enabling a clock gate and deasserting a reset line. Add support for this
variant of the hardware.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
Changes in v2:
- Guard the code with a flag instead of using "_optional" variants.
drivers/input/keyboard/sun4i-lradc-keys.c | 33 +++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c
index 4a796bed48ac..5630334a6c09 100644
--- a/drivers/input/keyboard/sun4i-lradc-keys.c
+++ b/drivers/input/keyboard/sun4i-lradc-keys.c
@@ -14,6 +14,7 @@
* there are no boards known to use channel 1.
*/
+#include <linux/clk.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/input.h>
@@ -23,6 +24,7 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
+#include <linux/reset.h>
#include <linux/slab.h>
#define LRADC_CTRL 0x00
@@ -58,10 +60,12 @@
/* struct lradc_variant - Describe sun4i-a10-lradc-keys hardware variant
* @divisor_numerator: The numerator of lradc Vref internally divisor
* @divisor_denominator: The denominator of lradc Vref internally divisor
+ * @has_clock_reset: If the binding requires a clock and reset
*/
struct lradc_variant {
u8 divisor_numerator;
u8 divisor_denominator;
+ bool has_clock_reset;
};
static const struct lradc_variant lradc_variant_a10 = {
@@ -83,6 +87,8 @@ struct sun4i_lradc_data {
struct device *dev;
struct input_dev *input;
void __iomem *base;
+ struct clk *clk;
+ struct reset_control *reset;
struct regulator *vref_supply;
struct sun4i_lradc_keymap *chan0_map;
const struct lradc_variant *variant;
@@ -140,6 +146,14 @@ static int sun4i_lradc_open(struct input_dev *dev)
if (error)
return error;
+ error = reset_control_deassert(lradc->reset);
+ if (error)
+ goto err_disable_reg;
+
+ error = clk_prepare_enable(lradc->clk);
+ if (error)
+ goto err_assert_reset;
+
lradc->vref = regulator_get_voltage(lradc->vref_supply) *
lradc->variant->divisor_numerator /
lradc->variant->divisor_denominator;
@@ -153,6 +167,13 @@ static int sun4i_lradc_open(struct input_dev *dev)
writel(CHAN0_KEYUP_IRQ | CHAN0_KEYDOWN_IRQ, lradc->base + LRADC_INTC);
return 0;
+
+err_assert_reset:
+ reset_control_assert(lradc->reset);
+err_disable_reg:
+ regulator_disable(lradc->vref_supply);
+
+ return error;
}
static void sun4i_lradc_close(struct input_dev *dev)
@@ -164,6 +185,8 @@ static void sun4i_lradc_close(struct input_dev *dev)
SAMPLE_RATE(2), lradc->base + LRADC_CTRL);
writel(0, lradc->base + LRADC_INTC);
+ clk_disable_unprepare(lradc->clk);
+ reset_control_assert(lradc->reset);
regulator_disable(lradc->vref_supply);
}
@@ -243,6 +266,16 @@ static int sun4i_lradc_probe(struct platform_device *pdev)
return -EINVAL;
}
+ if (lradc->variant->has_clock_reset) {
+ lradc->clk = devm_clk_get(dev, NULL);
+ if (IS_ERR(lradc->clk))
+ return PTR_ERR(lradc->clk);
+
+ lradc->reset = devm_reset_control_get_exclusive(dev, NULL);
+ if (IS_ERR(lradc->reset))
+ return PTR_ERR(lradc->reset);
+ }
+
lradc->vref_supply = devm_regulator_get(dev, "vref");
if (IS_ERR(lradc->vref_supply))
return PTR_ERR(lradc->vref_supply);
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1
2022-04-14 0:23 [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Samuel Holland
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
@ 2022-04-14 0:23 ` Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
2022-04-25 3:39 ` [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Dmitry Torokhov
2 siblings, 2 replies; 8+ messages in thread
From: Samuel Holland @ 2022-04-14 0:23 UTC (permalink / raw)
To: Dmitry Torokhov, Hans de Goede
Cc: Samuel Holland, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi
This LRADC variant uses the same 3/4*AVCC reference voltage as the A83T
variant. The R329 and D1 LRADCs appear to be identical, so D1 support is
accomplished through having the R329 LRADC as a fallback compatible.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
Changes in v2:
- Set the new flag for the R329 variant.
drivers/input/keyboard/sun4i-lradc-keys.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c
index 5630334a6c09..8f9bfb05244d 100644
--- a/drivers/input/keyboard/sun4i-lradc-keys.c
+++ b/drivers/input/keyboard/sun4i-lradc-keys.c
@@ -78,6 +78,12 @@ static const struct lradc_variant r_lradc_variant_a83t = {
.divisor_denominator = 4
};
+static const struct lradc_variant lradc_variant_r329 = {
+ .divisor_numerator = 3,
+ .divisor_denominator = 4,
+ .has_clock_reset = true,
+};
+
struct sun4i_lradc_keymap {
u32 voltage;
u32 keycode;
@@ -323,6 +329,8 @@ static const struct of_device_id sun4i_lradc_of_match[] = {
.data = &lradc_variant_a10 },
{ .compatible = "allwinner,sun8i-a83t-r-lradc",
.data = &r_lradc_variant_a83t },
+ { .compatible = "allwinner,sun50i-r329-lradc",
+ .data = &lradc_variant_r329 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_lradc_of_match);
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1
2022-04-14 0:23 ` [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1 Samuel Holland
@ 2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Jernej Škrabec @ 2022-04-15 18:21 UTC (permalink / raw)
To: Dmitry Torokhov, Hans de Goede, Samuel Holland
Cc: Samuel Holland, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Krzysztof Kozlowski, Maxime Ripard, Rob Herring, devicetree,
linux-arm-kernel, linux-input, linux-kernel, linux-sunxi
Dne četrtek, 14. april 2022 ob 02:23:48 CEST je Samuel Holland napisal(a):
> This LRADC variant uses the same 3/4*AVCC reference voltage as the A83T
> variant. The R329 and D1 LRADCs appear to be identical, so D1 support is
> accomplished through having the R329 LRADC as a fallback compatible.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Best regards,
Jernej
> ---
>
> Changes in v2:
> - Set the new flag for the R329 variant.
>
> drivers/input/keyboard/sun4i-lradc-keys.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c
> b/drivers/input/keyboard/sun4i-lradc-keys.c index
> 5630334a6c09..8f9bfb05244d 100644
> --- a/drivers/input/keyboard/sun4i-lradc-keys.c
> +++ b/drivers/input/keyboard/sun4i-lradc-keys.c
> @@ -78,6 +78,12 @@ static const struct lradc_variant r_lradc_variant_a83t =
> { .divisor_denominator = 4
> };
>
> +static const struct lradc_variant lradc_variant_r329 = {
> + .divisor_numerator = 3,
> + .divisor_denominator = 4,
> + .has_clock_reset = true,
> +};
> +
> struct sun4i_lradc_keymap {
> u32 voltage;
> u32 keycode;
> @@ -323,6 +329,8 @@ static const struct of_device_id sun4i_lradc_of_match[]
> = { .data = &lradc_variant_a10 },
> { .compatible = "allwinner,sun8i-a83t-r-lradc",
> .data = &r_lradc_variant_a83t },
> + { .compatible = "allwinner,sun50i-r329-lradc",
> + .data = &lradc_variant_r329 },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, sun4i_lradc_of_match);
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
@ 2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Jernej Škrabec @ 2022-04-15 18:21 UTC (permalink / raw)
To: Dmitry Torokhov, Hans de Goede, Samuel Holland
Cc: Samuel Holland, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Krzysztof Kozlowski, Maxime Ripard, Rob Herring, devicetree,
linux-arm-kernel, linux-input, linux-kernel, linux-sunxi,
Philipp Zabel
Dne četrtek, 14. april 2022 ob 02:23:47 CEST je Samuel Holland napisal(a):
> Until the R329, the LRADC hardware was always active. Now it requires
> enabling a clock gate and deasserting a reset line. Add support for this
> variant of the hardware.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Best regards,
Jernej
> ---
>
> Changes in v2:
> - Guard the code with a flag instead of using "_optional" variants.
>
> drivers/input/keyboard/sun4i-lradc-keys.c | 33 +++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c
> b/drivers/input/keyboard/sun4i-lradc-keys.c index
> 4a796bed48ac..5630334a6c09 100644
> --- a/drivers/input/keyboard/sun4i-lradc-keys.c
> +++ b/drivers/input/keyboard/sun4i-lradc-keys.c
> @@ -14,6 +14,7 @@
> * there are no boards known to use channel 1.
> */
>
> +#include <linux/clk.h>
> #include <linux/err.h>
> #include <linux/init.h>
> #include <linux/input.h>
> @@ -23,6 +24,7 @@
> #include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <linux/regulator/consumer.h>
> +#include <linux/reset.h>
> #include <linux/slab.h>
>
> #define LRADC_CTRL 0x00
> @@ -58,10 +60,12 @@
> /* struct lradc_variant - Describe sun4i-a10-lradc-keys hardware variant
> * @divisor_numerator: The numerator of lradc Vref internally
divisor
> * @divisor_denominator: The denominator of lradc Vref internally
divisor
> + * @has_clock_reset: If the binding requires a clock and reset
> */
> struct lradc_variant {
> u8 divisor_numerator;
> u8 divisor_denominator;
> + bool has_clock_reset;
> };
>
> static const struct lradc_variant lradc_variant_a10 = {
> @@ -83,6 +87,8 @@ struct sun4i_lradc_data {
> struct device *dev;
> struct input_dev *input;
> void __iomem *base;
> + struct clk *clk;
> + struct reset_control *reset;
> struct regulator *vref_supply;
> struct sun4i_lradc_keymap *chan0_map;
> const struct lradc_variant *variant;
> @@ -140,6 +146,14 @@ static int sun4i_lradc_open(struct input_dev *dev)
> if (error)
> return error;
>
> + error = reset_control_deassert(lradc->reset);
> + if (error)
> + goto err_disable_reg;
> +
> + error = clk_prepare_enable(lradc->clk);
> + if (error)
> + goto err_assert_reset;
> +
> lradc->vref = regulator_get_voltage(lradc->vref_supply) *
> lradc->variant->divisor_numerator /
> lradc->variant->divisor_denominator;
> @@ -153,6 +167,13 @@ static int sun4i_lradc_open(struct input_dev *dev)
> writel(CHAN0_KEYUP_IRQ | CHAN0_KEYDOWN_IRQ, lradc->base +
LRADC_INTC);
>
> return 0;
> +
> +err_assert_reset:
> + reset_control_assert(lradc->reset);
> +err_disable_reg:
> + regulator_disable(lradc->vref_supply);
> +
> + return error;
> }
>
> static void sun4i_lradc_close(struct input_dev *dev)
> @@ -164,6 +185,8 @@ static void sun4i_lradc_close(struct input_dev *dev)
> SAMPLE_RATE(2), lradc->base + LRADC_CTRL);
> writel(0, lradc->base + LRADC_INTC);
>
> + clk_disable_unprepare(lradc->clk);
> + reset_control_assert(lradc->reset);
> regulator_disable(lradc->vref_supply);
> }
>
> @@ -243,6 +266,16 @@ static int sun4i_lradc_probe(struct platform_device
> *pdev) return -EINVAL;
> }
>
> + if (lradc->variant->has_clock_reset) {
> + lradc->clk = devm_clk_get(dev, NULL);
> + if (IS_ERR(lradc->clk))
> + return PTR_ERR(lradc->clk);
> +
> + lradc->reset = devm_reset_control_get_exclusive(dev,
NULL);
> + if (IS_ERR(lradc->reset))
> + return PTR_ERR(lradc->reset);
> + }
> +
> lradc->vref_supply = devm_regulator_get(dev, "vref");
> if (IS_ERR(lradc->vref_supply))
> return PTR_ERR(lradc->vref_supply);
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles
2022-04-14 0:23 [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Samuel Holland
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
2022-04-14 0:23 ` [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1 Samuel Holland
@ 2022-04-25 3:39 ` Dmitry Torokhov
2 siblings, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2022-04-25 3:39 UTC (permalink / raw)
To: Samuel Holland
Cc: Hans de Goede, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi
On Wed, Apr 13, 2022 at 07:23:46PM -0500, Samuel Holland wrote:
> The R329 and D1 SoCs each contain an LRADC with a programming interface
> compatible to earlier LRADCs. However, the LRADC now has its own clock
> gate and reset line, instead of being always active.
>
> To support this, add clock/reset properties to the binding, and require
> them for the variant in the new SoCs.
>
> Acked-by: Maxime Ripard <maxime@cerno.tech>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
@ 2022-04-25 3:42 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2022-04-25 3:42 UTC (permalink / raw)
To: Samuel Holland
Cc: Hans de Goede, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi, Philipp Zabel
On Wed, Apr 13, 2022 at 07:23:47PM -0500, Samuel Holland wrote:
> Until the R329, the LRADC hardware was always active. Now it requires
> enabling a clock gate and deasserting a reset line. Add support for this
> variant of the hardware.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1
2022-04-14 0:23 ` [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1 Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
@ 2022-04-25 3:42 ` Dmitry Torokhov
1 sibling, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2022-04-25 3:42 UTC (permalink / raw)
To: Samuel Holland
Cc: Hans de Goede, Maxime Ripard, Rob Herring, Chen-Yu Tsai,
Jernej Skrabec, Krzysztof Kozlowski, Maxime Ripard, Rob Herring,
devicetree, linux-arm-kernel, linux-input, linux-kernel,
linux-sunxi
On Wed, Apr 13, 2022 at 07:23:48PM -0500, Samuel Holland wrote:
> This LRADC variant uses the same 3/4*AVCC reference voltage as the A83T
> variant. The R329 and D1 LRADCs appear to be identical, so D1 support is
> accomplished through having the R329 LRADC as a fallback compatible.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-25 3:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-14 0:23 [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Samuel Holland
2022-04-14 0:23 ` [PATCH v2 2/3] Input: sun4i-lradc-keys: Add optional clock/reset support Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
2022-04-14 0:23 ` [PATCH v2 3/3] Input: sun4i-lradc-keys: Add support for R329 and D1 Samuel Holland
2022-04-15 18:21 ` Jernej Škrabec
2022-04-25 3:42 ` Dmitry Torokhov
2022-04-25 3:39 ` [PATCH v2 1/3] dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).