.gitlab-ci.yml

@@ -162,6 +162,89 @@ build_linux:
     echo "OURSUITE: $OURSUITE"
     echo "REFORM_TOOLS_BRANCH: $REFORM_TOOLS_BRANCH"
 
+build_qcacld:
+  stage: build
+  dependencies:
+    - setup
+    - build_linux
+  script: |
+    apt-get --yes install --no-install-recommends gcc-aarch64-linux-gnu build-essential bison flex device-tree-compiler git ca-certificates xz-utils libssl-dev bc
+
+    # debug
+    echo "build_qcacld debug:"
+    echo "$(pwd):"
+    echo "ls -lh"
+    echo "ls -lh linux"
+
+    # find the linux debs
+    cd linux
+    LINUX_IMG_DEB=$(ls *.deb | grep -e '^linux-image-[0-9]' | grep -v '\-rt-' | head -n1)
+    LINUX_SRC_DEB=$(ls *.deb | grep -e '^linux-source-[0-9]' | head -n1)
+    LINUX_CFG_DEB=$(ls *.deb | grep -e '^linux-config-[0-9]' | head -n1)
+    cd..
+
+    echo "build_qcacld debug vars:"
+    echo "img: ${LINUX_IMG_DEB}"
+    echo "src: ${LINUX_SRC_DEB}"
+    echo "cfg: ${LINUX_CFG_DEB}"
+
+    KERNELPACKAGENAME=$(echo $LINUX_IMG_DEB | cut -d '_' -f 1)
+    KERNELVERSION=$(echo $LINUX_IMG_DEB | cut -d '_' -f 2)
+    KERNELRELEASE=${KERNELPACKAGENAME/linux-image-/}
+
+    # clone driver
+    git clone --branch binary-deb https://source.mnt.re/reform/qcacld2.git
+    cd qcacld2
+
+    # extract kernel source
+    dpkg -x "../linux/${LINUX_SRC_DEB}" ./
+    tar xfJ usr/src/linux-source-*.tar.xz
+
+    # extract kernel config
+    dpkg -x "../linux/${LINUX_CFG_DEB}" ./
+    unxz usr/src/linux-config-*/config.arm64_none_arm64.xz
+
+    # install kernel config
+    KERNSRC=$(ls linux-source-* | head -n1)
+    mv usr/src/linux-config-*/config.arm64_none_arm64 "${KERNSRC}/.config"
+
+    # prepare kernel tree
+    cd $KERNSRC
+    make -j $(nproc) ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- modules_prepare
+    cd ..
+
+    # build driver
+    KBUILD_MODPOST_WARN=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- MODNAME=qcacld2 KERNEL_SRC=${KERNSRC} make
+
+    # build debian package
+    QCAPACKAGEVERSION=$(date -u +"%Y%m%dT%H%M%SZ")
+    mkdir -p debian/opt/reform-qcacld2
+    mv qcacld2.ko "debian/opt/reform-qcacld2/qcacld2-${KERNELVERSION}.ko"
+    sed -i "s/KERNELRELEASE/$KERNELRELEASE/g" debian/DEBIAN/control
+    sed -i "s/QCAPACKAGEVERSION/$QCAPACKAGEVERSION/g" debian/DEBIAN/control
+    sed -i "s/KERNELPACKAGENAME/$KERNELPACKAGENAME/g" debian/DEBIAN/control
+    ## permissions are world writable by default in CI, fix that
+    chmod -R og-w debian
+    ls -lR debian
+    dpkg --build debian "reform-qcacld2-${KERNELRELEASE}_${QCAPACKAGEVERSION}_arm64.deb"
+
+    # build debian meta-package that tracks the latest version of the
+    # actual driver package so it is auto-upgraded together with kernel upgrades
+    # and that also includes a NeverAutoRemove snippet for /etc/apt/apt.conf.d/
+    # this package also contains the shared firmware for the drivers.
+    sed -i "s/KERNELRELEASE/$KERNELRELEASE/g" debian-meta/DEBIAN/control
+    sed -i "s/QCAPACKAGEVERSION/$QCAPACKAGEVERSION/g" debian-meta/DEBIAN/control
+    ## permissions are world writable by default in CI, fix that
+    chmod -R og-w debian-meta
+    ls -lR debian-meta
+    dpkg --build debian-meta "reform-qcacld2_${QCAPACKAGEVERSION}_arm64.deb"
+    mv *.deb ..
+    cd ..
+
+  artifacts:
+    paths:
+      - "reform-qcacld2*.deb"
+
 reprepro:
   stage: reprepro
   dependencies:
@@ -169,6 +252,7 @@ reprepro:
     - build_patched
     - build_custom
     - build_linux
+    - build_qcacld
   artifacts:
     when: always
     paths:

linux/config

