Instead of using empty ranges property, lets map explicitly the address
range that is mapped onto the dma / navigator subsystems (navss/dmss).
This is also exposed via the dtbs_check with dt-schema newer than
2021.03 version by throwing out following:
arch/arm64/boot/dts/ti/k3-am654-base-board.dt.yaml: bus@100000: main-navss:
{'type': 'object'} is not allowed for
{'compatible': ['simple-mfd'], '#address-cells': [[2]], .....
This has already been correctly done for J7200, however was missed for
other k3 SoCs. Fix that oversight.
Signed-off-by: Nishanth Menon <[email protected]>
---
if possible, I'd like to pick this fixup for 5.13 window..
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index a49e41021573..bb19db04a746 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -42,12 +42,12 @@ gic_its: msi-controller@1820000 {
};
};
- dmss: dmss {
+ dmss: bus@48000000 {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
dma-ranges;
- ranges;
+ ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;
ti,sci-dev-id = <25>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 037f9776c4c8..fea8260d33a8 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -445,11 +445,11 @@ intr_main_gpio: interrupt-controller@a00000 {
ti,interrupt-ranges = <0 392 32>;
};
- main-navss {
+ main_navss: bus@30800000 {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
dma-coherent;
dma-ranges;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index 0388c02c2203..f5b8ef2f5f77 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -116,11 +116,11 @@ adc {
};
};
- mcu-navss {
+ mcu_navss: bus@28380000 {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
dma-coherent;
dma-ranges;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 512371e36a30..b2d25af872e2 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -88,11 +88,11 @@ main_gpio_intr: interrupt-controller@a00000 {
ti,interrupt-ranges = <8 392 56>;
};
- main-navss {
+ main_navss: bus@30000000 {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
dma-coherent;
dma-ranges;
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index ad12a5c9f209..172629fa3c7c 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -250,11 +250,11 @@ adc {
};
};
- mcu-navss {
+ mcu_navss: bus@28380000 {
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
dma-coherent;
dma-ranges;
--
2.31.0
On 10/05/2021 17:54, Nishanth Menon wrote:
> Instead of using empty ranges property, lets map explicitly the address
> range that is mapped onto the dma / navigator subsystems (navss/dmss).
>
> This is also exposed via the dtbs_check with dt-schema newer than
> 2021.03 version by throwing out following:
> arch/arm64/boot/dts/ti/k3-am654-base-board.dt.yaml: bus@100000: main-navss:
> {'type': 'object'} is not allowed for
> {'compatible': ['simple-mfd'], '#address-cells': [[2]], .....
>
> This has already been correctly done for J7200, however was missed for
> other k3 SoCs. Fix that oversight.
>
> Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Tero Kristo <[email protected]>
> ---
>
> if possible, I'd like to pick this fixup for 5.13 window..
>
> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index a49e41021573..bb19db04a746 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -42,12 +42,12 @@ gic_its: msi-controller@1820000 {
> };
> };
>
> - dmss: dmss {
> + dmss: bus@48000000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> dma-ranges;
> - ranges;
> + ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;
>
> ti,sci-dev-id = <25>;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 037f9776c4c8..fea8260d33a8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -445,11 +445,11 @@ intr_main_gpio: interrupt-controller@a00000 {
> ti,interrupt-ranges = <0 392 32>;
> };
>
> - main-navss {
> + main_navss: bus@30800000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> index 0388c02c2203..f5b8ef2f5f77 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> @@ -116,11 +116,11 @@ adc {
> };
> };
>
> - mcu-navss {
> + mcu_navss: bus@28380000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 512371e36a30..b2d25af872e2 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -88,11 +88,11 @@ main_gpio_intr: interrupt-controller@a00000 {
> ti,interrupt-ranges = <8 392 56>;
> };
>
> - main-navss {
> + main_navss: bus@30000000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index ad12a5c9f209..172629fa3c7c 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -250,11 +250,11 @@ adc {
> };
> };
>
> - mcu-navss {
> + mcu_navss: bus@28380000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
> dma-coherent;
> dma-ranges;
>
>
On 5/10/21 8:24 PM, Nishanth Menon wrote:
> Instead of using empty ranges property, lets map explicitly the address
> range that is mapped onto the dma / navigator subsystems (navss/dmss).
>
> This is also exposed via the dtbs_check with dt-schema newer than
> 2021.03 version by throwing out following:
> arch/arm64/boot/dts/ti/k3-am654-base-board.dt.yaml: bus@100000: main-navss:
> {'type': 'object'} is not allowed for
> {'compatible': ['simple-mfd'], '#address-cells': [[2]], .....
>
> This has already been correctly done for J7200, however was missed for
> other k3 SoCs. Fix that oversight.
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
>
Acked-by: Vignesh Raghavendra <[email protected]>
> if possible, I'd like to pick this fixup for 5.13 window..
>
> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index a49e41021573..bb19db04a746 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -42,12 +42,12 @@ gic_its: msi-controller@1820000 {
> };
> };
>
> - dmss: dmss {
> + dmss: bus@48000000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> dma-ranges;
> - ranges;
> + ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;
>
> ti,sci-dev-id = <25>;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 037f9776c4c8..fea8260d33a8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -445,11 +445,11 @@ intr_main_gpio: interrupt-controller@a00000 {
> ti,interrupt-ranges = <0 392 32>;
> };
>
> - main-navss {
> + main_navss: bus@30800000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> index 0388c02c2203..f5b8ef2f5f77 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> @@ -116,11 +116,11 @@ adc {
> };
> };
>
> - mcu-navss {
> + mcu_navss: bus@28380000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 512371e36a30..b2d25af872e2 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -88,11 +88,11 @@ main_gpio_intr: interrupt-controller@a00000 {
> ti,interrupt-ranges = <8 392 56>;
> };
>
> - main-navss {
> + main_navss: bus@30000000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
> dma-coherent;
> dma-ranges;
>
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index ad12a5c9f209..172629fa3c7c 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -250,11 +250,11 @@ adc {
> };
> };
>
> - mcu-navss {
> + mcu_navss: bus@28380000 {
> compatible = "simple-mfd";
> #address-cells = <2>;
> #size-cells = <2>;
> - ranges;
> + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
> dma-coherent;
> dma-ranges;
>
>
On Mon, 10 May 2021 09:54:29 -0500, Nishanth Menon wrote:
> Instead of using empty ranges property, lets map explicitly the address
> range that is mapped onto the dma / navigator subsystems (navss/dmss).
>
> This is also exposed via the dtbs_check with dt-schema newer than
> 2021.03 version by throwing out following:
> arch/arm64/boot/dts/ti/k3-am654-base-board.dt.yaml: bus@100000: main-navss:
> {'type': 'object'} is not allowed for
> {'compatible': ['simple-mfd'], '#address-cells': [[2]], .....
>
> [...]
Hi Nishanth Menon,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/1] arm64: dts: ti: k3-am65|j721e|am64: Map the dma / navigator subsystem via explicit ranges
commit: 9ecdb6d6b11434494af4bad11b03f0dcda1eebbd
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D