[v1] arm64: dts: ti: k3-am62: Add MCU MCAN

[PATCH v1 2/2] arm64: dts: ti: k3-am625-verdin: enable CAN_2

Posted by Francesco Dolcini 2 years, 6 months ago

From: Hiago De Franco <hiago.franco@toradex.com>

Add Verdin CAN_2 (TI AM62 MCU_MCAN0) and enable it on the Yavia,
Dahlia and Verdin Development board.

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
 .../boot/dts/ti/k3-am62-verdin-dahlia.dtsi    |  5 +++++
 .../arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi |  5 +++++
 .../boot/dts/ti/k3-am62-verdin-yavia.dtsi     |  5 +++++
 arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi    | 19 +++++++++++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
index 3abd8d1d6761..33c8f6ffaa30 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
@@ -115,6 +115,11 @@ &mcu_i2c0 {
 	status = "okay";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+	status = "okay";
+};
+
 /* Verdin UART_4 */
 &mcu_uart0 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi
index 846caee7dfa4..8205081fda33 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi
@@ -144,6 +144,11 @@ &mcu_i2c0 {
 	status = "okay";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+	status = "okay";
+};
+
 /* Verdin UART_4 */
 &mcu_uart0 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi
index cb11d6e7f525..c685df7deaee 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi
@@ -167,6 +167,11 @@ &mcu_i2c0 {
 	status = "okay";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+	status = "okay";
+};
+
 /* Verdin UART_4 */
 &mcu_uart0 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
index 57dd061911ab..12dd1d64eac9 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
@@ -19,6 +19,8 @@ chosen {
 	};
 
 	aliases {
+		can0 = &main_mcan0;
+		can1 = &mcu_mcan0;
 		ethernet0 = &cpsw_port1;
 		ethernet1 = &cpsw_port2;
 		i2c0 = &main_i2c0;
@@ -732,6 +734,14 @@ AM62X_MCU_IOPAD(0x0048, PIN_INPUT, 0) /* (D10) MCU_I2C0_SDA */ /* SODIMM 57 */
 		>;
 	};
 
+	/* Verdin CAN_2 */
+	pinctrl_mcu_mcan0: mcu-mcan0-default-pins {
+		pinctrl-single,pins = <
+			AM62X_MCU_IOPAD(0x0038, PIN_INPUT,  0) /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
+			AM62X_MCU_IOPAD(0x0034, PIN_OUTPUT, 0) /* (D6) MCU_MCAN0_TX */ /* SODIMM 24 */
+		>;
+	};
+
 	/* Verdin UART_4 - Reserved to Cortex-M4 */
 	pinctrl_mcu_uart0: mcu-uart0-default-pins {
 		pinctrl-single,pins = <
@@ -1238,8 +1248,6 @@ &main_mcan0 {
 	status = "disabled";
 };
 
-/* Verdin CAN_2 - Reserved to Cortex-M4 */
-
 /* Verdin SPI_1 */
 &main_spi1 {
 	pinctrl-names = "default";
@@ -1333,6 +1341,13 @@ &mcu_gpio0 {
 		"";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_mcu_mcan0>;
+	status = "disabled";
+};
+
 /* Verdin UART_4 - Cortex-M4 UART */
 &mcu_uart0 {
 	pinctrl-names = "default";
-- 
2.25.1

Re: [PATCH v1 2/2] arm64: dts: ti: k3-am625-verdin: enable CAN_2

Posted by Nishanth Menon 2 years, 6 months ago

On 15:36-20230724, Francesco Dolcini wrote:
[...]

> +	/* Verdin CAN_2 */
> +	pinctrl_mcu_mcan0: mcu-mcan0-default-pins {
> +		pinctrl-single,pins = <
> +			AM62X_MCU_IOPAD(0x0038, PIN_INPUT,  0) /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
> +			AM62X_MCU_IOPAD(0x0034, PIN_OUTPUT, 0) /* (D6) MCU_MCAN0_TX */ /* SODIMM 24 */

This is minor - I realize we already accepted this, but:
/* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
Vs
/* (B3) MCU_MCAN0_RX - SODIMM 26 */

I wonder if you'd like the second style.


-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH v1 2/2] arm64: dts: ti: k3-am625-verdin: enable CAN_2

Posted by Francesco Dolcini 2 years, 6 months ago

On Tue, Aug 01, 2023 at 10:43:25PM -0500, Nishanth Menon wrote:
> On 15:36-20230724, Francesco Dolcini wrote:
> [...]
> 
> > +	/* Verdin CAN_2 */
> > +	pinctrl_mcu_mcan0: mcu-mcan0-default-pins {
> > +		pinctrl-single,pins = <
> > +			AM62X_MCU_IOPAD(0x0038, PIN_INPUT,  0) /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
> > +			AM62X_MCU_IOPAD(0x0034, PIN_OUTPUT, 0) /* (D6) MCU_MCAN0_TX */ /* SODIMM 24 */
> 
> This is minor - I realize we already accepted this, but:
> /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
> Vs
> /* (B3) MCU_MCAN0_RX - SODIMM 26 */
> 
> I wonder if you'd like the second style.

For sure I do not like to have the file with 2 different styles, and to
me this is just a taste thingy that would not justify updating the whole
file.

I'll keep it as it is.

Francesco

Re: [PATCH v1 2/2] arm64: dts: ti: k3-am625-verdin: enable CAN_2

Posted by Nishanth Menon 2 years, 6 months ago

On 09:42-20230802, Francesco Dolcini wrote:
> On Tue, Aug 01, 2023 at 10:43:25PM -0500, Nishanth Menon wrote:
> > On 15:36-20230724, Francesco Dolcini wrote:
> > [...]
> > 
> > > +	/* Verdin CAN_2 */
> > > +	pinctrl_mcu_mcan0: mcu-mcan0-default-pins {
> > > +		pinctrl-single,pins = <
> > > +			AM62X_MCU_IOPAD(0x0038, PIN_INPUT,  0) /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
> > > +			AM62X_MCU_IOPAD(0x0034, PIN_OUTPUT, 0) /* (D6) MCU_MCAN0_TX */ /* SODIMM 24 */
> > 
> > This is minor - I realize we already accepted this, but:
> > /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
> > Vs
> > /* (B3) MCU_MCAN0_RX - SODIMM 26 */
> > 
> > I wonder if you'd like the second style.
> 
> For sure I do not like to have the file with 2 different styles, and to
> me this is just a taste thingy that would not justify updating the whole
> file.
> 
> I'll keep it as it is.

That is fine. Thanks.
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D