@@ -6,8 +6,8 @@ CONFIG_DRM_IMX_DCSS=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_MUX_REG=m
-CONFIG_INTERCONNECT_IMX=m
-CONFIG_INTERCONNECT_IMX8MQ=m
+CONFIG_INTERCONNECT_IMX=y
+CONFIG_INTERCONNECT_IMX8MQ=y
 CONFIG_MFD_WM8994=m
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
@@ -24,15 +24,15 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 
-CONFIG_INTERCONNECT_IMX8MP=m
+CONFIG_INTERCONNECT_IMX8MP=y
 CONFIG_DRM_FSL_LDB=m
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_DRM_IMX_LCDIF=m
 CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
 CONFIG_DRM_IMX8MP_HDMI_PVI=m
 CONFIG_IMX8MM_THERMAL=m
-CONFIG_IMX7ULP_WDT=m
-CONFIG_DRM_SAMSUNG_DSIM=m
+CONFIG_IMX2_WDT=y
+CONFIG_DRM_SAMSUNG_DSIM=y
 CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY=m
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_JDI_LT070ME05000=y

linux/imx8mp-mnt-pocket-reform.dts

@@ -33,35 +33,11 @@
 			MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3	0x91
 #define GP_EQOS_RESET	<&gpio3 16 GPIO_ACTIVE_LOW>
 			MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16		0x100
-#define GPIRQ_EQOS_PHY	<&gpio3 2 IRQ_TYPE_LEVEL_LOW>
-			MX8MP_IOMUXC_NAND_CE1_B__GPIO3_IO02		0x10
+#define GPIRQ_EQOS_PHY	<&gpio3 14 IRQ_TYPE_LEVEL_LOW>
+			MX8MP_IOMUXC_NAND_DQS__GPIO3_IO14 0x10
 		>;
 	};
 
-	/*pinctrl_fec: fecgrp {
-		fsl,pins = <
-			MX8MP_IOMUXC_SAI1_RXD2__ENET1_MDC		0x0
-			MX8MP_IOMUXC_SAI1_RXD3__ENET1_MDIO		0xa0
-			MX8MP_IOMUXC_SAI1_TXD4__ENET1_RGMII_TX_CTL	0x1f
-			MX8MP_IOMUXC_SAI1_TXD5__ENET1_RGMII_TXC		0x1f
-			MX8MP_IOMUXC_SAI1_TXD0__ENET1_RGMII_TD0		0x1f
-			MX8MP_IOMUXC_SAI1_TXD1__ENET1_RGMII_TD1		0x1f
-			MX8MP_IOMUXC_SAI1_TXD2__ENET1_RGMII_TD2		0x1f
-			MX8MP_IOMUXC_SAI1_TXD3__ENET1_RGMII_TD3		0x1f
-
-			MX8MP_IOMUXC_SAI1_TXFS__ENET1_RGMII_RX_CTL	0x91
-			MX8MP_IOMUXC_SAI1_TXC__ENET1_RGMII_RXC		0x91
-			MX8MP_IOMUXC_SAI1_RXD4__ENET1_RGMII_RD0		0x91
-			MX8MP_IOMUXC_SAI1_RXD5__ENET1_RGMII_RD1		0x91
-			MX8MP_IOMUXC_SAI1_RXD6__ENET1_RGMII_RD2		0x91
-			MX8MP_IOMUXC_SAI1_RXD7__ENET1_RGMII_RD3		0x91
-#define GP_FEC_RESET	<&gpio5 8 GPIO_ACTIVE_LOW>
-			MX8MP_IOMUXC_ECSPI1_MISO__GPIO5_IO08		0x100
-#define GPIRQ_FEC_PHY	<&gpio1 7 IRQ_TYPE_LEVEL_LOW>
-			MX8MP_IOMUXC_GPIO1_IO07__GPIO1_IO07		0x10
-		>;
-	};*/
-
 	pinctrl_hog: hoggrp {
 		fsl,pins = <
 			//MX8MP_IOMUXC_NAND_DATA01__GPIO3_IO07		0x119			/* J31 */
@@ -190,7 +166,6 @@
 
 	pinctrl_sai2: sai2grp {
 		fsl,pins = <
-			/* WM8960 */
 			MX8MP_IOMUXC_SAI2_TXFS__AUDIOMIX_SAI2_TX_SYNC	0xd6
 			MX8MP_IOMUXC_SAI2_RXFS__AUDIOMIX_SAI2_RX_SYNC	0xd6
 			MX8MP_IOMUXC_SAI2_TXC__AUDIOMIX_SAI2_TX_BCLK	0xd6
@@ -201,6 +176,18 @@
 		>;
 	};
 
+	pinctrl_sai3: sai3grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC	0xd6
+			MX8MP_IOMUXC_SAI3_RXFS__AUDIOMIX_SAI3_RX_SYNC	0xd6
+			MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXC__AUDIOMIX_SAI3_RX_BCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK	0xd6
+		>;
+	};
+
 	pinctrl_pcie: pciegrp {
 		fsl,pins = <
 #define GP_PCIE_RESET	<&gpio1 11 GPIO_ACTIVE_LOW>
@@ -229,6 +216,8 @@
 			MX8MP_IOMUXC_UART1_TXD__UART1_DCE_TX	0x140
 			MX8MP_IOMUXC_UART3_RXD__UART1_DCE_CTS	0x140
 			MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS	0x140
+#define GP_BT_ENABLE	<&gpio3 9 GPIO_ACTIVE_HIGH>
+			MX8MP_IOMUXC_NAND_DATA03__GPIO3_IO09	0x119
 		>;
 	};
 
