The following series of patches add support for CAN in SoC's AM65, J721e
and AM64.
This patch series is dependent on [1] and [2] and I have requested for an
immutable tag from the Marc Kleine-Budde(maintainer of net tree).
[1] - https://lore.kernel.org/patchwork/patch/1423048/
[2] - https://www.spinics.net/lists/linux-can/msg08108.html
changes since v1 -
- changed the message ram configuration to use the maximum value
in each field, for better performance.
Aswath Govindraju (3):
arm64: dts: ti: am654-base-board: Disable mcan nodes
arm64: dts: ti: k3-am64-main: Add support for MCAN
arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
nodes in EVM and disable them on SK
Faiz Abbas (3):
arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
arm64: dts: ti: k3-j721e: Add support for MCAN nodes
arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
nodes
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 28 +++
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 40 ++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 +
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 +++
.../arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +
.../dts/ti/k3-j721e-common-proc-board.dts | 116 +++++++++++
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 196 ++++++++++++++++++
.../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 28 +++
8 files changed, 454 insertions(+)
--
2.17.1
From: Faiz Abbas <[email protected]>
Add support for 14 MCAN controllers in main domain and 2 MCAN controllers
present in mcu domain. All the MCAN controllers support classic CAN
messages as well as CAN_FD messages.
Signed-off-by: Faiz Abbas <[email protected]>
Signed-off-by: Aswath Govindraju <[email protected]>
---
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 196 ++++++++++++++++++
.../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 28 +++
2 files changed, 224 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index cf3482376c1e..43080f62a612 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1940,4 +1940,200 @@
bus_freq = <1000000>;
};
};
+
+ main_mcan0: can@2701000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02701000 0x00 0x200>,
+ <0x00 0x02708000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 156 1>, <&k3_clks 156 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan1: can@2711000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02711000 0x00 0x200>,
+ <0x00 0x02718000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 158 1>, <&k3_clks 158 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan2: can@2721000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02721000 0x00 0x200>,
+ <0x00 0x02728000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 160 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 160 1>, <&k3_clks 160 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan3: can@2731000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02731000 0x00 0x200>,
+ <0x00 0x02738000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 161 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 161 1>, <&k3_clks 161 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan4: can@2741000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02741000 0x00 0x200>,
+ <0x00 0x02748000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 162 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 162 1>, <&k3_clks 162 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan5: can@2751000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02751000 0x00 0x200>,
+ <0x00 0x02758000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 163 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 163 1>, <&k3_clks 163 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan6: can@2761000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02761000 0x00 0x200>,
+ <0x00 0x02768000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 164 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 164 1>, <&k3_clks 164 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan7: can@2771000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02771000 0x00 0x200>,
+ <0x00 0x02778000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 165 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 165 1>, <&k3_clks 165 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan8: can@2781000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02781000 0x00 0x200>,
+ <0x00 0x02788000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 166 1>, <&k3_clks 166 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 576 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan9: can@2791000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x02791000 0x00 0x200>,
+ <0x00 0x02798000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 167 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 167 1>, <&k3_clks 167 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan10: can@27a1000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x027a1000 0x00 0x200>,
+ <0x00 0x027a8000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 168 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 168 1>, <&k3_clks 168 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan11: can@27b1000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x027b1000 0x00 0x200>,
+ <0x00 0x027b8000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 169 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 169 1>, <&k3_clks 169 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan12: can@27c1000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x027c1000 0x00 0x200>,
+ <0x00 0x027c8000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 170 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 170 1>, <&k3_clks 170 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan13: can@27d1000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x027d1000 0x00 0x200>,
+ <0x00 0x027d8000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 171 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 171 1>, <&k3_clks 171 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
};
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index d2dceda72fe9..a8dbd843b002 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -390,4 +390,32 @@
ti,loczrama = <1>;
};
};
+
+ mcu_mcan0: can@40528000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x40528000 0x00 0x200>,
+ <0x00 0x40500000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 172 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 172 1>, <&k3_clks 172 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 832 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 833 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ mcu_mcan1: can@40568000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x40568000 0x00 0x200>,
+ <0x00 0x40540000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 173 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 173 1>, <&k3_clks 173 0>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 835 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
};
--
2.17.1
From: Faiz Abbas <[email protected]>
Add Support for two MCAN controllers present on the am65x SOC. Both support
classic CAN messages as well as CAN-FD.
Signed-off-by: Faiz Abbas <[email protected]>
Signed-off-by: Aswath Govindraju <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 +++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index c93ff1520a0e..6445f2d976e8 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -159,6 +159,36 @@
};
};
+ m_can0: mcan@40528000 {
+ compatible = "bosch,m_can";
+ reg = <0x0 0x40528000 0x0 0x400>,
+ <0x0 0x40500000 0x0 0x4400>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 102 0>, <&k3_clks 102 5>;
+ clock-names = "cclk", "hclk";
+ interrupt-parent = <&gic500>;
+ interrupts = <GIC_SPI 544 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ m_can1: mcan@40568000 {
+ compatible = "bosch,m_can";
+ reg = <0x0 0x40568000 0x0 0x400>,
+ <0x0 0x40540000 0x0 0x4400>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 103 0>, <&k3_clks 103 5>;
+ clock-names = "cclk", "hclk";
+ interrupt-parent = <&gic500>;
+ interrupts = <GIC_SPI 547 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
fss: fss@47000000 {
compatible = "simple-bus";
#address-cells = <2>;
--
2.17.1
AM654 base board does not have mcan instances pinned out. Therefore,
disable all the mcan instances.
Signed-off-by: Aswath Govindraju <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index cfbcebfa37c1..9043f91c9bec 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -416,6 +416,14 @@
status = "disabled";
};
+&m_can0 {
+ status = "disabled";
+};
+
+&m_can1 {
+ status = "disabled";
+};
+
&mailbox0_cluster0 {
interrupts = <436>;
--
2.17.1
From: Faiz Abbas <[email protected]>
Add two MCAN nodes present on the common processor board and set a
maximum data rate of 5 Mbps. Disable all other nodes for now.
Signed-off-by: Faiz Abbas <[email protected]>
Signed-off-by: Aswath Govindraju <[email protected]>
---
.../dts/ti/k3-j721e-common-proc-board.dts | 116 ++++++++++++++++++
1 file changed, 116 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index 8bd02d9e28ad..d40e282325c9 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -109,6 +109,25 @@
"cpb-codec-scki",
"cpb-codec-scki-48000", "cpb-codec-scki-44100";
};
+
+ transceiver1: can-phy0 {
+ compatible = "ti,tcan1043";
+ #phy-cells = <0>;
+ max-bitrate = <5000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_mcan0_gpio_pins_default>;
+ standby-gpios = <&wkup_gpio0 54 GPIO_ACTIVE_LOW>;
+ enable-gpios = <&wkup_gpio0 0 GPIO_ACTIVE_HIGH>;
+ };
+
+ transceiver2: can-phy1 {
+ compatible = "ti,tcan1042";
+ #phy-cells = <0>;
+ max-bitrate = <5000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_mcan1_gpio_pins_default>;
+ standby-gpios = <&wkup_gpio0 2 GPIO_ACTIVE_HIGH>;
+ };
};
&main_pmx0 {
@@ -249,6 +268,33 @@
J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_MDIO0_MDIO */
>;
};
+
+ mcu_mcan0_pins_default: mcu-mcan0-pins-default {
+ pinctrl-single,pins = <
+ J721E_WKUP_IOPAD(0xac, PIN_INPUT, 0) /* (C29) MCU_MCAN0_RX */
+ J721E_WKUP_IOPAD(0xa8, PIN_OUTPUT, 0) /* (D29) MCU_MCAN0_TX */
+ >;
+ };
+
+ mcu_mcan0_gpio_pins_default: mcu-mcan0-gpio-pins-default {
+ pinctrl-single,pins = <
+ J721E_WKUP_IOPAD(0xb0, PIN_INPUT, 7) /* (F26) WKUP_GPIO0_0 */
+ J721E_WKUP_IOPAD(0x98, PIN_INPUT, 7) /* (E28) MCU_SPI0_D1.WKUP_GPIO0_54 */
+ >;
+ };
+
+ mcu_mcan1_pins_default: mcu-mcan1-pins-default {
+ pinctrl-single,pins = <
+ J721E_WKUP_IOPAD(0xc4, PIN_INPUT, 0) /* (G24) WKUP_GPIO0_5.MCU_MCAN1_RX */
+ J721E_WKUP_IOPAD(0xc0, PIN_OUTPUT, 0) /* (G25) WKUP_GPIO0_4.MCU_MCAN1_TX */
+ >;
+ };
+
+ mcu_mcan1_gpio_pins_default: mcu-mcan1-gpio-pins-default {
+ pinctrl-single,pins = <
+ J721E_WKUP_IOPAD(0xb8, PIN_INPUT, 7) /* (F28) WKUP_GPIO0_2 */
+ >;
+ };
};
&wkup_uart0 {
@@ -770,3 +816,73 @@
&icssg1_mdio {
status = "disabled";
};
+
+&mcu_mcan0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_mcan0_pins_default>;
+ phys = <&transceiver1>;
+};
+
+&mcu_mcan1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_mcan1_pins_default>;
+ phys = <&transceiver2>;
+};
+
+&main_mcan0 {
+ status = "disabled";
+};
+
+&main_mcan1 {
+ status = "disabled";
+};
+
+&main_mcan2 {
+ status = "disabled";
+};
+
+&main_mcan3 {
+ status = "disabled";
+};
+
+&main_mcan4 {
+ status = "disabled";
+};
+
+&main_mcan5 {
+ status = "disabled";
+};
+
+&main_mcan6 {
+ status = "disabled";
+};
+
+&main_mcan7 {
+ status = "disabled";
+};
+
+&main_mcan8 {
+ status = "disabled";
+};
+
+&main_mcan9 {
+ status = "disabled";
+};
+
+&main_mcan10 {
+ status = "disabled";
+};
+
+&main_mcan11 {
+ status = "disabled";
+};
+
+&main_mcan12 {
+ status = "disabled";
+};
+
+&main_mcan13 {
+ status = "disabled";
+};
--
2.17.1
Add Support for two MCAN controllers present on the am64x SOC. Both support
classic CAN messages as well as CAN-FD.
Signed-off-by: Aswath Govindraju <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 28 ++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 02c3fdf9cc46..e86f4a61c8d6 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -859,4 +859,32 @@
clock-names = "fck";
max-functions = /bits/ 8 <1>;
};
+
+ main_mcan0: can@20701000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x20701000 0x00 0x200>,
+ <0x00 0x20708000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 98 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 98 0>, <&k3_clks 98 5>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
+
+ main_mcan1: can@20711000 {
+ compatible = "bosch,m_can";
+ reg = <0x00 0x20711000 0x00 0x200>,
+ <0x00 0x20718000 0x00 0x8000>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 99 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 99 0>, <&k3_clks 99 5>;
+ clock-names = "cclk", "hclk";
+ interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ };
};
--
2.17.1
AM642 EVM has two CAN connecters brought out from the two MCAN instances in
the main domain through transceivers. Add device tree nodes for
transceivers and set the required properties in the mcan device tree nodes,
in EVM device tree file.
On AM642 SK there are no connectors brought out for CAN. Therefore, disable
the mcan device tree nodes in the SK device tree file.
Signed-off-by: Aswath Govindraju <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 40 +++++++++++++++++++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 +++++
2 files changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 030712221188..1c26ca41e6a5 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -184,6 +184,20 @@
};
};
};
+
+ transceiver1: can-phy0 {
+ compatible = "ti,tcan1042";
+ #phy-cells = <0>;
+ max-bitrate = <5000000>;
+ standby-gpios = <&exp1 8 GPIO_ACTIVE_HIGH>;
+ };
+
+ transceiver2: can-phy1 {
+ compatible = "ti,tcan1042";
+ #phy-cells = <0>;
+ max-bitrate = <5000000>;
+ standby-gpios = <&exp1 9 GPIO_ACTIVE_HIGH>;
+ };
};
&main_pmx0 {
@@ -288,6 +302,20 @@
AM64X_IOPAD(0x0008, PIN_INPUT, 0) /* (N19) OSPI0_DQS */
>;
};
+
+ main_mcan0_pins_default: main-mcan0-pins-default {
+ pinctrl-single,pins = <
+ AM64X_IOPAD(0x0254, PIN_INPUT, 0) /* (B17) MCAN0_RX */
+ AM64X_IOPAD(0x0250, PIN_OUTPUT, 0) /* (A17) MCAN0_TX */
+ >;
+ };
+
+ main_mcan1_pins_default: main-mcan1-pins-default {
+ pinctrl-single,pins = <
+ AM64X_IOPAD(0x025c, PIN_INPUT, 0) /* (D17) MCAN1_RX */
+ AM64X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (C17) MCAN1_TX */
+ >;
+ };
};
&main_uart0 {
@@ -574,3 +602,15 @@
num-lanes = <1>;
status = "disabled";
};
+
+&main_mcan0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&main_mcan0_pins_default>;
+ phys = <&transceiver1>;
+};
+
+&main_mcan1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&main_mcan1_pins_default>;
+ phys = <&transceiver2>;
+};
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index d3aa2901e6fd..15cde862f62c 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -453,3 +453,11 @@
&pcie0_ep {
status = "disabled";
};
+
+&main_mcan0 {
+ status = "disabled";
+};
+
+&main_mcan1 {
+ status = "disabled";
+};
--
2.17.1
Hi Nishanth,
On 26/07/21 3:40 pm, Aswath Govindraju wrote:
> The following series of patches add support for CAN in SoC's AM65, J721e
> and AM64.
>
> This patch series is dependent on [1] and [2] and I have requested for an
> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
Here is the tag in [0] shared by Marc after applying patches [1] and
[2], linux-can-next-for-5.15-20210725,
[0] -
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git/log/?h=linux-can-next-for-5.15-20210725
Thanks,
Aswath
>
> [1] - https://lore.kernel.org/patchwork/patch/1423048/
> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>
> changes since v1 -
> - changed the message ram configuration to use the maximum value
> in each field, for better performance.
>
> Aswath Govindraju (3):
> arm64: dts: ti: am654-base-board: Disable mcan nodes
> arm64: dts: ti: k3-am64-main: Add support for MCAN
> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
> nodes in EVM and disable them on SK
>
> Faiz Abbas (3):
> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
> nodes
>
> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 28 +++
> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 40 ++++
> arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 +
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 +++
> .../arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +
> .../dts/ti/k3-j721e-common-proc-board.dts | 116 +++++++++++
> arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 196 ++++++++++++++++++
> .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 28 +++
> 8 files changed, 454 insertions(+)
>
On 28.07.2021 10:49:58, Aswath Govindraju wrote:
> > The following series of patches add support for CAN in SoC's AM65, J721e
> > and AM64.
> >
> > This patch series is dependent on [1] and [2] and I have requested for an
> > immutable tag from the Marc Kleine-Budde(maintainer of net tree).
I'm the maintainer of the "linux-can", not the "net" tree.
> Here is the tag in [0] shared by Marc after applying patches [1] and
> [2], linux-can-next-for-5.15-20210725,
>
> [0] -
> https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git/log/?h=linux-can-next-for-5.15-20210725
That tag has been merged by David Miller into the net-next tree.
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=d20e5880fe9df149a9159673d9fec57aab43ac61
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
On 15:40-20210726, Aswath Govindraju wrote:
> The following series of patches add support for CAN in SoC's AM65, J721e
> and AM64.
>
> This patch series is dependent on [1] and [2] and I have requested for an
> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
>
> [1] - https://lore.kernel.org/patchwork/patch/1423048/
> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>
> changes since v1 -
> - changed the message ram configuration to use the maximum value
> in each field, for better performance.
>
> Aswath Govindraju (3):
> arm64: dts: ti: am654-base-board: Disable mcan nodes
> arm64: dts: ti: k3-am64-main: Add support for MCAN
> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
> nodes in EVM and disable them on SK
>
> Faiz Abbas (3):
> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
> nodes
I noticed in my checkup: https://pastebin.ubuntu.com/p/zSk39M943N/
warnings with dtbs_check, I think the bindings need a little more help
here (please also notice the iot platform warnings getting introduced).
Since we are still working on the bindings[1], lets clean that up
before we consider the dts addition. I suspect we need to cook this
more towards the next cycle.
[1] https://lore.kernel.org/patchwork/patch/1470806/
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D)/Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 26.07.2021 15:40:07, Aswath Govindraju wrote:
> From: Faiz Abbas <[email protected]>
>
> Add Support for two MCAN controllers present on the am65x SOC. Both support
> classic CAN messages as well as CAN-FD.
>
> Signed-off-by: Faiz Abbas <[email protected]>
> Signed-off-by: Aswath Govindraju <[email protected]>
> ---
> arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 +++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> index c93ff1520a0e..6445f2d976e8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
> @@ -159,6 +159,36 @@
> };
> };
>
> + m_can0: mcan@40528000 {
> + compatible = "bosch,m_can";
> + reg = <0x0 0x40528000 0x0 0x400>,
> + <0x0 0x40500000 0x0 0x4400>;
> + reg-names = "m_can", "message_ram";
> + power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
> + clocks = <&k3_clks 102 0>, <&k3_clks 102 5>;
> + clock-names = "cclk", "hclk";
The binding says the first should be hclk.
| clock-names:
| items:
| - const: hclk
| - const: cclk
Please also fix in the other dts files.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hi Jan,
On 05/08/21 6:10 pm, Jan Kiszka wrote:
> On 05.08.21 14:32, Aswath Govindraju wrote:
>> Hi,
>>
>> On 02/08/21 6:15 pm, Nishanth Menon wrote:
>>> On 15:40-20210726, Aswath Govindraju wrote:
>>>> The following series of patches add support for CAN in SoC's AM65, J721e
>>>> and AM64.
>>>>
>>>> This patch series is dependent on [1] and [2] and I have requested for an
>>>> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
>>>>
>>>> [1] - https://lore.kernel.org/patchwork/patch/1423048/
>>>> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>>>>
>>>> changes since v1 -
>>>> - changed the message ram configuration to use the maximum value
>>>> in each field, for better performance.
>>>>
>>>> Aswath Govindraju (3):
>>>> arm64: dts: ti: am654-base-board: Disable mcan nodes
>>>> arm64: dts: ti: k3-am64-main: Add support for MCAN
>>>> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
>>>> nodes in EVM and disable them on SK
>>>>
>>>> Faiz Abbas (3):
>>>> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
>>>> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
>>>> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
>>>> nodes
>>>
>>> I noticed in my checkup: https://pastebin.ubuntu.com/p/zSk39M943N/
>>> warnings with dtbs_check, I think the bindings need a little more help
>>> here (please also notice the iot platform warnings getting introduced).
>>>
>>
>> Jan,
>>
>> Can you please point me to the schematics for iot platform? Also, is CAN
>> subsystem brought out on the iot platform boards?
>
> Schematics aren't publicly available. If you have specific questions, I
> may help, though.
>
> CAN is not in use yet (not connected AFAIK).
>
Thank you for clarifying this. I will disable the CAN DT nodes in
k3-am65-iot2050-common.dtsi in my respin.
Thanks,
Aswath
> Jan
>
>>
>>> Since we are still working on the bindings[1], lets clean that up
>>> before we consider the dts addition. I suspect we need to cook this
>>> more towards the next cycle.
>>>
>>> [1] https://lore.kernel.org/patchwork/patch/1470806/
>>>
>>
>> Nishanth,
>>
>> Sorry for not taking of this earlier. I'll try to get everything ready
>> for next release.
>>
>> Thanks,
>> Aswath
>>
>
Hi,
On 02/08/21 6:15 pm, Nishanth Menon wrote:
> On 15:40-20210726, Aswath Govindraju wrote:
>> The following series of patches add support for CAN in SoC's AM65, J721e
>> and AM64.
>>
>> This patch series is dependent on [1] and [2] and I have requested for an
>> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
>>
>> [1] - https://lore.kernel.org/patchwork/patch/1423048/
>> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>>
>> changes since v1 -
>> - changed the message ram configuration to use the maximum value
>> in each field, for better performance.
>>
>> Aswath Govindraju (3):
>> arm64: dts: ti: am654-base-board: Disable mcan nodes
>> arm64: dts: ti: k3-am64-main: Add support for MCAN
>> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
>> nodes in EVM and disable them on SK
>>
>> Faiz Abbas (3):
>> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
>> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
>> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
>> nodes
>
> I noticed in my checkup: https://pastebin.ubuntu.com/p/zSk39M943N/
> warnings with dtbs_check, I think the bindings need a little more help
> here (please also notice the iot platform warnings getting introduced).
>
Jan,
Can you please point me to the schematics for iot platform? Also, is CAN
subsystem brought out on the iot platform boards?
> Since we are still working on the bindings[1], lets clean that up
> before we consider the dts addition. I suspect we need to cook this
> more towards the next cycle.
>
> [1] https://lore.kernel.org/patchwork/patch/1470806/
>
Nishanth,
Sorry for not taking of this earlier. I'll try to get everything ready
for next release.
Thanks,
Aswath
On 05.08.21 14:44, Aswath Govindraju wrote:
> Hi Jan,
>
> On 05/08/21 6:10 pm, Jan Kiszka wrote:
>> On 05.08.21 14:32, Aswath Govindraju wrote:
>>> Hi,
>>>
>>> On 02/08/21 6:15 pm, Nishanth Menon wrote:
>>>> On 15:40-20210726, Aswath Govindraju wrote:
>>>>> The following series of patches add support for CAN in SoC's AM65, J721e
>>>>> and AM64.
>>>>>
>>>>> This patch series is dependent on [1] and [2] and I have requested for an
>>>>> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
>>>>>
>>>>> [1] - https://lore.kernel.org/patchwork/patch/1423048/
>>>>> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>>>>>
>>>>> changes since v1 -
>>>>> - changed the message ram configuration to use the maximum value
>>>>> in each field, for better performance.
>>>>>
>>>>> Aswath Govindraju (3):
>>>>> arm64: dts: ti: am654-base-board: Disable mcan nodes
>>>>> arm64: dts: ti: k3-am64-main: Add support for MCAN
>>>>> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
>>>>> nodes in EVM and disable them on SK
>>>>>
>>>>> Faiz Abbas (3):
>>>>> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
>>>>> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
>>>>> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
>>>>> nodes
>>>>
>>>> I noticed in my checkup: https://pastebin.ubuntu.com/p/zSk39M943N/
>>>> warnings with dtbs_check, I think the bindings need a little more help
>>>> here (please also notice the iot platform warnings getting introduced).
>>>>
>>>
>>> Jan,
>>>
>>> Can you please point me to the schematics for iot platform? Also, is CAN
>>> subsystem brought out on the iot platform boards?
>>
>> Schematics aren't publicly available. If you have specific questions, I
>> may help, though.
>>
>> CAN is not in use yet (not connected AFAIK).
>>
>
> Thank you for clarifying this. I will disable the CAN DT nodes in
> k3-am65-iot2050-common.dtsi in my respin.
>
That is not a problem for the current design, so you can go ahead with it.
Current defconfig - though not yet upstream based - can be found at [1].
The CAN subsystem is enabled, but not the AM65x CAN driver.
Jan
[1]
https://github.com/siemens/meta-iot2050/tree/master/recipes-kernel/linux/files
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
On 05.08.21 14:32, Aswath Govindraju wrote:
> Hi,
>
> On 02/08/21 6:15 pm, Nishanth Menon wrote:
>> On 15:40-20210726, Aswath Govindraju wrote:
>>> The following series of patches add support for CAN in SoC's AM65, J721e
>>> and AM64.
>>>
>>> This patch series is dependent on [1] and [2] and I have requested for an
>>> immutable tag from the Marc Kleine-Budde(maintainer of net tree).
>>>
>>> [1] - https://lore.kernel.org/patchwork/patch/1423048/
>>> [2] - https://www.spinics.net/lists/linux-can/msg08108.html
>>>
>>> changes since v1 -
>>> - changed the message ram configuration to use the maximum value
>>> in each field, for better performance.
>>>
>>> Aswath Govindraju (3):
>>> arm64: dts: ti: am654-base-board: Disable mcan nodes
>>> arm64: dts: ti: k3-am64-main: Add support for MCAN
>>> arm64: dts: ti: k3-am642-evm/sk: Add support for main domain mcan
>>> nodes in EVM and disable them on SK
>>>
>>> Faiz Abbas (3):
>>> arm64: dts: ti: k3-am65-mcu: Add Support for MCAN
>>> arm64: dts: ti: k3-j721e: Add support for MCAN nodes
>>> arm64: dts: ti: k3-j721e-common-proc-board: Add support for mcu_mcan
>>> nodes
>>
>> I noticed in my checkup: https://pastebin.ubuntu.com/p/zSk39M943N/
>> warnings with dtbs_check, I think the bindings need a little more help
>> here (please also notice the iot platform warnings getting introduced).
>>
>
> Jan,
>
> Can you please point me to the schematics for iot platform? Also, is CAN
> subsystem brought out on the iot platform boards?
Schematics aren't publicly available. If you have specific questions, I
may help, though.
CAN is not in use yet (not connected AFAIK).
Jan
>
>> Since we are still working on the bindings[1], lets clean that up
>> before we consider the dts addition. I suspect we need to cook this
>> more towards the next cycle.
>>
>> [1] https://lore.kernel.org/patchwork/patch/1470806/
>>
>
> Nishanth,
>
> Sorry for not taking of this earlier. I'll try to get everything ready
> for next release.
>
> Thanks,
> Aswath
>
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux