Skip to content

Commit 3a00b1c

Browse files
committed
Merge tag 'amlogic-drivers-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers
Amlogic Drivers changes for v6.5: - tag some powers domains as always-on for secure-pwrc - fix MAINTAINERS entry for PHY drivers & bindings - Amlogic Meson GPIO interrupt controller binding to yaml conversion * tag 'amlogic-drivers-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding MAINTAINERS: add PHY-related files to Amlogic SoC file list drivers: meson: secure-pwrc: always enable DMA domain Link: https://lore.kernel.org/r/a10ea420-7599-3f41-dfd8-1742ef436ca0@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0feedca + 6b0139b commit 3a00b1c

4 files changed

Lines changed: 75 additions & 39 deletions

File tree

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson GPIO interrupt controller
8+
9+
maintainers:
10+
- Heiner Kallweit <hkallweit1@gmail.com>
11+
12+
description: |
13+
Meson SoCs contains an interrupt controller which is able to watch the SoC
14+
pads and generate an interrupt on edge or level. The controller is essentially
15+
a 256 pads to 8 or 12 GIC interrupt multiplexer, with a filter block to select
16+
edge or level and polarity. It does not expose all 256 mux inputs because the
17+
documentation shows that the upper part is not mapped to any pad. The actual
18+
number of interrupts exposed depends on the SoC.
19+
20+
allOf:
21+
- $ref: /schemas/interrupt-controller.yaml#
22+
23+
properties:
24+
compatible:
25+
oneOf:
26+
- const: amlogic,meson-gpio-intc
27+
- items:
28+
- enum:
29+
- amlogic,meson8-gpio-intc
30+
- amlogic,meson8b-gpio-intc
31+
- amlogic,meson-gxbb-gpio-intc
32+
- amlogic,meson-gxl-gpio-intc
33+
- amlogic,meson-axg-gpio-intc
34+
- amlogic,meson-g12a-gpio-intc
35+
- amlogic,meson-sm1-gpio-intc
36+
- amlogic,meson-a1-gpio-intc
37+
- amlogic,meson-s4-gpio-intc
38+
- const: amlogic,meson-gpio-intc
39+
40+
reg:
41+
maxItems: 1
42+
43+
interrupt-controller: true
44+
45+
"#interrupt-cells":
46+
const: 2
47+
48+
amlogic,channel-interrupts:
49+
description: Array with the upstream hwirq numbers
50+
minItems: 8
51+
maxItems: 12
52+
$ref: /schemas/types.yaml#/definitions/uint32-array
53+
54+
required:
55+
- compatible
56+
- reg
57+
- interrupt-controller
58+
- "#interrupt-cells"
59+
- amlogic,channel-interrupts
60+
61+
additionalProperties: false
62+
63+
examples:
64+
- |
65+
interrupt-controller@9880 {
66+
compatible = "amlogic,meson-gxbb-gpio-intc",
67+
"amlogic,meson-gpio-intc";
68+
reg = <0x9880 0x10>;
69+
interrupt-controller;
70+
#interrupt-cells = <2>;
71+
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
72+
};

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,10 +1910,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
19101910
L: linux-amlogic@lists.infradead.org
19111911
S: Maintained
19121912
W: http://linux-meson.com/
1913+
F: Documentation/devicetree/bindings/phy/amlogic*
19131914
F: arch/arm/boot/dts/meson*
19141915
F: arch/arm/mach-meson/
19151916
F: arch/arm64/boot/dts/amlogic/
19161917
F: drivers/mmc/host/meson*
1918+
F: drivers/phy/amlogic/
19171919
F: drivers/pinctrl/meson/
19181920
F: drivers/rtc/rtc-meson*
19191921
F: drivers/soc/amlogic/

drivers/soc/amlogic/meson-secure-pwrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
105105
SEC_PD(ACODEC, 0),
106106
SEC_PD(AUDIO, 0),
107107
SEC_PD(OTP, 0),
108-
SEC_PD(DMA, 0),
108+
SEC_PD(DMA, GENPD_FLAG_ALWAYS_ON | GENPD_FLAG_IRQ_SAFE),
109109
SEC_PD(SD_EMMC, 0),
110110
SEC_PD(RAMA, 0),
111111
/* SRAMB is used as ATF runtime memory, and should be always on */

0 commit comments

Comments
 (0)