@@ -253,6 +242,12 @@
 		>;
 	};
 
+	pinctrl_usb1_vbus: usb1grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR	0x10
+		>;
+	};
+
 	pinctrl_usdhc1: usdhc1grp {
 		fsl,pins = <
 			MX8MP_IOMUXC_SD1_CLK__USDHC1_CLK	0x190
@@ -339,6 +334,7 @@
 			MX8MP_IOMUXC_NAND_CE2_B__USDHC3_DATA5	0x1d0
 			MX8MP_IOMUXC_NAND_CE3_B__USDHC3_DATA6	0x1d0
 			MX8MP_IOMUXC_NAND_CLE__USDHC3_DATA7	0x1d0
+			MX8MP_IOMUXC_NAND_CE1_B__USDHC3_STROBE	0x10
 #define GP_EMMC_RESET	<&gpio3 1 IRQ_TYPE_LEVEL_LOW>
 			MX8MP_IOMUXC_NAND_CE0_B__GPIO3_IO01	0x140
 		>;
@@ -356,6 +352,7 @@
 			MX8MP_IOMUXC_NAND_CE2_B__USDHC3_DATA5	0x1d4
 			MX8MP_IOMUXC_NAND_CE3_B__USDHC3_DATA6	0x1d4
 			MX8MP_IOMUXC_NAND_CLE__USDHC3_DATA7	0x1d4
+			MX8MP_IOMUXC_NAND_CE1_B__USDHC3_STROBE	0x14
 		>;
 	};
 
@@ -371,6 +368,7 @@
 			MX8MP_IOMUXC_NAND_CE2_B__USDHC3_DATA5	0x1d6
 			MX8MP_IOMUXC_NAND_CE3_B__USDHC3_DATA6	0x1d6
 			MX8MP_IOMUXC_NAND_CLE__USDHC3_DATA7	0x1d6
+			MX8MP_IOMUXC_NAND_CE1_B__USDHC3_STROBE	0x12
 		>;
 	};
 
@@ -476,13 +474,17 @@
 		simple-audio-card,format = "i2s";
 		simple-audio-card,frame-master = <&codec_dai>;
 		simple-audio-card,bitclock-master = <&codec_dai>;
-		//simple-audio-card,mclk-fs = <256>;
 
 		simple-audio-card,widgets =
-		"Speaker", "Speaker";
+			"Microphone", "Microphone Jack",
+			"Headphone", "Headphone Jack",
+			"Speaker", "Speaker";
 
 		simple-audio-card,routing =
-		"Speaker", "SPK";
+			"MIC1RP", "MICBIAS",
+			"MIC1RP", "Microphone Jack",
+			"Headphone Jack", "HPR",
+			"Speaker", "SPK";
 
 		cpu_dai: simple-audio-card,cpu {
 			sound-dai = <&sai2>;
@@ -493,19 +495,47 @@
 			clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1>;
 		};
 	};
+
+	sound-wwan {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "Modem";
+		simple-audio-card,format = "dsp_a";
+		simple-audio-card,frame-master = <&wwan_dai>;
+		simple-audio-card,bitclock-master = <&wwan_dai>;
+    simple-audio-card,bitclock-inversion = <&wwan_dai>;
+
+		wwan_cpu_dai: simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+		};
+
+		wwan_dai: simple-audio-card,codec {
+			sound-dai = <&wwan_codec>;
+		};
+	};
+
+	wwan_codec: sound-wwan-codec {
+		compatible = "option,gtm601";
+		#sound-dai-cells = <0>;
+	};
 };
 
 &snvs_rtc {
 	status = "disabled";
 };
 
