diff options
| author |   Alexander Shiyan <shc_work@mail.ru> | 2018-12-23 09:03:40 +0300 |
|---|---|---|
| committer |   Shawn Guo <shawnguo@kernel.org> | 2019-01-12 11:05:30 +0800 |
| commit | 1fded78a67cb4fb371be02195369f1552a51c6ea (patch) | |
| tree | eb84ecc7fdcf31f4bcad4d75205fae02d142c9aa | |
| parent | ARM: dts: imx: Change i.MX27 interrupt controller unit name (diff) | |
| download | linux-dev-1fded78a67cb4fb371be02195369f1552a51c6ea.tar.xz linux-dev-1fded78a67cb4fb371be02195369f1552a51c6ea.zip | |
ARM: dts: i.MX51: digi-connectcore: Move RTC from SOM to JSK
In fact, the RTC battery can only be connected outside the module,
so this patch moves the PMIC RTC property and its power from SOM dts
to JSK.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts index 2967a748d859..a5010e9e343b 100644 --- a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts +++ b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts @@ -27,6 +27,18 @@ status = "okay"; }; +&pmic { + fsl,mc13xxx-uses-rtc; + + regulators { + vcoincell_reg: vcoincell { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-always-on; + }; + }; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi index 82d8df097ef1..e9421b851ad5 100644 --- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi @@ -37,7 +37,6 @@ reg = <0>; interrupt-parent = <&gpio1>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; - fsl,mc13xxx-uses-rtc; regulators { sw1_reg: sw1 { @@ -142,12 +141,6 @@ pwgt2spi_reg: pwgt2spi { regulator-always-on; }; - - vcoincell_reg: vcoincell { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-always-on; - }; }; }; }; |