Hi,
Changes since v2:
- Correct unit addresses for the McASP nodes
- Remove unit address and label for MAIN and MCU NAVSS
Changes since v1:
- rebased on ti-k3-next
- Corrected j721e mcu_udma node: s/udmap/dma-controller
- Moved the two McASP node patch at the end of the series
The ringacc and UDMA documentation and drivers are in next-20200122.
While adding the DMA support I have noticed few issues which is also fixed by
this series.
Tero: I have included the McASP nodes as well to have examples for other
peripherals on how he binding should be used.
The patches for the McASP driver is not in next, but they are only internal
driver changes (and Kconfig), not adding new DT dependencies.
Since the McASP is disabled in SoC dtsi due to board level configuration needs
it is not going to erroneously probe drivers.
It is up to you if you pick them or not, but I believe they serve a safe and
nice example how the dma binding should be used for UDMA.
Regards,
Peter
---
Peter Ujfalusi (9):
arm64: dts: ti: k3-am65-main: Correct main NAVSS representation
arm64: dts: ti: k3-am65-main: Move secure proxy under cbass_main_navss
arm64: dts: ti: k3-am65: DMA support
arm64: dts: ti: k3-j721e: Correct the address for MAIN NAVSS
arm64: dts: ti: k3-j721e-main: Correct main NAVSS representation
arm64: dts: ti: k3-j721e-main: Move secure proxy and smmu under
main_navss
arm64: dts: ti: k3-j721e: DMA support
arm64: dts: ti: k3-am654-main: Add McASP nodes
arm64: dts: ti: k3-j721e-main: Add McASP nodes
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 122 ++++++-
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 46 +++
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 313 ++++++++++++++++--
.../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 45 +++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +-
5 files changed, 491 insertions(+), 37 deletions(-)
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Add the nodes for McASP 0-2 and keep them disabled because several
required properties are not present as they are board specific.
Signed-off-by: Peter Ujfalusi <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 57 ++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 7c4853a8a02c..a856079c4fa9 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -663,4 +663,61 @@ pcie1_ep: pcie-ep@5600000 {
dma-coherent;
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
};
+
+ mcasp0: mcasp@2b00000 {
+ compatible = "ti,am33xx-mcasp-audio";
+ reg = <0x0 0x02b00000 0x0 0x2000>,
+ <0x0 0x02b08000 0x0 0x1000>;
+ reg-names = "mpu","dat";
+ interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "tx", "rx";
+
+ dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;
+ dma-names = "tx", "rx";
+
+ clocks = <&k3_clks 104 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
+
+ status = "disabled";
+ };
+
+ mcasp1: mcasp@2b10000 {
+ compatible = "ti,am33xx-mcasp-audio";
+ reg = <0x0 0x02b10000 0x0 0x2000>,
+ <0x0 0x02b18000 0x0 0x1000>;
+ reg-names = "mpu","dat";
+ interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "tx", "rx";
+
+ dmas = <&main_udmap 0xc401>, <&main_udmap 0x4401>;
+ dma-names = "tx", "rx";
+
+ clocks = <&k3_clks 105 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
+
+ status = "disabled";
+ };
+
+ mcasp2: mcasp@2b20000 {
+ compatible = "ti,am33xx-mcasp-audio";
+ reg = <0x0 0x02b20000 0x0 0x2000>,
+ <0x0 0x02b28000 0x0 0x1000>;
+ reg-names = "mpu","dat";
+ interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "tx", "rx";
+
+ dmas = <&main_udmap 0xc402>, <&main_udmap 0x4402>;
+ dma-names = "tx", "rx";
+
+ clocks = <&k3_clks 106 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
+
+ status = "disabled";
+ };
};
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On 23/01/20 5:15 PM, Peter Ujfalusi wrote:
> Hi,
>
> Changes since v2:
> - Correct unit addresses for the McASP nodes
> - Remove unit address and label for MAIN and MCU NAVSS
>
> Changes since v1:
> - rebased on ti-k3-next
> - Corrected j721e mcu_udma node: s/udmap/dma-controller
> - Moved the two McASP node patch at the end of the series
>
> The ringacc and UDMA documentation and drivers are in next-20200122.
>
> While adding the DMA support I have noticed few issues which is also fixed by
> this series.
Entire series looks good to me.
Reviewed-by: Lokesh Vutla <[email protected]>
Thanks and regards,
Lokesh
>
> Tero: I have included the McASP nodes as well to have examples for other
> peripherals on how he binding should be used.
> The patches for the McASP driver is not in next, but they are only internal
> driver changes (and Kconfig), not adding new DT dependencies.
> Since the McASP is disabled in SoC dtsi due to board level configuration needs
> it is not going to erroneously probe drivers.
>
> It is up to you if you pick them or not, but I believe they serve a safe and
> nice example how the dma binding should be used for UDMA.
>
> Regards,
> Peter
> ---
> Peter Ujfalusi (9):
> arm64: dts: ti: k3-am65-main: Correct main NAVSS representation
> arm64: dts: ti: k3-am65-main: Move secure proxy under cbass_main_navss
> arm64: dts: ti: k3-am65: DMA support
> arm64: dts: ti: k3-j721e: Correct the address for MAIN NAVSS
> arm64: dts: ti: k3-j721e-main: Correct main NAVSS representation
> arm64: dts: ti: k3-j721e-main: Move secure proxy and smmu under
> main_navss
> arm64: dts: ti: k3-j721e: DMA support
> arm64: dts: ti: k3-am654-main: Add McASP nodes
> arm64: dts: ti: k3-j721e-main: Add McASP nodes
>
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 122 ++++++-
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 46 +++
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 313 ++++++++++++++++--
> .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 45 +++
> arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +-
> 5 files changed, 491 insertions(+), 37 deletions(-)
>
On 23/01/2020 14:35, Lokesh Vutla wrote:
>
>
> On 23/01/20 5:15 PM, Peter Ujfalusi wrote:
>> Hi,
>>
>> Changes since v2:
>> - Correct unit addresses for the McASP nodes
>> - Remove unit address and label for MAIN and MCU NAVSS
>>
>> Changes since v1:
>> - rebased on ti-k3-next
>> - Corrected j721e mcu_udma node: s/udmap/dma-controller
>> - Moved the two McASP node patch at the end of the series
>>
>> The ringacc and UDMA documentation and drivers are in next-20200122.
>>
>> While adding the DMA support I have noticed few issues which is also fixed by
>> this series.
>
>
> Entire series looks good to me.
>
> Reviewed-by: Lokesh Vutla <[email protected]>
Queued the whole series towards 5.6, thanks.
-Tero
>
>>
>> Tero: I have included the McASP nodes as well to have examples for other
>> peripherals on how he binding should be used.
>> The patches for the McASP driver is not in next, but they are only internal
>> driver changes (and Kconfig), not adding new DT dependencies.
>> Since the McASP is disabled in SoC dtsi due to board level configuration needs
>> it is not going to erroneously probe drivers.
>>
>> It is up to you if you pick them or not, but I believe they serve a safe and
>> nice example how the dma binding should be used for UDMA.
>>
>> Regards,
>> Peter
>> ---
>> Peter Ujfalusi (9):
>> arm64: dts: ti: k3-am65-main: Correct main NAVSS representation
>> arm64: dts: ti: k3-am65-main: Move secure proxy under cbass_main_navss
>> arm64: dts: ti: k3-am65: DMA support
>> arm64: dts: ti: k3-j721e: Correct the address for MAIN NAVSS
>> arm64: dts: ti: k3-j721e-main: Correct main NAVSS representation
>> arm64: dts: ti: k3-j721e-main: Move secure proxy and smmu under
>> main_navss
>> arm64: dts: ti: k3-j721e: DMA support
>> arm64: dts: ti: k3-am654-main: Add McASP nodes
>> arm64: dts: ti: k3-j721e-main: Add McASP nodes
>>
>> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 122 ++++++-
>> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 46 +++
>> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 313 ++++++++++++++++--
>> .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 45 +++
>> arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +-
>> 5 files changed, 491 insertions(+), 37 deletions(-)
>>
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki