On Mon, Dec 05, 2022 at 05:41:55PM -0600, Rob Herring wrote: > On Thu, Nov 17, 2022 at 3:38 PM Thierry Reding <thierry.reding@xxxxxxxxx> wrote: > > > > On Mon, Nov 14, 2022 at 03:53:32PM +0000, Jon Hunter wrote: > > > From: Vidya Sagar <vidyas@xxxxxxxxxx> > > > > > > Add support for ECAM aperture that is only supported for Tegra234 > > > devices. > > > > > > Signed-off-by: Vidya Sagar <vidyas@xxxxxxxxxx> > > > Co-developed-by: Jon Hunter <jonathanh@xxxxxxxxxx> > > > Signed-off-by: Jon Hunter <jonathanh@xxxxxxxxxx> > > > --- > > > Changes since V2: > > > - Avoid duplication of reg items and reg-names > > > Changes since V1: > > > - Restricted the ECAM aperture to only Tegra234 devices that support it. > > > > > > .../bindings/pci/nvidia,tegra194-pcie.yaml | 34 +++++++++++++++++-- > > > .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- > > > 2 files changed, 33 insertions(+), 3 deletions(-) > > > > Both patches applied now. > > linux-next now fails with this. I suspect it is due to Sergey's > changes to the DWC schema. > > /builds/robherring/linux-dt/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.example.dtb: > pcie@14160000: reg-names:4: 'oneOf' conditional failed, one must be > fixed: > 'dbi' was expected > 'dbi2' was expected > 'ecam' is not one of ['elbi', 'app'] > 'atu' was expected > 'dma' was expected > 'phy' was expected > 'config' was expected > /builds/robherring/linux-dt/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.example.dtb: > pcie@14160000: reg-names:4: 'oneOf' conditional failed, one must be > fixed: > 'ecam' is not one of ['apb', 'mgmt', 'link', 'ulreg', 'appl'] > 'ecam' is not one of ['atu_dma'] > 'ecam' is not one of ['smu', 'mpu'] > From schema: > /builds/robherring/linux-dt/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.yaml Stephen reported the other day that he wasn't able to resolve this conflict in linux-next, so he dropped the ECAM bits. The ECAM patch has now propagated to ARM SoC so it can't be easily backed out, but I guess we could revert on that tree and instead apply the patch to the DT tree and resolve the conflict there. I guess the better alternative would be to try and resolve the merge properly and let Stephen (and Linus) know. Thierry
Attachment:
signature.asc
Description: PGP signature