-&uart1 { /* BT */
+&uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1>;
 	assigned-clocks = <&clk IMX8MP_CLK_UART1>;
 	assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_80M>;
 	uart-has-rtscts;
 	status = "okay";
+
+	bluetooth {
+		compatible = "qcom,qca9377-bt";
+		enable-gpios = GP_BT_ENABLE;
+		max-speed = <3000000>;
+	};
 };
 
 &uart2 {
@@ -514,18 +544,30 @@
 	status = "okay";
 };
 
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart3>;
+	assigned-clocks = <&clk IMX8MP_CLK_UART3>;
+	assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_80M>;
+	status = "okay";
+};
+
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart4>;
+	assigned-clocks = <&clk IMX8MP_CLK_UART4>;
+	assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_80M>;
+	status = "okay";
+};
+
 &usb3_0 {
 	fsl,disable-port-power-control;
-	//fsl,permanently-attached;
-	fsl,over-current-active-low;
 	status = "okay";
 };
 
 &usb3_1 {
 	fsl,disable-port-power-control;
-	//fsl,permanently-attached;
-	fsl,over-current-active-low;
-	status = "disabled";
+	status = "okay";
 };
 
 &usb3_phy0 {
@@ -533,7 +575,7 @@
 };
 
 &usb3_phy1 {
-	status = "disabled";
+	status = "okay";
 };
 
 &usb_dwc3_0 {
@@ -542,18 +584,30 @@
 };
 
 &usb_dwc3_1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb1_vbus>;
 	dr_mode = "host";
-	status = "disabled";
+	status = "okay";
 };
 
 &sai2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sai2>;
-	assigned-clocks = <&clk IMX8MP_CLK_SAI2>;
+	assigned-clocks = <&clk IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1>;
 	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
-	assigned-clock-rates = <12000000>;
+	assigned-clock-rates = <24576000>;
+	fsl,sai-mclk-direction-output;
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&sai3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai3>;
+	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <24576000>;
 	fsl,sai-mclk-direction-output;
-	//fsl,sai-asynchronous;
 	#sound-dai-cells = <0>;
 	status = "okay";
 };
@@ -725,6 +779,7 @@
 		#sound-dai-cells = <0>;
 		clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1>;
 		clock-names = "mclk";
+		ai31xx-micbias-vg = <2>;
 
 		HPVDD-supply = <&reg_main_3v3>;
 		SPRVDD-supply = <&reg_main_5v>;
@@ -769,7 +824,6 @@
 		// dcdc en is also driven by rp2040
 		// actually backlight enable
 		enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-
 		burst-mode;
 
 		port {
@@ -823,43 +877,20 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		ethphy0: ethernet-phy@4 {
-			reg = <4>;
+		// since module 2.0, this is 0. before it was 4.
+		ethphy0: ethernet-phy {
+			//reg = <0>;
 			compatible = "ethernet-phy-ieee802.3-c22";
 			at803x,hib-disabled;
 			eee-broken-1000t;
 			interrupts-extended = GPIRQ_EQOS_PHY;
-#if 0
-			reset-gpios = GP_EQOS_RESET;
-#endif
+			//reset-gpios = GP_EQOS_RESET;
 			reg-mask = <0x90>;
 		};
 	};
 };
 
-// apparently FEC can be run via SAI1 pins??
-/*&fec {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fec>;
-	phy-mode = "rgmii-id";
-	phy-handle = <&ethphy1>;
-	fsl,magic-packet;
-	status = "okay";
-
-	mdio {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		ethphy1: ethernet-phy {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			eee-broken-1000t;
-			interrupts-extended = GPIRQ_FEC_PHY;
-			reg-mask = <0x90>;
-		};
-	};
-};*/
-
-// sdcard?
+// microsd card
 &usdhc1 {
 	assigned-clocks = <&clk IMX8MP_CLK_USDHC1_ROOT>;
 	assigned-clock-rates = <400000000>;
@@ -877,19 +908,13 @@
 
 // sdio (wifi/bt qca9733)
 &usdhc2 {
-	assigned-clocks = <&clk IMX8MP_CLK_USDHC2_ROOT>;
-	assigned-clock-rates = <200000000>;
+	//assigned-clocks = <&clk IMX8MP_CLK_USDHC2_ROOT>;
+	//assigned-clock-rates = <200000000>;
 	bus-width = <4>;
-	//max-clock = <12000000>;
-	//fsl,sdio-async-interrupt-enabled; // needs patch https://www.spinics.net/lists/linux-mmc/msg65247.html
+	//max-frequency = <100000000>;
 	keep-power-in-suspend;
 	no-sd-uhs-sdr104;
-	sd-uhs-ddr50;
-	no-mmc;
-	no-sd;
-	//no-cqe;
 	non-removable;
-	cap-sdio-irq;
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc2>;
 	pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
@@ -903,8 +928,7 @@
 
 // emmc
 &usdhc3 {
-	bus-width = <4>; // FIXME was 8
-	no-mmc-hs400;
+	bus-width = <8>; // FIXME was 4
 	non-removable;
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc3>;