diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 16:29:42 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 16:29:42 -0500 |
commit | f6c7017c60a71a77db094bbae878143d1774ce33 (patch) | |
tree | 97e4276a550f3523487fc14f79d8350607218f15 | |
parent | 072201624a6445b88bdbfad0fd946d16d94b938f (diff) | |
parent | 3ea064b1e5adc263893ffdc3a11891c6d00d5e49 (diff) |
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
-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 e427f04a9f45..7453a47b3047 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts | |||
@@ -214,6 +214,9 @@ | |||
214 | }; | 214 | }; |
215 | 215 | ||
216 | &pwrap { | 216 | &pwrap { |
217 | /* Only MT8173 E1 needs USB power domain */ | ||
218 | power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>; | ||
219 | |||
217 | pmic: mt6397 { | 220 | pmic: mt6397 { |
218 | compatible = "mediatek,mt6397"; | 221 | compatible = "mediatek,mt6397"; |
219 | interrupt-parent = <&pio>; | 222 | interrupt-parent = <&pio>; |
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index ec135eae31f5..f4bd3c9182ad 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi | |||
@@ -277,6 +277,11 @@ | |||
277 | reg = <0 0x10200620 0 0x20>; | 277 | reg = <0 0x10200620 0 0x20>; |
278 | }; | 278 | }; |
279 | 279 | ||
280 | efuse: efuse@10206000 { | ||
281 | compatible = "mediatek,mt8173-efuse"; | ||
282 | reg = <0 0x10206000 0 0x1000>; | ||
283 | }; | ||
284 | |||
280 | apmixedsys: clock-controller@10209000 { | 285 | apmixedsys: clock-controller@10209000 { |
281 | compatible = "mediatek,mt8173-apmixedsys"; | 286 | compatible = "mediatek,mt8173-apmixedsys"; |
282 | reg = <0 0x10209000 0 0x1000>; | 287 | reg = <0 0x10209000 0 0x1000>; |
@@ -397,6 +402,17 @@ | |||
397 | status = "disabled"; | 402 | status = "disabled"; |
398 | }; | 403 | }; |
399 | 404 | ||
405 | nor_flash: spi@1100d000 { | ||
406 | compatible = "mediatek,mt8173-nor"; | ||
407 | reg = <0 0x1100d000 0 0xe0>; | ||
408 | clocks = <&pericfg CLK_PERI_SPI>, | ||
409 | <&topckgen CLK_TOP_SPINFI_IFR_SEL>; | ||
410 | clock-names = "spi", "sf"; | ||
411 | #address-cells = <1>; | ||
412 | #size-cells = <0>; | ||
413 | status = "disabled"; | ||
414 | }; | ||
415 | |||
400 | i2c3: i2c@11010000 { | 416 | i2c3: i2c@11010000 { |
401 | compatible = "mediatek,mt8173-i2c"; | 417 | compatible = "mediatek,mt8173-i2c"; |
402 | reg = <0 0x11010000 0 0x70>, | 418 | reg = <0 0x11010000 0 0x70>, |