diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 21:29:42 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 21:29:42 (GMT) |
| commit | f6c7017c60a71a77db094bbae878143d1774ce33 (patch) | |
| tree | 97e4276a550f3523487fc14f79d8350607218f15 /arch/arm64/boot | |
| parent | 072201624a6445b88bdbfad0fd946d16d94b938f (diff) | |
| parent | 3ea064b1e5adc263893ffdc3a11891c6d00d5e49 (diff) | |
| download | linux-f6c7017c60a71a77db094bbae878143d1774ce33.tar.xz | |
Merge tag 'v4.5-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64
Merge "ARM: mediatek: dts updates for v4.6" from Matthias Brugger:
Add nor-flash to mt8173 SoC.
Add efuse device to mt8173 SoC.
Fix power-domain issue mt8173-evb which uses older chip revision.
* tag 'v4.5-next-dts64' of https://github.com/mbgg/linux-mediatek:
ARM64: dts: Mediatek: mt8173-evb: fix access MMC fail issue
dts: arm64: Add EFUSE device node
arm64: dts: mt8173: Add nor flash node
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/mediatek/mt8173.dtsi | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts index e427f04..7453a47 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -214,6 +214,9 @@ }; &pwrap { + /* Only MT8173 E1 needs USB power domain */ + power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>; + pmic: mt6397 { compatible = "mediatek,mt6397"; interrupt-parent = <&pio>; diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index ec135ea..f4bd3c9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -277,6 +277,11 @@ reg = <0 0x10200620 0 0x20>; }; + efuse: efuse@10206000 { + compatible = "mediatek,mt8173-efuse"; + reg = <0 0x10206000 0 0x1000>; + }; + apmixedsys: clock-controller@10209000 { compatible = "mediatek,mt8173-apmixedsys"; reg = <0 0x10209000 0 0x1000>; @@ -397,6 +402,17 @@ status = "disabled"; }; + nor_flash: spi@1100d000 { + compatible = "mediatek,mt8173-nor"; + reg = <0 0x1100d000 0 0xe0>; + clocks = <&pericfg CLK_PERI_SPI>, + <&topckgen CLK_TOP_SPINFI_IFR_SEL>; + clock-names = "spi", "sf"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + i2c3: i2c@11010000 { compatible = "mediatek,mt8173-i2c"; reg = <0 0x11010000 0 0x70>, |