| Message ID | 20240925110044.3678055-3-fshao@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5efa23224bf573d4bceb51bc646dd67b6ccb83b5 |
| Headers | show |
| Series | MT8188 DT and binding fixes | expand |
On 25/09/2024 12:57, Fei Shao wrote: > In MediaTek PCIe gen3 bindings, "clocks" accepts a range of 1-6 clocks > across all SoCs. But in practice, each SoC requires a particular number > of clocks as defined in "clock-names", and the length of "clocks" and > "clock-names" can be inconsistent with current bindings. > > For example: > - MT8188, MT8192 and MT8195 all require 6 clocks, while the bindings > accept 4-6 clocks. > - MT7986 requires 4 clocks, while the bindings accept 4-6 clocks. > > Update minItems and maxItems properties for individual SoCs as needed to > only accept the correct number of clocks. > Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
On Wed, Sep 25, 2024 at 06:57:46PM +0800, Fei Shao wrote: > In MediaTek PCIe gen3 bindings, "clocks" accepts a range of 1-6 clocks > across all SoCs. But in practice, each SoC requires a particular number > of clocks as defined in "clock-names", and the length of "clocks" and > "clock-names" can be inconsistent with current bindings. > > For example: > - MT8188, MT8192 and MT8195 all require 6 clocks, while the bindings > accept 4-6 clocks. > - MT7986 requires 4 clocks, while the bindings accept 4-6 clocks. > > Update minItems and maxItems properties for individual SoCs as needed to > only accept the correct number of clocks. > > Fixes: c6abd0eadec6 ("dt-bindings: PCI: mediatek-gen3: Add support for Airoha EN7581") > Signed-off-by: Fei Shao <fshao@chromium.org> It looks like most changes to this file have been merged via the PCI tree. I don't see dependencies on this in the rest of the series, so I'm happy to take this via PCI if it makes sense. Or if you prefer that this be merged with the rest of the series, that's fine and you can add my: Acked-by: Bjorn Helgaas <bhelgaas@google.com> Let me know if I should pick this one up. > --- > > .../devicetree/bindings/pci/mediatek-pcie-gen3.yaml | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > index 898c1be2d6a4..f05aab2b1add 100644 > --- a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > @@ -149,7 +149,7 @@ allOf: > then: > properties: > clocks: > - minItems: 4 > + minItems: 6 > > clock-names: > items: > @@ -178,7 +178,7 @@ allOf: > then: > properties: > clocks: > - minItems: 4 > + minItems: 6 > > clock-names: > items: > @@ -207,6 +207,7 @@ allOf: > properties: > clocks: > minItems: 4 > + maxItems: 4 > > clock-names: > items: > -- > 2.46.0.792.g87dc391469-goog >
On Wed, Oct 2, 2024 at 3:53 AM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Wed, Sep 25, 2024 at 06:57:46PM +0800, Fei Shao wrote: > > In MediaTek PCIe gen3 bindings, "clocks" accepts a range of 1-6 clocks > > across all SoCs. But in practice, each SoC requires a particular number > > of clocks as defined in "clock-names", and the length of "clocks" and > > "clock-names" can be inconsistent with current bindings. > > > > For example: > > - MT8188, MT8192 and MT8195 all require 6 clocks, while the bindings > > accept 4-6 clocks. > > - MT7986 requires 4 clocks, while the bindings accept 4-6 clocks. > > > > Update minItems and maxItems properties for individual SoCs as needed to > > only accept the correct number of clocks. > > > > Fixes: c6abd0eadec6 ("dt-bindings: PCI: mediatek-gen3: Add support for Airoha EN7581") > > Signed-off-by: Fei Shao <fshao@chromium.org> > > It looks like most changes to this file have been merged via the PCI > tree. I don't see dependencies on this in the rest of the series, so > I'm happy to take this via PCI if it makes sense. Or if you prefer > that this be merged with the rest of the series, that's fine and you > can add my: > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > > Let me know if I should pick this one up. > Yes please, thank you! Regards, Fei > > --- > > > > .../devicetree/bindings/pci/mediatek-pcie-gen3.yaml | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > > index 898c1be2d6a4..f05aab2b1add 100644 > > --- a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > > +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > > @@ -149,7 +149,7 @@ allOf: > > then: > > properties: > > clocks: > > - minItems: 4 > > + minItems: 6 > > > > clock-names: > > items: > > @@ -178,7 +178,7 @@ allOf: > > then: > > properties: > > clocks: > > - minItems: 4 > > + minItems: 6 > > > > clock-names: > > items: > > @@ -207,6 +207,7 @@ allOf: > > properties: > > clocks: > > minItems: 4 > > + maxItems: 4 > > > > clock-names: > > items: > > -- > > 2.46.0.792.g87dc391469-goog > >
On Wed, Sep 25, 2024 at 06:57:46PM +0800, Fei Shao wrote: > In MediaTek PCIe gen3 bindings, "clocks" accepts a range of 1-6 clocks > across all SoCs. But in practice, each SoC requires a particular number > of clocks as defined in "clock-names", and the length of "clocks" and > "clock-names" can be inconsistent with current bindings. > > For example: > - MT8188, MT8192 and MT8195 all require 6 clocks, while the bindings > accept 4-6 clocks. > - MT7986 requires 4 clocks, while the bindings accept 4-6 clocks. > > Update minItems and maxItems properties for individual SoCs as needed to > only accept the correct number of clocks. > > Fixes: c6abd0eadec6 ("dt-bindings: PCI: mediatek-gen3: Add support for Airoha EN7581") > Signed-off-by: Fei Shao <fshao@chromium.org> This patch only applied to pci/dt-bindings with Krzysztof K's reviewed-by for v6.13, thank you! > --- > > .../devicetree/bindings/pci/mediatek-pcie-gen3.yaml | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > index 898c1be2d6a4..f05aab2b1add 100644 > --- a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml > @@ -149,7 +149,7 @@ allOf: > then: > properties: > clocks: > - minItems: 4 > + minItems: 6 > > clock-names: > items: > @@ -178,7 +178,7 @@ allOf: > then: > properties: > clocks: > - minItems: 4 > + minItems: 6 > > clock-names: > items: > @@ -207,6 +207,7 @@ allOf: > properties: > clocks: > minItems: 4 > + maxItems: 4 > > clock-names: > items: > -- > 2.46.0.792.g87dc391469-goog >
diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml index 898c1be2d6a4..f05aab2b1add 100644 --- a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml @@ -149,7 +149,7 @@ allOf: then: properties: clocks: - minItems: 4 + minItems: 6 clock-names: items: @@ -178,7 +178,7 @@ allOf: then: properties: clocks: - minItems: 4 + minItems: 6 clock-names: items: @@ -207,6 +207,7 @@ allOf: properties: clocks: minItems: 4 + maxItems: 4 clock-names: items:
In MediaTek PCIe gen3 bindings, "clocks" accepts a range of 1-6 clocks across all SoCs. But in practice, each SoC requires a particular number of clocks as defined in "clock-names", and the length of "clocks" and "clock-names" can be inconsistent with current bindings. For example: - MT8188, MT8192 and MT8195 all require 6 clocks, while the bindings accept 4-6 clocks. - MT7986 requires 4 clocks, while the bindings accept 4-6 clocks. Update minItems and maxItems properties for individual SoCs as needed to only accept the correct number of clocks. Fixes: c6abd0eadec6 ("dt-bindings: PCI: mediatek-gen3: Add support for Airoha EN7581") Signed-off-by: Fei Shao <fshao@chromium.org> --- .../devicetree/bindings/pci/mediatek-pcie-gen3.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)