* [PATCH 2/4] ARM: dts: i.MX51: digi-connectcore: Move RTC from SOM to JSK
2018-12-23 6:03 [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Alexander Shiyan
@ 2018-12-23 6:03 ` Alexander Shiyan
2018-12-23 6:03 ` [PATCH 3/4] ARM: dts: i.MX51: imx51-digi-connectcore: Enable ESDHC1 Alexander Shiyan
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2018-12-23 6:03 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Sascha Hauer, NXP Linux Team,
Pengutronix Kernel Team, Fabio Estevam, Shawn Guo
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>
---
arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 12 ++++++++++++
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 2967a74..a5010e9 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 82d8df0..e9421b8 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;
- };
};
};
};
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] ARM: dts: i.MX51: imx51-digi-connectcore: Enable ESDHC1
2018-12-23 6:03 [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Alexander Shiyan
2018-12-23 6:03 ` [PATCH 2/4] ARM: dts: i.MX51: digi-connectcore: Move RTC from SOM to JSK Alexander Shiyan
@ 2018-12-23 6:03 ` Alexander Shiyan
2018-12-23 6:03 ` [PATCH 4/4] ARM: dts: i.MX51: digi-connectcore-som: Add support for I2C bus recovery Alexander Shiyan
2019-01-12 3:05 ` [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2018-12-23 6:03 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Sascha Hauer, NXP Linux Team,
Pengutronix Kernel Team, Fabio Estevam, Shawn Guo
This patch adds definitions for ESDHC1 for Digi Connectore SOM & JSK.
This interface can be used to boot a module.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 4 ++++
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 15 +++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
index a5010e9..a2eea58 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
@@ -21,6 +21,10 @@
};
};
+&esdhc1 {
+ status = "okay";
+};
+
&owire {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_owire>;
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index e9421b8..a2a6408 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -145,6 +145,13 @@
};
};
+&esdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc1>;
+ max-frequency = <50000000>;
+ bus-width = <1>;
+};
+
&esdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc2>;
@@ -234,6 +241,14 @@
>;
};
+ pinctrl_esdhc1: esdhc1grp {
+ fsl,pins = <
+ MX51_PAD_SD1_CLK__SD1_CLK 0x400021d5
+ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
+ MX51_PAD_SD1_DATA0__SD1_DATA0 0x400020d5
+ >;
+ };
+
pinctrl_esdhc2: esdhc2grp {
fsl,pins = <
MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] ARM: dts: i.MX51: digi-connectcore-som: Add support for I2C bus recovery
2018-12-23 6:03 [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Alexander Shiyan
2018-12-23 6:03 ` [PATCH 2/4] ARM: dts: i.MX51: digi-connectcore: Move RTC from SOM to JSK Alexander Shiyan
2018-12-23 6:03 ` [PATCH 3/4] ARM: dts: i.MX51: imx51-digi-connectcore: Enable ESDHC1 Alexander Shiyan
@ 2018-12-23 6:03 ` Alexander Shiyan
2019-01-12 3:05 ` [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2018-12-23 6:03 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Sascha Hauer, NXP Linux Team,
Pengutronix Kernel Team, Fabio Estevam, Shawn Guo
Define the required properties to enable I2C bus recovery supported by
the I2C subsystem.
This patch adds GPIO based I2C fault injector for Digi Connectcore SOM.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index a2a6408..d90ba5f 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -174,9 +174,12 @@
};
&i2c2 {
- pinctrl-names = "default";
+ pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c2>;
+ pinctrl-1 = <&pinctrl_i2c2_gpio>;
clock-frequency = <400000>;
+ scl-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ sda-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
status = "okay";
mma7455l@1d {
@@ -290,6 +293,13 @@
>;
};
+ pinctrl_i2c2_gpio: i2c2gpiogrp {
+ fsl,pins = <
+ MX51_PAD_GPIO1_2__GPIO1_2 0x400001ed
+ MX51_PAD_GPIO1_3__GPIO1_3 0x400001ed
+ >;
+ };
+
pinctrl_nfc: nfcgrp {
fsl,pins = <
MX51_PAD_NANDF_D0__NANDF_D0 0x80000000
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node
2018-12-23 6:03 [PATCH 1/4] ARM: dts: i.MX51: Add device_type to Digi ConnectCore memory node Alexander Shiyan
` (2 preceding siblings ...)
2018-12-23 6:03 ` [PATCH 4/4] ARM: dts: i.MX51: digi-connectcore-som: Add support for I2C bus recovery Alexander Shiyan
@ 2019-01-12 3:05 ` Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2019-01-12 3:05 UTC (permalink / raw)
To: Alexander Shiyan
Cc: Pengutronix Kernel Team, Fabio Estevam, Sascha Hauer,
NXP Linux Team, linux-arm-kernel
On Sun, Dec 23, 2018 at 09:03:39AM +0300, Alexander Shiyan wrote:
> The current imx51-digi-connectcore-som.dtsi lacks a 'device_type = "memory"'
> for its memory node. This patch adds it.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
It has been updated as part of Fabio's patch [1]. Applied #2 ~ #4.
Shawn
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6a9681168b83c62abfa457c709f2f4b126bd6b92
> ---
> arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
> index 5761a66..82d8df0 100644
> --- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
> +++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
> @@ -17,6 +17,7 @@
> compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";
>
> memory@90000000 {
> + device_type = "memory";
> reg = <0x90000000 0x08000000>;
> };
> };
> --
> 2.10.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread