Last active
May 5, 2023 08:19
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ make ARCH=arm64 CROSS_COMPILE=aarch64-none-linux-gnu- dt_binding_check dtbs_check dtstree=arch/arm64/boot/dts/ti DT_SCHEMA_FILES=Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | |
LINT Documentation/devicetree/bindings | |
CHKDT Documentation/devicetree/bindings/processed-schema.json | |
SCHEMA Documentation/devicetree/bindings/processed-schema.json | |
DTEX Documentation/devicetree/bindings/dma/ti/k3-bcdma.example.dts | |
DTC_CHK Documentation/devicetree/bindings/dma/ti/k3-bcdma.example.dtb | |
UPD include/config/kernel.release | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am625-beagleplay.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am625-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am62-lp-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am62a7-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am642-evm.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am642-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am654-base-board.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dtb | |
DTOVL arch/arm64/boot/dts/ti/k3-j7200-evm.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb | |
DTOVL arch/arm64/boot/dts/ti/k3-j721e-evm.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j721e-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-am69-sk.dtb | |
DTC_CHK arch/arm64/boot/dts/ti/k3-j784s4-evm.dtb | |
$ git diff | |
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | |
index 393a1a40b68b..c076140f141c 100644 | |
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | |
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | |
@@ -144,6 +144,44 @@ | |
}; | |
}; | |
+ dmss_csi: bus@4e000000 { | |
+ compatible = "simple-bus"; | |
+ #address-cells = <2>; | |
+ #size-cells = <2>; | |
+ dma-ranges; | |
+ ranges = <0x00 0x4e000000 0x00 0x4e000000 0x00 0x300000>; | |
+ | |
+ ti,sci-dev-id = <198>; | |
+ | |
+ inta_main_dmss_csi: interrupt-controller@4e0a0000 { | |
+ compatible = "ti,sci-inta"; | |
+ reg = <0x00 0x4e0a0000 0x00 0x8000>; | |
+ #interrupt-cells = <0>; | |
+ interrupt-controller; | |
+ interrupt-parent = <&gic500>; | |
+ msi-controller; | |
+ ti,sci = <&dmsc>; | |
+ ti,sci-dev-id = <200>; | |
+ ti,interrupt-ranges = <0 237 8>; | |
+ ti,unmapped-event-sources = <&main_bcdma_csi>; | |
+ power-domains = <&k3_pds 182 TI_SCI_PD_EXCLUSIVE>; | |
+ }; | |
+ | |
+ main_bcdma_csi: dma-controller@4e230000 { | |
+ compatible = "ti,am62a-dmss-bcdma-csirx"; | |
+ reg = <0x00 0x4e230000 0x00 0x100>, | |
+ <0x00 0x4e180000 0x00 0x8000>, | |
+ <0x00 0x4e100000 0x00 0x10000>; | |
+ reg-names = "gcfg", "rchanrt", "ringrt"; | |
+ msi-parent = <&inta_main_dmss_csi>; | |
+ #dma-cells = <3>; | |
+ ti,sci = <&dmsc>; | |
+ ti,sci-dev-id = <199>; | |
+ ti,sci-rm-range-rchan = <0x21>; | |
+ power-domains = <&k3_pds 182 TI_SCI_PD_EXCLUSIVE>; | |
+ }; | |
+ }; | |
+ | |
dmsc: system-controller@44043000 { | |
compatible = "ti,k2g-sci"; | |
reg = <0x00 0x44043000 0x00 0xfe0>; | |
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | |
index 2dd7865f7654..8a8e09bc59cf 100644 | |
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | |
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | |
@@ -437,6 +437,7 @@ | |
ti,sci = <&sms>; | |
ti,sci-dev-id = <265>; | |
ti,interrupt-ranges = <0 0 256>; | |
+ ti,unmapped-event-sources = <&main_bcdma_csi>; | |
}; | |
secure_proxy_main: mailbox@32c00000 { | |
@@ -732,6 +733,21 @@ | |
ti,sci-rm-range-rflow = <0x00>; /* GP RFLOW */ | |
}; | |
+ main_bcdma_csi: dma-controller@311a0000 { | |
+ compatible = "ti,j721s2-dmss-bcdma-csi"; | |
+ reg = <0x00 0x311a0000 0x00 0x100>, | |
+ <0x00 0x35d00000 0x00 0x20000>, | |
+ <0x00 0x35c00000 0x00 0x10000>, | |
+ <0x00 0x35e00000 0x00 0x80000>; | |
+ reg-names = "gcfg", "rchanrt", "tchanrt", "ringrt"; | |
+ msi-parent = <&main_udmass_inta>; | |
+ #dma-cells = <3>; | |
+ ti,sci = <&sms>; | |
+ ti,sci-dev-id = <225>; | |
+ ti,sci-rm-range-rchan = <0x21>; | |
+ ti,sci-rm-range-tchan = <0x22>; | |
+ }; | |
+ | |
cpts@310d0000 { | |
compatible = "ti,j721e-cpts"; | |
reg = <0x0 0x310d0000 0x0 0x400>; | |
$ git log | |
commit 004fc56f5da98eb13e5916ec0df8753dd0f40cfc (HEAD -> master) | |
Author: Vaishnav Achath <vaishnav.a@ti.com> | |
Date: Mon May 1 15:20:25 2023 +0530 | |
dmaengine: ti: k3-udma: Add support for J721S2 CSI BCDMA instance | |
J721S2 has dedicated BCDMA instance for Camera Serial Interface RX | |
and TX. The BCDMA instance supports RX and TX channels but block copy | |
channels are not present, add support for the same. | |
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> | |
commit d50bec67b2f54411826ae580d3fd4494f3142979 | |
Author: Vaishnav Achath <vaishnav.a@ti.com> | |
Date: Mon May 1 15:20:25 2023 +0530 | |
dt-bindings: dma: ti: Add J721S2 BCDMA | |
Add bindings for J721S2 BCDMA instance dedicated for Camera | |
Serial Interface. Unlike AM62A CSI BCDMA, this instance has RX | |
and TX channels but lacks block copy channels. | |
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> | |
commit 92e815cf07ed24ee1c51b122f24ffcf2964b4b13 (tag: next-20230428, origin/master, origin/HEAD) | |
Author: Mark Brown <broonie@kernel.org> | |
Date: Fri Apr 28 16:17:53 2023 +0100 | |
Add linux-next specific files for 20230428 | |
Signed-off-by: Mark Brown <broonie@kernel.org> | |
$ git show d50bec67b2f54411826ae580d3fd4494f3142979 | |
commit d50bec67b2f54411826ae580d3fd4494f3142979 | |
Author: Vaishnav Achath <vaishnav.a@ti.com> | |
Date: Mon May 1 15:20:25 2023 +0530 | |
dt-bindings: dma: ti: Add J721S2 BCDMA | |
Add bindings for J721S2 BCDMA instance dedicated for Camera | |
Serial Interface. Unlike AM62A CSI BCDMA, this instance has RX | |
and TX channels but lacks block copy channels. | |
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> | |
diff --git a/Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml b/Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | |
index beecfe7a1732..59d49b0699ba 100644 | |
--- a/Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | |
+++ b/Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | |
@@ -33,6 +33,7 @@ properties: | |
enum: | |
- ti,am62a-dmss-bcdma-csirx | |
- ti,am64-dmss-bcdma | |
+ - ti,j721s2-dmss-bcdma-csi | |
reg: | |
minItems: 3 | |
@@ -150,23 +151,44 @@ allOf: | |
required: | |
- power-domains | |
- | |
else: | |
- properties: | |
- reg: | |
- minItems: 5 | |
- | |
- reg-names: | |
- items: | |
- - const: gcfg | |
- - const: bchanrt | |
- - const: rchanrt | |
- - const: tchanrt | |
- - const: ringrt | |
- | |
- required: | |
- - ti,sci-rm-range-bchan | |
- - ti,sci-rm-range-tchan | |
+ if: | |
+ properties: | |
+ compatible: | |
+ contains: | |
+ const: ti,j721s2-dmss-bcdma-csi | |
+ then: | |
+ properties: | |
+ ti,sci-rm-range-bchan: false | |
+ | |
+ reg: | |
+ maxItems: 4 | |
+ | |
+ reg-names: | |
+ items: | |
+ - const: gcfg | |
+ - const: rchanrt | |
+ - const: tchanrt | |
+ - const: ringrt | |
+ | |
+ required: | |
+ - ti,sci-rm-range-tchan | |
+ else: | |
+ properties: | |
+ reg: | |
+ minItems: 5 | |
+ | |
+ reg-names: | |
+ items: | |
+ - const: gcfg | |
+ - const: bchanrt | |
+ - const: rchanrt | |
+ - const: tchanrt | |
+ - const: ringrt | |
+ | |
+ required: | |
+ - ti,sci-rm-range-bchan | |
+ - ti,sci-rm-range-tchan | |
unevaluatedProperties: false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment