[ meson64 ] more patches cleaned
This commit is contained in:
parent
7b61b53cd0
commit
4600fac23b
@ -1,110 +0,0 @@
|
||||
From 842a328b53d5ebb7dc6a63a15a9e15935aac55b0 Mon Sep 17 00:00:00 2001
|
||||
From: Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
Date: Wed, 15 Jan 2020 19:30:29 +0800
|
||||
Subject: [PATCH 028/101] FROMGIT: dt-bindings: power: add Amlogic secure power
|
||||
domains bindings
|
||||
|
||||
Add the bindings for the Amlogic Secure power domains, controlling the
|
||||
secure power domains.
|
||||
|
||||
The bindings targets the Amlogic A1 and C1 compatible SoCs, in which the
|
||||
power domain registers are in secure world.
|
||||
|
||||
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Reviewed-by: Rob Herring <robh@kernel.org>
|
||||
Link: https://lore.kernel.org/r/1579087831-94965-3-git-send-email-jianxin.pan@amlogic.com
|
||||
---
|
||||
.../power/amlogic,meson-sec-pwrc.yaml | 40 +++++++++++++++++++
|
||||
include/dt-bindings/power/meson-a1-power.h | 32 +++++++++++++++
|
||||
2 files changed, 72 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
|
||||
create mode 100644 include/dt-bindings/power/meson-a1-power.h
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml b/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..af32209218bb
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
|
||||
@@ -0,0 +1,40 @@
|
||||
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+# Copyright (c) 2019 Amlogic, Inc
|
||||
+# Author: Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
+%YAML 1.2
|
||||
+---
|
||||
+$id: "http://devicetree.org/schemas/power/amlogic,meson-sec-pwrc.yaml#"
|
||||
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
|
||||
+
|
||||
+title: Amlogic Meson Secure Power Domains
|
||||
+
|
||||
+maintainers:
|
||||
+ - Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
+
|
||||
+description: |+
|
||||
+ Secure Power Domains used in Meson A1/C1 SoCs, and should be the child node
|
||||
+ of secure-monitor.
|
||||
+
|
||||
+properties:
|
||||
+ compatible:
|
||||
+ enum:
|
||||
+ - amlogic,meson-a1-pwrc
|
||||
+
|
||||
+ "#power-domain-cells":
|
||||
+ const: 1
|
||||
+
|
||||
+required:
|
||||
+ - compatible
|
||||
+ - "#power-domain-cells"
|
||||
+
|
||||
+examples:
|
||||
+ - |
|
||||
+ secure-monitor {
|
||||
+ compatible = "amlogic,meson-gxbb-sm";
|
||||
+
|
||||
+ pwrc: power-controller {
|
||||
+ compatible = "amlogic,meson-a1-pwrc";
|
||||
+ #power-domain-cells = <1>;
|
||||
+ };
|
||||
+ }
|
||||
+
|
||||
diff --git a/include/dt-bindings/power/meson-a1-power.h b/include/dt-bindings/power/meson-a1-power.h
|
||||
new file mode 100644
|
||||
index 000000000000..6cf50bfb8ccf
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/power/meson-a1-power.h
|
||||
@@ -0,0 +1,32 @@
|
||||
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
|
||||
+/*
|
||||
+ * Copyright (c) 2019 Amlogic, Inc.
|
||||
+ * Author: Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
+ */
|
||||
+
|
||||
+#ifndef _DT_BINDINGS_MESON_A1_POWER_H
|
||||
+#define _DT_BINDINGS_MESON_A1_POWER_H
|
||||
+
|
||||
+#define PWRC_DSPA_ID 8
|
||||
+#define PWRC_DSPB_ID 9
|
||||
+#define PWRC_UART_ID 10
|
||||
+#define PWRC_DMC_ID 11
|
||||
+#define PWRC_I2C_ID 12
|
||||
+#define PWRC_PSRAM_ID 13
|
||||
+#define PWRC_ACODEC_ID 14
|
||||
+#define PWRC_AUDIO_ID 15
|
||||
+#define PWRC_OTP_ID 16
|
||||
+#define PWRC_DMA_ID 17
|
||||
+#define PWRC_SD_EMMC_ID 18
|
||||
+#define PWRC_RAMA_ID 19
|
||||
+#define PWRC_RAMB_ID 20
|
||||
+#define PWRC_IR_ID 21
|
||||
+#define PWRC_SPICC_ID 22
|
||||
+#define PWRC_SPIFC_ID 23
|
||||
+#define PWRC_USB_ID 24
|
||||
+#define PWRC_NIC_ID 25
|
||||
+#define PWRC_PDMIN_ID 26
|
||||
+#define PWRC_RSA_ID 27
|
||||
+#define PWRC_MAX_ID 28
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
|
||||
Add the video decoder specific compatible for Amlogic SM1 SoC.
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
index 521573f3a5ba..b94a4eae973f 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
@@ -138,6 +138,10 @@
|
||||
compatible = "amlogic,meson-sm1-pwrc";
|
||||
};
|
||||
|
||||
+&vdec {
|
||||
+ compatible = "amlogic,sm1-vdec";
|
||||
+};
|
||||
+
|
||||
&vpu {
|
||||
power-domains = <&pwrc PWRC_SM1_VPU_ID>;
|
||||
};
|
||||
@ -1,138 +0,0 @@
|
||||
From 8801f9ef8160ffcd4c742eae11ffc4a51ae6ab5b Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Thu, 13 Feb 2020 16:51:58 +0100
|
||||
Subject: [PATCH 019/101] FROMGIT: ASoC: meson: gx: add sound card dt-binding
|
||||
documentation
|
||||
|
||||
Add the dt-binding documentation of sound card supporting the amlogic
|
||||
GX SoC family
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
.../bindings/sound/amlogic,gx-sound-card.yaml | 113 ++++++++++++++++++
|
||||
1 file changed, 113 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..fb374c659be1
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
|
||||
@@ -0,0 +1,113 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+%YAML 1.2
|
||||
+---
|
||||
+$id: http://devicetree.org/schemas/sound/amlogic,gx-sound-card.yaml#
|
||||
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
+
|
||||
+title: Amlogic GX sound card
|
||||
+
|
||||
+maintainers:
|
||||
+ - Jerome Brunet <jbrunet@baylibre.com>
|
||||
+
|
||||
+properties:
|
||||
+ compatible:
|
||||
+ items:
|
||||
+ - const: amlogic,gx-sound-card
|
||||
+
|
||||
+ audio-aux-devs:
|
||||
+ $ref: /schemas/types.yaml#/definitions/phandle-array
|
||||
+ description: list of auxiliary devices
|
||||
+
|
||||
+ audio-routing:
|
||||
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
|
||||
+ minItems: 2
|
||||
+ description: |-
|
||||
+ A list of the connections between audio components. Each entry is a
|
||||
+ pair of strings, the first being the connection's sink, the second
|
||||
+ being the connection's source.
|
||||
+
|
||||
+ audio-widgets:
|
||||
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
|
||||
+ minItems: 2
|
||||
+ description: |-
|
||||
+ A list off component DAPM widget. Each entry is a pair of strings,
|
||||
+ the first being the widget type, the second being the widget name
|
||||
+
|
||||
+ model:
|
||||
+ $ref: /schemas/types.yaml#/definitions/string
|
||||
+ description: User specified audio sound card name
|
||||
+
|
||||
+patternProperties:
|
||||
+ "^dai-link-[0-9]+$":
|
||||
+ type: object
|
||||
+ description: |-
|
||||
+ dai-link child nodes:
|
||||
+ Container for dai-link level properties and the CODEC sub-nodes.
|
||||
+ There should be at least one (and probably more) subnode of this type
|
||||
+
|
||||
+ properties:
|
||||
+ dai-format:
|
||||
+ $ref: /schemas/types.yaml#/definitions/string
|
||||
+ enum: [ i2s, left-j, dsp_a ]
|
||||
+
|
||||
+ mclk-fs:
|
||||
+ $ref: /schemas/types.yaml#/definitions/uint32
|
||||
+ description: |-
|
||||
+ Multiplication factor between the frame rate and master clock
|
||||
+ rate
|
||||
+
|
||||
+ sound-dai:
|
||||
+ $ref: /schemas/types.yaml#/definitions/phandle
|
||||
+ description: phandle of the CPU DAI
|
||||
+
|
||||
+ patternProperties:
|
||||
+ "^codec-[0-9]+$":
|
||||
+ type: object
|
||||
+ description: |-
|
||||
+ Codecs:
|
||||
+ dai-link representing backend links should have at least one subnode.
|
||||
+ One subnode for each codec of the dai-link. dai-link representing
|
||||
+ frontend links have no codec, therefore have no subnodes
|
||||
+
|
||||
+ properties:
|
||||
+ sound-dai:
|
||||
+ $ref: /schemas/types.yaml#/definitions/phandle
|
||||
+ description: phandle of the codec DAI
|
||||
+
|
||||
+ required:
|
||||
+ - sound-dai
|
||||
+
|
||||
+ required:
|
||||
+ - sound-dai
|
||||
+
|
||||
+required:
|
||||
+ - model
|
||||
+ - dai-link-0
|
||||
+
|
||||
+examples:
|
||||
+ - |
|
||||
+ sound {
|
||||
+ compatible = "amlogic,gx-sound-card";
|
||||
+ model = "GXL-ACME-S905X-FOO";
|
||||
+ audio-aux-devs = <&>;
|
||||
+ audio-routing = "I2S ENCODER I2S IN", "I2S FIFO Playback";
|
||||
+
|
||||
+ dai-link-0 {
|
||||
+ sound-dai = <&i2s_fifo>;
|
||||
+ };
|
||||
+
|
||||
+ dai-link-1 {
|
||||
+ sound-dai = <&i2s_encoder>;
|
||||
+ dai-format = "i2s";
|
||||
+ mclk-fs = <256>;
|
||||
+
|
||||
+ codec-0 {
|
||||
+ sound-dai = <&codec0>;
|
||||
+ };
|
||||
+
|
||||
+ codec-1 {
|
||||
+ sound-dai = <&codec1>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From d90703dc8cb5ec80bcd92a2065a25208819ddb69 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Tue, 28 Jan 2020 13:37:39 +0100
|
||||
Subject: [PATCH 042/101] FROMLIST: ASoC: meson: add g12a-toacodec dt-binding
|
||||
documentation
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
---
|
||||
.../bindings/sound/amlogic,g12a-toacodec.yaml | 53 +++++++++++++++++++
|
||||
.../dt-bindings/sound/meson-g12a-toacodec.h | 10 ++++
|
||||
2 files changed, 63 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
|
||||
create mode 100644 include/dt-bindings/sound/meson-g12a-toacodec.h
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..cbd33ba99e58
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
|
||||
@@ -0,0 +1,53 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+%YAML 1.2
|
||||
+---
|
||||
+$id: http://devicetree.org/schemas/sound/amlogic,g12a-toacodec.yaml#
|
||||
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
+
|
||||
+title: Amlogic G12a Internal DAC Control Glue
|
||||
+
|
||||
+maintainers:
|
||||
+ - Jerome Brunet <jbrunet@baylibre.com>
|
||||
+
|
||||
+properties:
|
||||
+ $nodename:
|
||||
+ pattern: "^audio-controller@.*"
|
||||
+
|
||||
+ "#sound-dai-cells":
|
||||
+ const: 1
|
||||
+
|
||||
+ compatible:
|
||||
+ oneOf:
|
||||
+ - items:
|
||||
+ - const:
|
||||
+ amlogic,g12a-toacodec
|
||||
+ - items:
|
||||
+ - enum:
|
||||
+ - amlogic,sm1-toacodec
|
||||
+ - const:
|
||||
+ amlogic,g12a-toacodec
|
||||
+
|
||||
+ reg:
|
||||
+ maxItems: 1
|
||||
+
|
||||
+ resets:
|
||||
+ maxItems: 1
|
||||
+
|
||||
+required:
|
||||
+ - "#sound-dai-cells"
|
||||
+ - compatible
|
||||
+ - reg
|
||||
+ - resets
|
||||
+
|
||||
+examples:
|
||||
+ - |
|
||||
+ #include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
|
||||
+
|
||||
+ toacodec: audio-controller@740 {
|
||||
+ compatible = "amlogic,g12a-toacodec";
|
||||
+ reg = <0x0 0x740 0x0 0x4>;
|
||||
+ #sound-dai-cells = <1>;
|
||||
+ resets = <&clkc_audio AUD_RESET_TOACODEC>;
|
||||
+ };
|
||||
+
|
||||
+
|
||||
diff --git a/include/dt-bindings/sound/meson-g12a-toacodec.h b/include/dt-bindings/sound/meson-g12a-toacodec.h
|
||||
new file mode 100644
|
||||
index 000000000000..69d7a75592a2
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/sound/meson-g12a-toacodec.h
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+#ifndef __DT_MESON_G12A_TOACODEC_H
|
||||
+#define __DT_MESON_G12A_TOACODEC_H
|
||||
+
|
||||
+#define TOACODEC_IN_A 0
|
||||
+#define TOACODEC_IN_B 1
|
||||
+#define TOACODEC_IN_C 2
|
||||
+#define TOACODEC_OUT 3
|
||||
+
|
||||
+#endif /* __DT_MESON_G12A_TOACODEC_H */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
From b99a66756e3c7d9959c58488c6ebfcb77ea0b020 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Tue, 28 Jan 2020 13:38:38 +0100
|
||||
Subject: [PATCH 032/101] FROMLIST: ASoC: meson: add t9015 internal codec
|
||||
binding documentation
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
---
|
||||
.../bindings/sound/amlogic,t9015.yaml | 58 +++++++++++++++++++
|
||||
1 file changed, 58 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..b7c38c2b5b54
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
|
||||
@@ -0,0 +1,58 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+%YAML 1.2
|
||||
+---
|
||||
+$id: http://devicetree.org/schemas/sound/amlogic,t9015.yaml#
|
||||
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
+
|
||||
+title: Amlogic T9015 Internal Audio DAC
|
||||
+
|
||||
+maintainers:
|
||||
+ - Jerome Brunet <jbrunet@baylibre.com>
|
||||
+
|
||||
+properties:
|
||||
+ $nodename:
|
||||
+ pattern: "^audio-controller@.*"
|
||||
+
|
||||
+ "#sound-dai-cells":
|
||||
+ const: 0
|
||||
+
|
||||
+ compatible:
|
||||
+ items:
|
||||
+ - const: amlogic,t9015
|
||||
+
|
||||
+ clocks:
|
||||
+ items:
|
||||
+ - description: Peripheral clock
|
||||
+
|
||||
+ clock-names:
|
||||
+ items:
|
||||
+ - const: pclk
|
||||
+
|
||||
+ reg:
|
||||
+ maxItems: 1
|
||||
+
|
||||
+ resets:
|
||||
+ maxItems: 1
|
||||
+
|
||||
+required:
|
||||
+ - "#sound-dai-cells"
|
||||
+ - compatible
|
||||
+ - reg
|
||||
+ - clocks
|
||||
+ - clock-names
|
||||
+ - resets
|
||||
+
|
||||
+examples:
|
||||
+ - |
|
||||
+ #include <dt-bindings/clock/g12a-clkc.h>
|
||||
+ #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
|
||||
+
|
||||
+ acodec: audio-controller@32000 {
|
||||
+ compatible = "amlogic,t9015";
|
||||
+ reg = <0x0 0x32000 0x0 0x14>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ clocks = <&clkc CLKID_AUDIO_CODEC>;
|
||||
+ clock-names = "pclk";
|
||||
+ resets = <&reset RESET_AUDIO_CODEC>;
|
||||
+ };
|
||||
+
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user