diff options
| author | AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> | 2026-09-10 16:41:56 +0200 |
|---|---|---|
| committer | AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> | 2026-09-10 16:41:56 +0200 |
| commit | 7e1e89af36f6ea0e583a657407134696e0be8bfc (patch) | |
| tree | 3acec4faff10ee646d5debb7db2288b508604358 | |
| parent | f9920990c2135e2a16c74722ea2c96cbff776dd4 (diff) | |
| parent | 2e195497fc9fc0dd89cf95dab80a2d0486dab65b (diff) | |
| download | linux-next-7e1e89af36f6ea0e583a657407134696e0be8bfc.tar.gz linux-next-7e1e89af36f6ea0e583a657407134696e0be8bfc.zip | |
Merge branch 'v7.3-next/dts32' into for-next
| -rw-r--r-- | Documentation/devicetree/bindings/arm/mediatek.yaml | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mediatek/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts | 54 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mediatek/mt8127.dtsi | 7 |
4 files changed, 63 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml index cd4040ad3437..180e6e4948e7 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.yaml +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml @@ -122,6 +122,7 @@ properties: - const: mediatek,mt7988a - items: - enum: + - amazon,ford - mediatek,mt8127-moose - const: mediatek,mt8127 - items: diff --git a/arch/arm/boot/dts/mediatek/Makefile b/arch/arm/boot/dts/mediatek/Makefile index 37c4cded0eae..a610bc75c7d9 100644 --- a/arch/arm/boot/dts/mediatek/Makefile +++ b/arch/arm/boot/dts/mediatek/Makefile @@ -14,5 +14,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7623n-rfb-emmc.dtb \ mt7623n-bananapi-bpi-r2.dtb \ mt7629-rfb.dtb \ + mt8127-amazon-ford.dtb \ mt8127-moose.dtb \ mt8135-evbp1.dtb diff --git a/arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts b/arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts new file mode 100644 index 000000000000..4b138e832795 --- /dev/null +++ b/arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 + +/dts-v1/; +#include "mt8127.dtsi" + +/ { + model = "Amazon Fire 7 2015 (Ford)"; + compatible = "amazon,ford", "mediatek,mt8127"; + chassis-type = "tablet"; + + aliases { + serial0 = &uart0; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + stdout-path = "serial0:921600n8"; + + framebuffer0: framebuffer@b7a00000 { + compatible = "simple-framebuffer"; + memory-region = <&framebuffer_reserved>; + width = <1024>; + height = <600>; + stride = <(1024 * 2)>; + format = "r5g6b5"; + }; + }; + + memory@80000000 { + device_type = "memory"; + reg = <0 0x80000000 0 0x40000000>; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + framebuffer_reserved: framebuffer@b7a00000 { + reg = <0 0xb7a00000 0 0x1000000>; + no-map; + }; + }; +}; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/mediatek/mt8127.dtsi b/arch/arm/boot/dts/mediatek/mt8127.dtsi index bd61ec7e70c0..9bdf55d2da47 100644 --- a/arch/arm/boot/dts/mediatek/mt8127.dtsi +++ b/arch/arm/boot/dts/mediatek/mt8127.dtsi @@ -99,6 +99,13 @@ compatible = "simple-bus"; ranges; + watchdog: watchdog@10007000 { + compatible = "mediatek,mt8127-wdt", "mediatek,mt6589-wdt"; + reg = <0 0x10007000 0 0x100>; + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + timer: timer@10008000 { compatible = "mediatek,mt8127-timer", "mediatek,mt6577-timer"; |