AAUTO-1401 Car image type support has been added for imx95-19x19-evk …

…board. Device trees for Car image type and imx95-evk board has been added.
nxp-imx · Aug 6, 2024 · e8422ec · e8422ec
1 parent a6a87ed
commit e8422ec
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 11 deletions.
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
@@ -525,12 +525,18 @@ dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-verdin-ox03c10.dtb
 imx95-19x19-evk-it6263-lvds0-dtbs := imx95-19x19-evk.dtb imx95-19x19-evk-it6263-lvds0.dtbo
 dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-it6263-lvds0.dtb
 
-imx95-19x19-evk-car2-dtbs := imx95-19x19-evk.dtb \
-                             imx95-19x19-evk-it6263-lvds0.dtbo \
-                             imx95-19x19-evk-it6263-lvds1.dtbo \
-                             imx95-19x19-evk-cs42888.dtbo \
-                             imx95-19x19-evk-car2.dtbo
-dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-car2.dtb
+imx95-19x19-evk-car-adv7535-dtbs := imx95-19x19-evk-rpmsg-car.dtb \
+				    imx95-19x19-evk-adv7535.dtbo \
+				    imx95-19x19-evk-cs42888.dtbo \
+				    imx95-19x19-evk-car.dtbo
+dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-car-adv7535.dtb
+
+imx95-19x19-evk-car-adv7535-it6263-lvds1-dtbs := imx95-19x19-evk-rpmsg-car.dtb \
+						 imx95-19x19-evk-adv7535.dtbo \
+						 imx95-19x19-evk-it6263-lvds1.dtbo \
+						 imx95-19x19-evk-cs42888.dtbo \
+						 imx95-19x19-evk-car.dtbo
+dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-car-adv7535-it6263-lvds1.dtb
 
 imx95-19x19-evk-car2-adv7535-dtbs := imx95-19x19-evk.dtb \
                              imx95-19x19-evk-adv7535.dtbo \

diff --git a/arch/arm64/boot/dts/freescale/imx95-19x19-evk-car.dtso b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-car.dtso
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2024 NXP
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/clock/fsl,imx95-clock.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "imx95-pinfunc.h"
+
+&{/} {
+	reserved-memory {
+		m7_framebuffer_reserved: m7@8e000000 {
+			no-map;
+			reg = <0 0x8e000000 0 0x2000000>;
+		};
+	};
+};
+
+&vehicle_core {
+	status = "okay";
+};
+
+&vehicle_rpmsg_m7 {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/imx95-19x19-evk-rpmsg-car.dts b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-rpmsg-car.dts
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2024 NXP
+ */
+
+#include "imx95-19x19-evk.dts"
+
+/delete-node/ &lpi2c4;
+
+/ {
+	aliases {
+		i2c3 = &i2c_rpbus_1;
+	};
+
+	reserved-memory {
+		m7_reserved: m7@80000000 {
+			no-map;
+			reg = <0 0x80000000 0 0x1000000>;
+		};
+	};
+
+	i2c_rpbus_1: i2c-rpbus-1 {
+		compatible = "fsl,i2c-rpbus-v2";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "okay";
+
+		wm8962: codec@1a {
+			compatible = "wlf,wm8962";
+			reg = <0x1a>;
+			clocks = <&scmi_clk IMX95_CLK_SAI3>;
+			DCVDD-supply = <&reg_audio_pwr>;
+			DBVDD-supply = <&reg_audio_pwr>;
+			AVDD-supply = <&reg_audio_pwr>;
+			CPVDD-supply = <&reg_audio_pwr>;
+			MICVDD-supply = <&reg_audio_pwr>;
+			PLLVDD-supply = <&reg_audio_pwr>;
+			SPKVDD1-supply = <&reg_audio_pwr>;
+			SPKVDD2-supply = <&reg_audio_pwr>;
+			gpio-cfg = <
+				0x0000 /* 0:Default */
+				0x0000 /* 1:Default */
+				0x0000 /* 2:FN_DMICCLK */
+				0x0000 /* 3:Default */
+				0x0000 /* 4:FN_DMICCDAT */
+				0x0000 /* 5:Default */
+			>;
+		};
+
+		i2c4_gpio_expander_21: i2c4-gpio-expander@21 {
+			compatible = "nxp,pcal6408";
+			#gpio-cells = <2>;
+			gpio-controller;
+			reg = <0x21>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+			interrupt-parent = <&gpio2>;
+			interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c4_pcal6408>;
+			vcc-supply = <&reg_3p3v>;
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -612,10 +612,10 @@
 	};
 
 	/*
-	 * vehicle M4 driver which can get info from MCU.
+	 * vehicle M7 driver which can get info from MCU.
 	 */
-	vehicle_rpmsg_m4: vehicle_rpmsg_m4 {
-		compatible = "nxp,imx-vehicle-m4";
+	vehicle_rpmsg_m7: vehicle_rpmsg_m7 {
+		compatible = "nxp,imx-vehicle-m7";
 		status = "disabled";
 	};
 

diff --git a/drivers/mxc/vehicle/vehicle_rpmsg_m4.c b/drivers/mxc/vehicle/vehicle_rpmsg_m4.c
@@ -510,6 +510,7 @@ const struct of_device_id of_shared_match_table[] = {
 	{ .compatible = "simple-bus", },
 	{} /* Empty terminated list */
 };
+
 static void notice_evs_released(struct rpmsg_device *rpdev)
 {
 	struct device_node *dev_node, *shared_node;
@@ -829,14 +830,15 @@ static int vehicle_mcu_remove(struct platform_device *pdev)
 
 static const struct of_device_id imx_vehicle_mcu_id[] = {
 	{ .compatible = "nxp,imx-vehicle-m4", },
+	{ .compatible = "nxp,imx-vehicle-m7", },
 	{},
 };
 
 static struct platform_driver vehicle_device_driver = {
 	.probe          = vehicle_mcu_probe,
 	.remove         = vehicle_mcu_remove,
 	.driver         =  {
-		.name   = "rpmsg-vehicle-m4",
+		.name   = "rpmsg-vehicle-m4/m7",
 		.of_match_table = imx_vehicle_mcu_id,
 	}
 };
@@ -870,4 +872,4 @@ module_exit(vehicle_mcu_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("NXP Semiconductor");
-MODULE_DESCRIPTION("VEHICLE M4 image");
+MODULE_DESCRIPTION("VEHICLE M4/M7 image");