diff options
author | Mark Brown <broonie@kernel.org> | 2021-04-15 20:29:40 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-04-15 20:29:40 +0200 |
commit | c7ed5fd5fbb279a75a58cf641b873f57ef906ac7 (patch) | |
tree | 4aac1ad717ce4a757b872463bbfd75f0a182a75e /Documentation/devicetree | |
parent | spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe (diff) | |
parent | spi: pxa2xx: Add support for Intel Alder Lake PCH-M (diff) | |
download | linux-c7ed5fd5fbb279a75a58cf641b873f57ef906ac7.tar.xz linux-c7ed5fd5fbb279a75a58cf641b873f57ef906ac7.zip |
Merge branch 'for-5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.13
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml b/Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml index 55c239446a5b..7393f30535df 100644 --- a/Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml +++ b/Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml @@ -31,6 +31,7 @@ properties: - mediatek,mt7623-nor - mediatek,mt7629-nor - mediatek,mt8192-nor + - mediatek,mt8195-nor - enum: - mediatek,mt8173-nor - items: |