arm64: dts: meson: new fixes following YAML bindings schemas conversion
Subsystems (2)
cover arm64: dts: meson: new fixes following YAML bindings schemas conversion
This is the first set of DT fixes following the first YAML bindings conversion at [1], [2], [3] and [4] and v5.4-rc1 bindings changes.
These are only cosmetic changes, and should not break drivers implementation following the bindings.
[1] https://patchwork.kernel.org/patch/11202077/
[2] https://patchwork.kernel.org/patch/11202183/
[3] https://patchwork.kernel.org/patch/11202207/
[4] https://patchwork.kernel.org/patch/11202265/
Neil Armstrong (5):
arm64: dts: meson-g12a: fix gpu irq order
arm64: dts: meson-gxm: fix gpu irq order
arm64: dts: meson-g12b-odroid-n2: add missing amlogic,s922x compatible
arm64: dts: meson-gx: cec node should be disabled by default
arm64: dts: meson-gx: fix i2c compatible
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++--- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 9 +++++---- arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-)
Signature · 1 line
2.22.0
PATCH 1/5 arm64: dts: meson-g12a: fix gpu irq order
This fixes the following DT schemas check errors:meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:0: 'job' was expected meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:2: 'gpu' was expected
--- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +3 -3
@@ -2388,10 +2388,10 @@ compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost"; reg = <0x0 0xffe40000 0x0 0x40000>; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "gpu", "mmu", "job"; + <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "job", "mmu", "gpu"; clocks = <&clkc CLKID_MALI>; resets = <&reset RESET_DVALIN_CAPB3>, <&reset RESET_DVALIN>;
Signature · 1 line
2.22.0
PATCH 2/5 arm64: dts: meson-gxm: fix gpu irq order
In reply to Neil ArmstrongThis fixes the following DT schemas check errors:meson-gxm-khadas-vim2.dt.yaml: gpu@c0000: interrupt-names:0: 'job' was expected meson-gxm-khadas-vim2.dt.yaml: gpu@c0000: interrupt-names:2: 'gpu' was expected
--- arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +3 -3
@@ -96,10 +96,10 @@ compatible = "amlogic,meson-gxm-mali", "arm,mali-t820"; reg = <0x0 0xc0000 0x0 0x40000>; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "gpu", "mmu", "job"; + <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "job", "mmu", "gpu"; clocks = <&clkc CLKID_MALI>; resets = <&reset RESET_MALI_CAPB3>, <&reset RESET_MALI>;
Signature · 1 line
2.22.0
PATCH 3/5 arm64: dts: meson-g12b-odroid-n2: add missing amlogic,s922x compatible
In reply to Neil ArmstrongThis fixes the following DT schemas check errors:meson-g12b-odroid-n2.dt.yaml: /: compatible: ['hardkernel,odroid-n2', 'amlogic,g12b'] is not valid under any of the given schemas
--- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +1 -1
@@ -12,7 +12,7 @@ #include <dt-bindings/sound/meson-g12a-tohdmitx.h> / { - compatible = "hardkernel,odroid-n2", "amlogic,g12b"; + compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b"; model = "Hardkernel ODROID-N2"; aliases {
Signature · 1 line
2.22.0
PATCH 4/5 arm64: dts: meson-gx: cec node should be disabled by default
In reply to Neil ArmstrongThis fixes the following DT schemas check errors:meson-gxl-s905x-hwacom-amazetv.dt.yaml: cec@100: 'hdmi-phandle' is a required property meson-gxm-rbox-pro.dt.yaml: cec@100: 'hdmi-phandle' is a required property
because CEC is not enabled on these boards.
--- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -0
@@ -391,6 +391,7 @@ compatible = "amlogic,meson-gx-ao-cec"; reg = <0x0 0x00100 0x0 0x14>; interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>; + status = "disabled"; }; sec_AO: ao-secure@140 {
Signature · 1 line
2.22.0
PATCH 5/5 arm64: dts: meson-gx: fix i2c compatible
In reply to Neil ArmstrongThis fixes the following DT schemas check errors:meson-gxbb-nanopi-k2.dt.yaml: i2c@8500: compatible: Additional items are not allowed ('amlogic,meson-gxbb-i2c' was unexpected) meson-gxbb-nanopi-k2.dt.yaml: i2c@8500: compatible:0: 'amlogic,meson-gx-i2c' is not one of ['amlogic,meson6-i2c', 'amlogic,meson-gxbb-i2c', 'amlogic,meson-axg-i2c'] meson-gxbb-nanopi-k2.dt.yaml: i2c@8500: compatible: ['amlogic,meson-gx-i2c', 'amlogic,meson-gxbb-i2c'] is too long
--- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +4 -4
@@ -240,7 +240,7 @@ }; i2c_A: i2c@8500 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x08500 0x0 0x20>; interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>;
@@ -290,7 +290,7 @@ }; i2c_B: i2c@87c0 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087c0 0x0 0x20>; interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>;
@@ -299,7 +299,7 @@ }; i2c_C: i2c@87e0 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087e0 0x0 0x20>; interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>;
@@ -415,7 +415,7 @@ }; i2c_AO: i2c@500 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x500 0x0 0x20>; interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>;
Signature · 1 line
2.22.0
Hi Neil,
Quoted 12 lines · Neil Armstrong
This is the first set of DT fixes following the first YAML bindings conversion at [1], [2], [3] and [4] and v5.4-rc1 bindings changes.
These are only cosmetic changes, and should not break drivers implementation following the bindings.
[1] https://patchwork.kernel.org/patch/11202077/
[2] https://patchwork.kernel.org/patch/11202183/
[3] https://patchwork.kernel.org/patch/11202207/
[4] https://patchwork.kernel.org/patch/11202265/
Quoted 6 lines
Neil Armstrong (5):
arm64: dts: meson-g12a: fix gpu irq order
arm64: dts: meson-gxm: fix gpu irq order
arm64: dts: meson-g12b-odroid-n2: add missing amlogic,s922x compatible
arm64: dts: meson-gx: cec node should be disabled by default
arm64: dts: meson-gx: fix i2c compatible
for the whole series:
Thank you!
Martin
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Kevin Hilman
maintainerQuoted 22 lines · Martin Blumenstingl
Hi Neil,
Quoted 12 lines · Neil Armstrong
This is the first set of DT fixes following the first YAML bindings conversion at [1], [2], [3] and [4] and v5.4-rc1 bindings changes.
These are only cosmetic changes, and should not break drivers implementation following the bindings.
[1] https://patchwork.kernel.org/patch/11202077/
[2] https://patchwork.kernel.org/patch/11202183/
[3] https://patchwork.kernel.org/patch/11202207/
[4] https://patchwork.kernel.org/patch/11202265/Quoted 6 lines
Neil Armstrong (5):
arm64: dts: meson-g12a: fix gpu irq order
arm64: dts: meson-gxm: fix gpu irq order
arm64: dts: meson-g12b-odroid-n2: add missing amlogic,s922x compatible
arm64: dts: meson-gx: cec node should be disabled by default
arm64: dts: meson-gx: fix i2c compatible
Quoted 2 lines
for the whole series:
Reviewed-by Martin Blumenstingl <[email protected]>
Queued for v5.5,
Thanks,
Kevin
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Hello:
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Quoted 6 lines · On Mon, 21 Oct 2019 16:28:59 +0200 you wrote:
This is the first set of DT fixes following the first YAML bindings conversion at [1], [2], [3] and [4] and v5.4-rc1 bindings changes.
These are only cosmetic changes, and should not break drivers implementation following the bindings.
Quoted 6 lines
[1] https://patchwork.kernel.org/patch/11202077/
[2] https://patchwork.kernel.org/patch/11202183/
[3] https://patchwork.kernel.org/patch/11202207/
[4] https://patchwork.kernel.org/patch/11202265/[...]
Here is a summary with links:
- [1/5] arm64: dts: meson-g12a: fix gpu irq order
https://git.kernel.org/khilman/linux-amlogic/c/711f9cb1f13aff940cd0a469dcb1a041330af019 - [2/5] arm64: dts: meson-gxm: fix gpu irq order https://git.kernel.org/khilman/linux-amlogic/c/69fb3f21f865ef110cb94a59bbf84adc2c376d9a - [3/5] arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible https://git.kernel.org/khilman/linux-amlogic/c/409a0daa72f6fc1652e17cfea7ea1055e9c483c9 - [4/5] arm64: dts: meson-gx: cec node should be disabled by default https://git.kernel.org/khilman/linux-amlogic/c/b485a6a4e889f406b38038027557b78f33b571fe - [5/5] arm64: dts: meson-gx: fix i2c compatible https://git.kernel.org/khilman/linux-amlogic/c/87297878b5b7c2fc4cecd66fc96b3061d04b6b3b
You are awesome, thank you!
Signature · 7 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic