arm64: dts: layerscape: add platform special compatible string for gpio
Subsystems (2)
Frank Li
maintainerPATCH 1/6 arm64: dts: layerscape: add platform special compatible string for gpio
Add platform special compatible string for all gpio controller to fix below warning.
gpio@2300000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,qoriq-gpio'] is too short
'fsl,qoriq-gpio' is not one of ['fsl,mpc5121-gpio', 'fsl,mpc5125-gpio', 'fsl,mpc8349-gpio', 'fsl,mpc8572-gpio', 'fsl,mpc8610-gpio', 'fsl,pq3-gpio']
'fsl,qoriq-gpio' is not one of ['fsl,ls1021a-gpio', 'fsl,ls1028a-gpio', 'fsl,ls1043a-gpio', 'fsl,ls1088a-gpio', 'fsl,ls2080a-gpio']--- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 4 ++-- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 8 ++++---- arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +2 -2
@@ -407,7 +407,7 @@ duart1: serial@21c0600 { }; gpio0: gpio@2300000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1021a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>; interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -417,7 +417,7 @@ gpio0: gpio@2300000 { }; gpio1: gpio@2310000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1021a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2310000 0x0 0x10000>; interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +4 -4
@@ -589,7 +589,7 @@ duart3: serial@21d0600 { }; gpio0: gpio@2300000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1046a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>; interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -599,7 +599,7 @@ gpio0: gpio@2300000 { }; gpio1: gpio@2310000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1046a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2310000 0x0 0x10000>; interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -609,7 +609,7 @@ gpio1: gpio@2310000 { }; gpio2: gpio@2320000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1046a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2320000 0x0 0x10000>; interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -619,7 +619,7 @@ gpio2: gpio@2320000 { }; gpio3: gpio@2330000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls1046a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2330000 0x0 0x10000>; interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +4 -4
@@ -1027,7 +1027,7 @@ QORIQ_CLK_PLL_DIV(8)>, }; gpio0: gpio@2300000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls2080a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -1038,7 +1038,7 @@ gpio0: gpio@2300000 { }; gpio1: gpio@2310000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls2080a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2310000 0x0 0x10000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -1049,7 +1049,7 @@ gpio1: gpio@2310000 { }; gpio2: gpio@2320000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls2080a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2320000 0x0 0x10000>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
@@ -1060,7 +1060,7 @@ gpio2: gpio@2320000 { }; gpio3: gpio@2330000 { - compatible = "fsl,qoriq-gpio"; + compatible = "fsl,ls2080a-gpio", "fsl,qoriq-gpio"; reg = <0x0 0x2330000 0x0 0x10000>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; gpio-controller;
Signature · 1 line
2.34.1
Frank Li
maintainerPATCH 2/6 arm64: dts: fsl-lx2160a: fix #address-cells for pinctrl-single
Change #addres-cells to 1 and #size-cells to 0 to align binding doc requiremement.
Fix below warning:arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dtb: pinmux@70010012c: #address-cells:0:0: 1 was expected
from schema $id: http://devicetree.org/schemas/pinctrl/pinctrl-single.yaml#
--- arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +2 -2
@@ -1702,8 +1702,8 @@ pcs18: ethernet-phy@0 { pinmux_i2crv: pinmux@70010012c { compatible = "pinctrl-single"; reg = <0x00000007 0x0010012c 0x0 0xc>; - #address-cells = <2>; - #size-cells = <2>; + #address-cells = <1>; + #size-cells = <0>; pinctrl-single,bit-per-mux; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0x7>;
Signature · 1 line
2.34.1
Frank Li
maintainerPATCH 3/6 arm64: dts: layerscape: add '#power-control-cells' for rcpm
In reply to Frank LiAdd '#power-control-cells' for rcpm: power-control node to fix below warning.
power-controller@1ee2140: '#power-domain-cells' is a required property
from schema $id: http://devicetree.org/schemas/power/power-domain.yaml#
--- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 1 + 6 files changed, 6 insertions(+)
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +1 -0
@@ -560,6 +560,7 @@ pcie1: pcie@3400000 { rcpm: power-controller@1ee2140 { compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1ee2140 0x0 0x4>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <1>; };
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -0
@@ -1322,6 +1322,7 @@ pwm7: pwm@2870000 { rcpm: power-controller@1e34040 { compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x1c>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <7>; little-endian; };
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +1 -0
@@ -986,6 +986,7 @@ qdma: dma-controller@8380000 { rcpm: power-controller@1ee2140 { compatible = "fsl,ls1043a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1ee2140 0x0 0x4>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <1>; };
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +1 -0
@@ -1036,6 +1036,7 @@ dpmac10: ethernet@a { rcpm: power-controller@1e34040 { compatible = "fsl,ls1088a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x18>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <6>; little-endian; };
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +1 -0
@@ -1221,6 +1221,7 @@ ccn@4000000 { rcpm: power-controller@1e34040 { compatible = "fsl,ls208xa-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x18>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <6>; little-endian; };
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +1 -0
@@ -1081,6 +1081,7 @@ watchdog@23a0000 { rcpm: power-controller@1e34040 { compatible = "fsl,lx2160a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x1c>; + #power-domain-cells = <0>; #fsl,rcpm-wakeup-cells = <7>; little-endian; };
Signature · 1 line
2.34.1
Rob Herring
maintainerRe: [PATCH 3/6] arm64: dts: layerscape: add '#power-control-cells' for rcpm
Quoted 2 lines · Frank Li
Add '#power-control-cells' for rcpm: power-control node to fix below
You mean #power-domain-cells?
Quoted 20 lines
warning.
power-controller@1ee2140: '#power-domain-cells' is a required property
from schema $id: http://devicetree.org/schemas/power/power-domain.yaml#Signed-off-by Frank Li <[email protected]>--- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 1 + 6 files changed, 6 insertions(+)arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +0
-0
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi pcie1: pcie@3400000 { · line 563
Quoted 4 lines
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +1
-0@@ -560,6 +560,7 @@ pcie1: pcie@3400000 { rcpm: power-controller@1ee2140 { compatible = "fsl,ls1012a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1ee2140 0x0 0x4>; + #power-domain-cells = <0>;
The thing is this h/w is not controlling power domains nor using the binding.
So I think the fix here is either rename the node name or drop this schema check ($nodename). We really only do the latter if we want to only reference the power-domain.yaml schema from all specific power domain controller schemas. That's really only done if there's more than just #foo-cells defined by the schema which is not the case here. So we should probably rename the node to 'rcpm' or something. Seems like a step back, but there's really nothing generic to use here.
Rob
Frank Li
maintainerPATCH 4/6 arm64: dts: fsl-ls1012a: remove property 'snps,host-vbus-glitches'
In reply to Frank LiWorkaround already applied unconditional at
commit a6ba1e453174 ("usb: dwc3: apply snps,host-vbus-glitches workaround unconditionally")
Remove it to fix CHECK_DTBS warning:
usb@2f00000: Unevaluated properties are not allowed ('snps,host-vbus-glitches' was unexpected)
--- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +0 -1
@@ -501,7 +501,6 @@ usb0: usb@2f00000 { snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; - snps,host-vbus-glitches; }; sata: sata@3200000 {
Signature · 1 line
2.34.1
Frank Li
maintainerPATCH 5/6 arm64: dts: layerscape: replace node name 'nor' with 'flash'
In reply to Frank LiReplace node name 'nor' with 'flash' to fix below CHECK_DTBS warning. nor@0,0: $nodename:0: 'nor@0,0' does not match '^(flash|.*sram|nand)(@.*)?$'
--- arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +1 -1
@@ -64,7 +64,7 @@ &ifc { 0x2 0x0 0x0 0x7fb00000 0x00000100>; status = "okay"; - nor@0,0 { + flash@0,0 { compatible = "cfi-flash"; reg = <0x0 0x0 0x8000000>; big-endian;
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts +1 -1
@@ -151,7 +151,7 @@ &ifc { 0x2 0x0 0x0 0x7fb00000 0x00000100>; status = "okay"; - nor@0,0 { + flash@0,0 { compatible = "cfi-flash"; reg = <0x0 0x0 0x8000000>; big-endian;
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts +1 -1
@@ -113,7 +113,7 @@ &ifc { 3 0 0x5 0x20000000 0x00010000>; status = "okay"; - nor@0,0 { + flash@0,0 { compatible = "cfi-flash"; reg = <0x0 0x0 0x8000000>; bank-width = <2>;
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi +1 -1
@@ -43,7 +43,7 @@ &ifc { 0x2 0x0 0x5 0x30000000 0x00010000 0x3 0x0 0x5 0x20000000 0x00010000>; - nor@0,0 { + flash@0,0 { #address-cells = <1>; #size-cells = <1>; compatible = "cfi-flash";
arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi +1 -1
@@ -21,7 +21,7 @@ &ifc { 0x2 0x0 0x5 0x30000000 0x00010000 0x3 0x0 0x5 0x20000000 0x00010000>; - nor@0,0 { + flash@0,0 { #address-cells = <1>; #size-cells = <1>; compatible = "cfi-flash";
Signature · 1 line
2.34.1
Frank Li
maintainerPATCH 6/6 arm64: dts: layerscape: remove compatible string 'fsl,fman-xmdio' for fman3
In reply to Frank LiFman3 should use 'fsl,fman-memac-mdio'. 'fsl,fman-xmdio' is for fman2.
Fix below CHECK_DTBS warning.
fman@1a00000: mdio@eb000:compatible: ['fsl,fman-memac-mdio', 'fsl,fman-xmdio'] is too long
--- arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 2 +- arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi +1 -1
@@ -32,7 +32,7 @@ ethernet@f0000 { mdio@f1000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xf1000 0x1000>; pcsphy6: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi +1 -1
@@ -32,7 +32,7 @@ ethernet@f2000 { mdio@f3000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xf3000 0x1000>; pcsphy7: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@e0000 { mdio@e1000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xe1000 0x1000>; pcsphy0: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@e2000 { mdio@e3000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xe3000 0x1000>; pcsphy1: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@e4000 { mdio@e5000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xe5000 0x1000>; pcsphy2: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@e6000 { mdio@e7000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xe7000 0x1000>; pcsphy3: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@e8000 { mdio@e9000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xe9000 0x1000>; pcsphy4: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi +1 -1
@@ -31,7 +31,7 @@ ethernet@ea000 { mdio@eb000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xeb000 0x1000>; pcsphy5: ethernet-phy@0 {
arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi +2 -2
@@ -67,14 +67,14 @@ fman0_oh_0x7: port@87000 { mdio0: mdio@fc000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xfc000 0x1000>; }; xmdio0: mdio@fd000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + compatible = "fsl,fman-memac-mdio"; reg = <0xfd000 0x1000>; }; };
Signature · 1 line
2.34.1