Allwinner A64/H6 IR support
Subsystems (4)
v5 cover Allwinner A64/H6 IR support
Hi,
A64 IR support series[1] pointed out that an A31 bindings should be introduced.
This series introduce the A31 compatible bindings, then switch it on the already existing board.
Finally introduce A64 and H6 support.
I have reenable the other H6 boards IR support as Ondrej solve the issue.
Regards,
Clément
[1] https://lore.kernel.org/patchwork/patch/1031390/#1221464
[2] https://lkml.org/lkml/2019/5/27/321
[3] https://patchwork.kernel.org/patch/10975563/
Changes since v4:
- Reuse defines for RXSTA bits definition
Changes since v3:
- Reenable IR for other H6 boards
- Add RXSTA bits definition
- Add Sean Young's "Acked-by" tags
Changes since v2:
- Disable IR for other H6 boards
- Split DTS patch for H3/H5
- Introduce IR quirks
Clément Péron (11):
dt-bindings: media: sunxi-ir: Add A31 compatible
media: rc: Introduce sunxi_ir_quirks
media: rc: sunxi: Add A31 compatible
media: rc: sunxi: Add RXSTA bits definition
ARM: dts: sunxi: Prefer A31 bindings for IR
ARM: dts: sunxi: Prefer A31 bindings for IR
dt-bindings: media: sunxi-ir: Add A64 compatible
dt-bindings: media: sunxi-ir: Add H6 compatible
arm64: dts: allwinner: h6: Add IR receiver node
arm64: dts: allwinner: h6: Enable IR on H6 boards
arm64: defconfig: Enable IR SUNXI option
Igors Makejevs (1):
arm64: dts: allwinner: a64: Add IR node
Jernej Skrabec (1):
arm64: dts: allwinner: a64: Enable IR on Orange Pi Win
.../devicetree/bindings/media/sunxi-ir.txt | 11 ++- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- .../dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ++++ .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 + .../dts/allwinner/sun50i-h6-orangepi.dtsi | 4 + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 19 ++++ arch/arm64/configs/defconfig | 1 + drivers/media/rc/sunxi-cir.c | 88 ++++++++++++++----- 13 files changed, 135 insertions(+), 26 deletions(-)
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-1-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 1/13 dt-bindings: media: sunxi-ir: Add A31 compatible
Allwinner A31 has introduced a new memory mapping and a reset line.
The difference in memory mapping are :
- In the configure register there is a new sample bit and Allwinner has introduced the active threshold feature.
- In the status register a new STAT bit is present.
Note: CGPO and DRQ_EN bits are removed on A31 but present on A13 and on new SoCs like A64/H6.
This is actually not an issue as these bits are togglable and new SoCs have a dedicated bindings.
Introduce this bindings to make a difference since this generation. And declare the reset line required since A31.
--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/media/sunxi-ir.txt +7 -2
@@ -1,16 +1,21 @@ Device-Tree bindings for SUNXI IR controller found in sunXi SoC family Required properties: -- compatible : "allwinner,sun4i-a10-ir" or "allwinner,sun5i-a13-ir" +- compatible : + "allwinner,sun4i-a10-ir" + "allwinner,sun5i-a13-ir" + "allwinner,sun6i-a31-ir" - clocks : list of clock specifiers, corresponding to entries in clock-names property; - clock-names : should contain "apb" and "ir" entries; - interrupts : should contain IR IRQ number; - reg : should contain IO map address for IR. +Required properties since A31: +- resets : phandle + reset specifier pair + Optional properties: - linux,rc-map-name: see rc.txt file in the same directory. -- resets : phandle + reset specifier pair - clock-frequency : IR Receiver clock frequency, in Hertz. Defaults to 8 MHz if missing.
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-2-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH v5 01/13] dt-bindings: media: sunxi-ir: Add A31 compatible
Quoted 18 lines · On Sat, 8 Jun 2019 01:10:48 +0200, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= wrote:
Allwinner A31 has introduced a new memory mapping and a reset line.
The difference in memory mapping are :
- In the configure register there is a new sample bit and Allwinner has introduced the active threshold feature.
- In the status register a new STAT bit is present.
Note: CGPO and
DRQ_ENbits are removed on A31 but present on A13 and on new SoCs like A64/H6.
This is actually not an issue as these bits are togglable and new SoCs have a dedicated bindings.Introduce this bindings to make a difference since this generation. And declare the reset line required since A31.
Quoted 7 lines
Signed-off-by Clément Péron <[email protected]>Acked-by Sean Young <[email protected]>Acked-by Maxime Ripard <[email protected]>--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
PATCH v5 2/13 media: rc: Introduce sunxi_ir_quirks
In reply to Clément PéronThis driver is used in various Allwinner SoC with different configuration.
Introduce a quirks struct to know the fifo size and if a reset is required.
--- drivers/media/rc/sunxi-cir.c | 61 +++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 14 deletions(-)
drivers/media/rc/sunxi-cir.c +47 -14
@@ -81,6 +81,17 @@/* Time after which device stops sending data in ms */ #define SUNXI_IR_TIMEOUT 120 +/** +* struct sunxi_ir_quirks - Differences between SoC variants. +* +* @has_reset: SoC needs reset deasserted. +* @fifo_size: size of the fifo. +*/ +struct sunxi_ir_quirks { +bool has_reset; +int fifo_size; +}; +struct sunxi_ir {spinlock_t ir_lock;struct rc_dev *rc;
@@ -143,6 +154,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *dn = dev->of_node; +const struct sunxi_ir_quirks *quirks;struct resource *res;struct sunxi_ir *ir;u32 b_clk_freq =SUNXI_IR_BASE_CLK ;
@@ -151,12 +163,15 @@ static int sunxi_ir_probe(struct platform_device *pdev)if (!ir)return -ENOMEM ; + quirks =of_device_get_match_data (&pdev->dev); +if (quirks ==NULL ) { +dev_err (&pdev->dev,"Failed to determine the quirks to use\n" ); +return -ENODEV ; + } +spin_lock_init (&ir->ir_lock); -if (of_device_is_compatible (dn,"allwinner,sun5i-a13-ir" )) - ir->fifo_size =64 ; -else - ir->fifo_size =16 ; + ir->fifo_size = quirks->fifo_size;/* Clock */ ir->apb_clk =devm_clk_get (dev,"apb" );
@@ -173,13 +188,15 @@ static int sunxi_ir_probe(struct platform_device *pdev)/* Base clock frequency (optional) */ of_property_read_u32 (dn,"clock-frequency" , &b_clk_freq); -/* Reset (optional) */ - ir->rst =devm_reset_control_get_optional_exclusive (dev,NULL ); -if (IS_ERR (ir->rst)) -return PTR_ERR (ir->rst); - ret =reset_control_deassert (ir->rst); -if (ret) -return ret; +/* Reset */ +if (quirks->has_reset) { + ir->rst =devm_reset_control_get_exclusive (dev,NULL ); +if (IS_ERR (ir->rst)) +return PTR_ERR (ir->rst); + ret =reset_control_deassert (ir->rst); +if (ret) +return ret; + } ret =clk_set_rate (ir->clk, b_clk_freq);if (ret) {
@@ -316,10 +333,26 @@ static int sunxi_ir_remove(struct platform_device *pdev)return 0 ; } +static const struct sunxi_ir_quirks sun4i_a10_ir_quirks = { + .has_reset = false, + .fifo_size =16 , +}; + +static const struct sunxi_ir_quirks sun5i_a13_ir_quirks = { + .has_reset = false, + .fifo_size =64 , +}; +static const struct of_device_id sunxi_ir_match[] = { - { .compatible ="allwinner,sun4i-a10-ir" , }, - { .compatible ="allwinner,sun5i-a13-ir" , }, - {}, + { + .compatible ="allwinner,sun4i-a10-ir" , + .data = &sun4i_a10_ir_quirks, + }, + { + .compatible ="allwinner,sun5i-a13-ir" , + .data = &sun5i_a13_ir_quirks, + }, + {} };MODULE_DEVICE_TABLE (of, sunxi_ir_match);
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-3-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 3/13 media: rc: sunxi: Add A31 compatible
In reply to Clément PéronAllwiner A31 has a different memory mapping so add the compatible we will need it later.
--- drivers/media/rc/sunxi-cir.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/rc/sunxi-cir.c +9 -0
@@ -343,6 +343,11 @@ static const struct sunxi_ir_quirks sun5i_a13_ir_quirks = { .fifo_size = 64, }; +static const struct sunxi_ir_quirks sun6i_a31_ir_quirks = { + .has_reset = true, + .fifo_size =64 , +}; +static const struct of_device_id sunxi_ir_match[] = { { .compatible ="allwinner,sun4i-a10-ir" ,
@@ -352,6 +357,10 @@ static const struct of_device_id sunxi_ir_match[] = { .compatible = "allwinner,sun5i-a13-ir", .data = &sun5i_a13_ir_quirks, }, + { + .compatible = "allwinner,sun6i-a31-ir", + .data = &sun6i_a31_ir_quirks, + }, {} };MODULE_DEVICE_TABLE (of, sunxi_ir_match);
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-4-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 4/13 media: rc: sunxi: Add RXSTA bits definition
In reply to Clément PéronWe are using RXINT bits definition when looking at RXSTA register.
These bits are equal but it's not really proper.
Introduce the RXSTA bits and use them to have coherency.
--- drivers/media/rc/sunxi-cir.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/media/rc/sunxi-cir.c +12 -6
@@ -48,11 +48,11 @@/* Rx Interrupt Enable */ #define SUNXI_IR_RXINT_REG 0x2C -/* Rx FIFO Overflow */ +/* Rx FIFO Overflow Interrupt Enable */ #define REG_RXINT_ROI_EN BIT(0) -/* Rx Packet End */ +/* Rx Packet End Interrupt Enable */ #define REG_RXINT_RPEI_EN BIT(1) -/* Rx FIFO Data Available */ +/* Rx FIFO Data Available Interrupt Enable */ #define REG_RXINT_RAI_EN BIT(4)/* Rx FIFO available byte level */
@@ -60,6 +60,12 @@/* Rx Interrupt Status */ #define SUNXI_IR_RXSTA_REG 0x30 +/* Rx FIFO Overflow */ +#define REG_RXSTA_ROI REG_RXINT_ROI_EN +/* Rx Packet End */ +#define REG_RXSTA_RPE REG_RXINT_RPEI_EN +/* Rx FIFO Data Available */ +#define REG_RXSTA_RA REG_RXINT_RAI_EN/* RX FIFO Get Available Counter */ #define REG_RXSTA_GET_AC (val) (((val) >> 8) & (ir->fifo_size * 2 - 1))/* Clear all interrupt status value */
@@ -119,7 +125,7 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id)/* clean all pending statuses */ writel (status |REG_RXSTA_CLEARALL , ir->base +SUNXI_IR_RXSTA_REG ); -if (status & (REG_RXINT_RAI_EN |REG_RXINT_RPEI_EN )) { +if (status & (REG_RXSTA_RA |REG_RXSTA_RPE )) {/* How many messages in fifo */ rc =REG_RXSTA_GET_AC (status);/* Sanity check */
@@ -135,9 +141,9 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id) } } -if (status ®_RXINT_ROI_EN ) { +if (status ®_RXSTA_ROI ) {ir_raw_event_reset (ir->rc); - }else if (status ®_RXINT_RPEI_EN ) { + }else if (status ®_RXSTA_RPE ) {ir_raw_event_set_idle (ir->rc, true);ir_raw_event_handle (ir->rc); }
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-5-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Quoted 7 lines · Clément Péron
We are using RXINT bits definition when looking at RXSTA register.
These bits are equal but it's not really proper.
Introduce the RXSTA bits and use them to have coherency.
Signed-off-by Clément Péron <[email protected]>
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 4 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190610095243.7xwp4xhauds22qzw%40flea. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Thanks,
Clément
Quoted 18 lines · Maxime Ripard
Quoted 7 lines · Clément Péron
We are using RXINT bits definition when looking at RXSTA register.
These bits are equal but it's not really proper.
Introduce the RXSTA bits and use them to have coherency.
Signed-off-by Clément Péron <[email protected]>Acked-by Maxime Ripard <[email protected]>Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Quoted 4 lines · Clément Péron
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Thanks
Sean
Quoted 26 lines
Thanks,
ClémentQuoted 18 lines · Maxime Ripard
Quoted 7 lines · Clément Péron
We are using RXINT bits definition when looking at RXSTA register.
These bits are equal but it's not really proper.
Introduce the RXSTA bits and use them to have coherency.
Signed-off-by Clément Péron <[email protected]>Acked-by Maxime Ripard <[email protected]>Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Sean Young
maintainerRe: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Hi,
Quoted 7 lines · Sean Young
Quoted 4 lines · Clément Péron
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Acked-by Sean Young <[email protected]>
So who's tree should this series go through? It seems mostly device tree. Alternatively I'm happy to try it get merged via the media tree.
Thanks
Sean
Re: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Hi Sean,
Quoted 11 lines · Sean Young
Quoted 7 lines · Sean Young
Quoted 4 lines · Clément Péron
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Acked-by Sean Young <[email protected]>So who's tree should this series go through? It seems mostly device tree. Alternatively I'm happy to try it get merged via the media tree.
Ideally the media bits should go through the media tree, the DT bits will go through arm-soc
So you can apply the patches 1-4, 7 and 10, I'll apply the rest.
Does that work for you?
Thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190723070440.nfmhbrfykumxayjj%40flea.
Sean Young
maintainerRe: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Quoted 15 lines · Maxime Ripard
Hi Sean,
Quoted 11 lines · Sean Young
Quoted 7 lines · Sean Young
Quoted 4 lines · Cl�ment P�ron
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Acked-by Sean Young <[email protected]>So who's tree should this series go through? It seems mostly device tree. Alternatively I'm happy to try it get merged via the media tree.
Quoted 6 lines
Ideally the media bits should go through the media tree, the DT bits will go through arm-soc
So you can apply the patches 1-4, 7 and 10, I'll apply the rest.
Does that work for you?
Works for me, I'll add them to my next pull request to Mauro.
Thanks,
Sean
Re: [PATCH v5 04/13] media: rc: sunxi: Add RXSTA bits definition
Quoted 16 lines · Sean Young
Quoted 15 lines · Maxime Ripard
Hi Sean,
Quoted 11 lines · Sean Young
Quoted 7 lines · Sean Young
Quoted 4 lines · Clément Péron
Hi Sean,
You acked the whole v3 series but this patch has been introduced in v5 could you ack this one too?
Acked-by Sean Young <[email protected]>So who's tree should this series go through? It seems mostly device tree. Alternatively I'm happy to try it get merged via the media tree.
Quoted 8 lines
Quoted 6 lines
Ideally the media bits should go through the media tree, the DT bits will go through arm-soc
So you can apply the patches 1-4, 7 and 10, I'll apply the rest.
Does that work for you?
Works for me, I'll add them to my next pull request to Mauro.
Applied 5, 6, 8, 9 and 11 to 13.
Thanks!
Maxmie
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190724082459.xsstansjxtyvu4st%40flea.
PATCH v5 5/13 ARM: dts: sunxi: Prefer A31 bindings for IR
In reply to Clément PéronSince A31, memory mapping of the IR driver has changed.
Prefer the A31 bindings instead of A13.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun6i-a31.dtsi +1 -1
@@ -1351,7 +1351,7 @@ }; ir: ir@1f02000 { - compatible = "allwinner,sun5i-a13-ir"; + compatible = "allwinner,sun6i-a31-ir"; clocks = <&apb0_gates 1>, <&ir_clk>; clock-names = "apb", "ir"; resets = <&apb0_rst 1>;
arch/arm/boot/dts/sun8i-a83t.dtsi +1 -1
@@ -1067,7 +1067,7 @@ r_cir: ir@1f02000 { compatible = "allwinner,sun8i-a83t-ir", - "allwinner,sun5i-a13-ir"; + "allwinner,sun6i-a31-ir"; clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>; clock-names = "apb", "ir"; resets = <&r_ccu RST_APB0_IR>;
arch/arm/boot/dts/sun9i-a80.dtsi +1 -1
@@ -1167,7 +1167,7 @@ }; r_ir: ir@8002000 { - compatible = "allwinner,sun5i-a13-ir"; + compatible = "allwinner,sun6i-a31-ir"; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&r_ir_pins>;
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-6-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 6/13 ARM: dts: sunxi: Prefer A31 bindings for IR
In reply to Clément PéronSince A31, memory mapping of the IR driver has changed.
Prefer the A31 bindings instead of A13.
--- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sunxi-h3-h5.dtsi +1 -1
@@ -822,7 +822,7 @@ }; ir: ir@1f02000 { - compatible = "allwinner,sun5i-a13-ir"; + compatible = "allwinner,sun6i-a31-ir"; clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>; clock-names = "apb", "ir"; resets = <&r_ccu RST_APB0_IR>;
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-7-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 7/13 dt-bindings: media: sunxi-ir: Add A64 compatible
In reply to Clément PéronThere are some minor differences between A31 and A64 driver.
But A31 IR driver is compatible with A64.
--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0
@@ -5,6 +5,7 @@ Required properties: "allwinner,sun4i-a10-ir" "allwinner,sun5i-a13-ir" "allwinner,sun6i-a31-ir" + "allwinner,sun50i-a64-ir", "allwinner,sun6i-a31-ir" - clocks : list of clock specifiers, corresponding to entries in clock-names property; - clock-names : should contain "apb" and "ir" entries;
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-8-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH v5 07/13] dt-bindings: media: sunxi-ir: Add A64 compatible
Quoted 10 lines · On Sat, 8 Jun 2019 01:10:54 +0200, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= wrote:
There are some minor differences between A31 and A64 driver.
But A31 IR driver is compatible with A64.
Signed-off-by Clément Péron <[email protected]>Acked-by Sean Young <[email protected]>--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 1 + 1 file changed, 1 insertion(+)
PATCH v5 8/13 arm64: dts: allwinner: a64: Add IR node
In reply to Clément PéronFrom: Igors Makejevs <git_bb-v/FNU3S1YP/[email protected]>
IR peripheral is completely compatible with A31 one.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +18 -0
@@ -1072,6 +1072,19 @@ #size-cells = <0>; }; + r_ir: ir@1f02000 { + compatible = "allwinner,sun50i-a64-ir", + "allwinner,sun6i-a31-ir"; + reg = <0x01f02000 0x400>; + clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>; + clock-names = "apb", "ir"; + resets = <&r_ccu RST_APB0_IR>; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&r_ir_rx_pin>; + status = "disabled"; + }; + r_pwm: pwm@1f03800 { compatible = "allwinner,sun50i-a64-pwm", "allwinner,sun5i-a13-pwm";
@@ -1099,6 +1112,11 @@ function = "s_i2c"; }; + r_ir_rx_pin: r-ir-rx-pin { + pins = "PL11"; + function = "s_cir_rx"; + }; + r_pwm_pin: r-pwm-pin { pins = "PL10"; function = "s_pwm";
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-9-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 9/13 arm64: dts: allwinner: a64: Enable IR on Orange Pi Win
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
OrangePi Win board contains IR receiver. Enable it.
--- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +4 -0
@@ -180,6 +180,10 @@ status = "okay"; }; +&r_ir { + status = "okay"; +}; + &r_rsb { status = "okay";
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-10-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 10/13 dt-bindings: media: sunxi-ir: Add H6 compatible
In reply to Clément PéronThere are some minor differences between A31 or A64 with H6 IR peripheral.
But A31 IR driver is compatible with H6.
--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0
@@ -6,6 +6,7 @@ Required properties: "allwinner,sun5i-a13-ir" "allwinner,sun6i-a31-ir" "allwinner,sun50i-a64-ir", "allwinner,sun6i-a31-ir" + "allwinner,sun50i-h6-ir", "allwinner,sun6i-a31-ir" - clocks : list of clock specifiers, corresponding to entries in clock-names property; - clock-names : should contain "apb" and "ir" entries;
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-11-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
Re: [PATCH v5 10/13] dt-bindings: media: sunxi-ir: Add H6 compatible
Quoted 10 lines · On Sat, 8 Jun 2019 01:10:57 +0200, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= wrote:
There are some minor differences between A31 or A64 with H6 IR peripheral.
But A31 IR driver is compatible with H6.
Signed-off-by Clément Péron <[email protected]>Acked-by Sean Young <[email protected]>--- Documentation/devicetree/bindings/media/sunxi-ir.txt | 1 + 1 file changed, 1 insertion(+)
PATCH v5 11/13 arm64: dts: allwinner: h6: Add IR receiver node
In reply to Clément PéronAllwinner H6 IR is similar to A31 and can use same driver.
Add support for it.
--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +19 -0
@@ -647,6 +647,25 @@ pins = "PL0", "PL1"; function = "s_i2c"; }; + + r_ir_rx_pin: r-ir-rx-pin { + pins = "PL9"; + function = "s_cir_rx"; + }; + }; + + r_ir: ir@7040000 { + compatible = "allwinner,sun50i-h6-ir", + "allwinner,sun6i-a31-ir"; + reg = <0x07040000 0x400>; + interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB1_IR>, + <&r_ccu CLK_IR>; + clock-names = "apb", "ir"; + resets = <&r_ccu RST_R_APB1_IR>; + pinctrl-names = "default"; + pinctrl-0 = <&r_ir_rx_pin>; + status = "disabled"; }; r_i2c: i2c@7081400 {
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-12-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 12/13 arm64: dts: allwinner: h6: Enable IR on H6 boards
In reply to Clément PéronBeelink GS1, OrangePi H6 boards and Pine H64 have an IR receiver.
Enable it in their device-tree.
--- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 ++++ arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 ++++ arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ++++ 3 files changed, 12 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +4 -0
@@ -232,6 +232,10 @@ }; }; +&r_ir { + status = "okay"; +}; + &r_pio { /* * PL0 and PL1 are used for PMIC I2C
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +4 -0
@@ -189,6 +189,10 @@ }; }; +&r_ir { + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_ph_pins>;
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +4 -0
@@ -247,6 +247,10 @@ }; }; +&r_ir { + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_ph_pins>;
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-13-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 13/13 arm64: defconfig: Enable IR SUNXI option
In reply to Clément PéronEnable CONFIG_IR_SUNXI option for ARM64, so that Allwinner A64/H6 SoCs can use their IR receiver controller.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -460,6 +460,7 @@ CONFIG_RC_CORE=m CONFIG_RC_DECODERS=y CONFIG_RC_DEVICES=y CONFIG_IR_MESON=m +CONFIG_IR_SUNXI=m CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
Signature · 7 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190607231100.5894-14-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout.
Hi,
This series received ack from device-tree, media and sunxi maintainers.
Can patch 2/3/4 goes to linux-media and the rest to linux-sunxi ?
Thanks,
Clément
Quoted 70 lines · Clément Péron
Hi,
A64 IR support series[1] pointed out that an A31 bindings should be introduced.
This series introduce the A31 compatible bindings, then switch it on the already existing board.
Finally introduce A64 and H6 support.
I have reenable the other H6 boards IR support as Ondrej solve the issue.
Regards,
Clément[1] https://lore.kernel.org/patchwork/patch/1031390/#1221464
[2] https://lkml.org/lkml/2019/5/27/321
[3] https://patchwork.kernel.org/patch/10975563/Changes since v4:
- Reuse defines for RXSTA bits definitionChanges since v3:
- Reenable IR for other H6 boards
- Add RXSTA bits definition
- Add Sean Young's "Acked-by" tagsChanges since v2:
- Disable IR for other H6 boards
- Split DTS patch for H3/H5
- Introduce IR quirksClément Péron (11):
dt-bindings: media: sunxi-ir: Add A31 compatible
media: rc: Introducesunxi_ir_quirks
media: rc: sunxi: Add A31 compatible
media: rc: sunxi: Add RXSTA bits definition
ARM: dts: sunxi: Prefer A31 bindings for IR
ARM: dts: sunxi: Prefer A31 bindings for IR
dt-bindings: media: sunxi-ir: Add A64 compatible
dt-bindings: media: sunxi-ir: Add H6 compatible
arm64: dts: allwinner: h6: Add IR receiver node
arm64: dts: allwinner: h6: Enable IR on H6 boards
arm64: defconfig: Enable IR SUNXI optionIgors Makejevs (1):
arm64: dts: allwinner: a64: Add IR nodeJernej Skrabec (1):
arm64: dts: allwinner: a64: Enable IR on Orange Pi Win.../devicetree/bindings/media/sunxi-ir.txt | 11 ++- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- .../dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ++++ .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 + .../dts/allwinner/sun50i-h6-orangepi.dtsi | 4 + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 19 ++++ arch/arm64/configs/defconfig | 1 + drivers/media/rc/sunxi-cir.c | 88 ++++++++++++++----- 13 files changed, 135 insertions(+), 26 deletions(-)--
2.20.1