diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 18:00:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 18:00:48 +0100 |
| commit | 542b9f11e5643d165d43e45675993e040cf32e5f (patch) | |
| tree | b762d1edaa1071b9a44394f0fc05db2ed4f786ea /Documentation/devicetree/bindings/arm | |
| parent | e9cb878ec238f85b81c7b439b4280062d4fbf9b8 (diff) | |
| parent | 18d6e3f6744d6105ab61de790170cb60534eeebc (diff) | |
Merge tag 'v5.11-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt
mt6779:
- add DEVAPC node to detect mallicious bus accesses
- add PMIC wrapper node
mt7622:
- add reset to mmc node
mt8183:
- fix typo in drma-fifo-size property
- refine compatible for the disp-gamma
- add phandel of PM domain to the PWM node
- add second PWM node
- add regulator to MFG power domain
- enable DSI node in kukui
- add krane sku0, which uses different panel
- fix mailbox dt-bindings include path
mt8192:
- add NOR flash node
- add PSCI based CPU idle states
mt8516:
- add node for the UART's APDMA controller
* tag 'v5.11-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
arm64: dts: mt8183: Fix GCE include path
dts64: mt7622: fix slow sd card access
dt-bindings: arm64: dts: mediatek: Add krane sku0
arm64: dts: mt8183: Add krane-sku0 board.
arm64: dts: mt8183: config dsi node
arm64: dts: mt6779: Support pwrap on Mediatek MT6779 platform
arm64: dts: mt6779: Support devapc
arm64: dts: mt8192: Add cpu-idle-states
arm64: dts: mediatek: mt8183: Add domain supply for mfg
arm64: dts: mt8192: add nor_flash device node
arm64: dts: mediatek: mt8516: add support for APDMA
arm64: dts: mediatek: mt8183-evb: add PWM support
arm64: dts: mediatek: mt8183: add pwm node
arm64: dts: mt8183: Add missing power-domain for pwm0 node
arm64: dts: mt8183: refine gamma compatible name
arm64: dts: mt8183: rename rdma fifo size
Link: https://lore.kernel.org/r/565be0cc-460a-7d0b-47da-09bf0401e8fe@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/mediatek.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml index 53f0d4e3ea98..93b3bdf6eaeb 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.yaml +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml @@ -120,7 +120,9 @@ properties: - const: mediatek,mt8183 - description: Google Krane (Lenovo IdeaPad Duet, 10e,...) items: - - const: google,krane-sku176 + - enum: + - google,krane-sku0 + - google,krane-sku176 - const: google,krane - const: mediatek,mt8183 |