diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2018-01-24 10:26:12 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:32 +0100 |
| commit | 41ef3fad976e68175d9b087b1d072aac7183a906 (patch) | |
| tree | 30b7092f0753bd38bdf017d45c6b1da9de4dc8a6 | |
| parent | 383c5b192f16f362e2cdc5e46581022ed66c5382 (diff) | |
ARM: dts: imx7-colibri: add alias for RTC and disable SNVS powerkey
The SNVS subnodes reenable the power key which is not used on the
Colibri iMX7 modules. Disable the power key again.
Also make sure that the priority of the RTCs used is defined.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 9070901b6a0e..c1b444cd8aa6 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -41,6 +41,11 @@ */ / { + aliases { + rtc0 = &rtc; + rtc1 = &snvs_rtc; + }; + chosen { stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index cb45cd873edc..2e3d1cfe9a39 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -291,6 +291,10 @@ status = "okay"; }; +&snvs_pwrkey { + status = "disabled"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1 &pinctrl_uart1_ctrl2>; |