drivers: sdhc: Add support for Apollo510 SDIO host

fanwang-ambiq · cfriedt · commit 7ea280466b6b · 2025-07-31T17:16:12.000-04:00
This commit added support for Apollo510 SDIO host driver and
ambiq board configuration in fs_sample and disk_performance

Signed-off-by: Fan Wang &lt;fan.wang@ambiq.com&gt;
diff --git a/boards/ambiq/apollo4p_evb/apollo4p_evb.dts b/boards/ambiq/apollo4p_evb/apollo4p_evb.dts
@@ -177,11 +177,11 @@
 	pinctrl-names = "default";
 	txdelay = <0>;
 	rxdelay = <0>;
-	status = "disabled";
+	status = "okay";
 	mmc {
 		compatible = "zephyr,mmc-disk";
 		disk-name = "SD2";
-		status = "disabled";
+		status = "okay";
 	};
 };
 
diff --git a/boards/ambiq/apollo4p_evb/apollo4p_evb.yaml b/boards/ambiq/apollo4p_evb/apollo4p_evb.yaml
@@ -18,6 +18,7 @@ supported:
   - adc
   - hwinfo
   - usbd
+  - sdhc
 testing:
   ignore_tags:
     - net
diff --git a/boards/ambiq/apollo510_evb/apollo510_evb-pinctrl.dtsi b/boards/ambiq/apollo510_evb/apollo510_evb-pinctrl.dtsi
@@ -413,4 +413,78 @@
 			drive-strength = "0.5";
 		};
 	};
+
+	sdio0_default: sdio0_default {
+		group0 {
+			pinmux = <SDIF0_DAT1_P85>,
+				 <SDIF0_DAT3_P87>,
+				 <SDIF0_DAT4_P156>,
+				 <SDIF0_DAT5_P157>,
+				 <SDIF0_DAT6_P158>,
+				 <SDIF0_DAT7_P159>;
+				 drive-strength = "1.0";
+		};
+		group1 {
+			pinmux = <SDIF0_DAT0_P84>,
+				 <SDIF0_DAT2_P86>,
+				 <SDIF0_CMD_P160>,
+				 <SDIF0_CLKOUT_P88>;
+				 drive-strength = "1.0";
+				 bias-pull-up;
+				 ambiq,pull-up-ohms = <12000>;
+		};
+		group2 {
+			pinmux = <GPIO_P161>;
+				 ambiq,sdif-cdwp = <1>;
+		};
+		group3 {
+			pinmux = <GPIO_P175>;
+				 ambiq,sdif-cdwp = <2>;
+		};
+		group4 {
+			pinmux = <GPIO_P161>;
+				 ambiq,sdif-cdwp = <3>;
+		};
+		group5 {
+			pinmux = <GPIO_P175>;
+				 ambiq,sdif-cdwp = <4>;
+		};
+	};
+
+	sdio1_default: sdio1_default {
+		group0 {
+			pinmux = <SDIF1_DAT1_P126>,
+				 <SDIF1_DAT3_P128>,
+				 <SDIF1_DAT4_P130>,
+				 <SDIF1_DAT5_P131>,
+				 <SDIF1_DAT6_P132>,
+				 <SDIF1_DAT7_P133>;
+				 drive-strength = "1.0";
+		};
+		group1 {
+			pinmux = <SDIF1_DAT0_P125>,
+				 <SDIF1_DAT2_P127>,
+				 <SDIF1_CMD_P134>,
+				 <SDIF1_CLKOUT_P129>;
+				 drive-strength = "1.0";
+				 bias-pull-up;
+				 ambiq,pull-up-ohms = <12000>;
+		};
+		group2 {
+			pinmux = <GPIO_P161>;
+				 ambiq,sdif-cdwp = <1>;
+		};
+		group3 {
+			pinmux = <GPIO_P175>;
+				 ambiq,sdif-cdwp = <2>;
+		};
+		group4 {
+			pinmux = <GPIO_P161>;
+				 ambiq,sdif-cdwp = <3>;
+		};
+		group5 {
+			pinmux = <GPIO_P175>;
+				 ambiq,sdif-cdwp = <4>;
+		};
+	};
 };
diff --git a/boards/ambiq/apollo510_evb/apollo510_evb.dts b/boards/ambiq/apollo510_evb/apollo510_evb.dts
@@ -219,6 +219,27 @@
 	};
 };
 
+&sdio0 {
+	pinctrl-0 = <&sdio0_default>;
+	pinctrl-names = "default";
+	txdelay = <0>;
+	rxdelay = <0>;
+	status = "okay";
+	mmc {
+		compatible = "zephyr,mmc-disk";
+		disk-name = "SD2";
+		status = "okay";
+	};
+};
+
+&sdio1 {
+	pinctrl-0 = <&sdio1_default>;
+	pinctrl-names = "default";
+	txdelay = <9>;
+	rxdelay = <11>;
+	status = "okay";
+};
+
 zephyr_udc0: &usb {
 	vddusb33-gpios = <&gpio64_95 27 (GPIO_PULL_UP)>;
 	vddusb0p9-gpios = <&gpio64_95 26 (GPIO_PULL_UP)>;
diff --git a/boards/ambiq/apollo510_evb/apollo510_evb.yaml b/boards/ambiq/apollo510_evb/apollo510_evb.yaml
@@ -22,6 +22,7 @@ supported:
   - pdm
   - i2s
   - mspi
+  - sdhc
 testing:
   ignore_tags:
     - net
diff --git a/dts/arm/ambiq/ambiq_apollo510.dtsi b/dts/arm/ambiq/ambiq_apollo510.dtsi
@@ -692,6 +692,28 @@
 			#io-channel-cells = <1>;
 		};
 
+		sdio0: sdio@SDIO0_BASE_NAME {
+			compatible = "ambiq,sdio";
+			reg = <SDIO0_REG_BASE SDIO0_REG_SIZE>;
+			interrupts = <26 0>;
+			max-bus-freq = <96000000>;
+			min-bus-freq = <375000>;
+			power-delay-ms = <50>;
+			status = "disabled";
+			zephyr,pm-device-runtime-auto;
+		};
+
+		sdio1: sdio@SDIO1_BASE_NAME {
+			compatible = "ambiq,sdio";
+			reg = <SDIO1_REG_BASE SDIO1_REG_SIZE>;
+			interrupts = <84 0>;
+			max-bus-freq = <96000000>;
+			min-bus-freq = <375000>;
+			power-delay-ms = <50>;
+			status = "disabled";
+			zephyr,pm-device-runtime-auto;
+		};
+
 		pinctrl: pin-controller@GPIO_BASE_NAME {
 			compatible = "ambiq,apollo5-pinctrl";
 			reg = <GPIO_REG_BASE GPIO_REG_SIZE>;
diff --git a/samples/subsys/fs/fs_sample/boards/apollo4p_evb.conf b/samples/subsys/fs/fs_sample/boards/apollo4p_evb.conf
@@ -1,7 +1,4 @@
-CONFIG_DISK_DRIVER_MMC=y
 CONFIG_MMC_STACK=y
-CONFIG_SDHC=y
-CONFIG_MMC_SUBSYS=y
 
 CONFIG_MAIN_STACK_SIZE=8192
 CONFIG_IDLE_STACK_SIZE=4096
diff --git a/samples/subsys/fs/fs_sample/boards/apollo4p_evb.overlay b/samples/subsys/fs/fs_sample/boards/apollo4p_evb.overlay
diff --git a/samples/subsys/fs/fs_sample/boards/apollo510_evb.conf b/samples/subsys/fs/fs_sample/boards/apollo510_evb.conf
@@ -0,0 +1,5 @@
+CONFIG_MMC_STACK=y
+
+CONFIG_MAIN_STACK_SIZE=8192
+CONFIG_IDLE_STACK_SIZE=4096
+CONFIG_AMBIQ_SDIO_ASYNC=y
diff --git a/soc/ambiq/apollo5x/soc.c b/soc/ambiq/apollo5x/soc.c
@@ -57,6 +57,10 @@ void soc_early_init_hook(void)
 
 	/* Enable Dcache */
 	sys_cache_data_enable();
+
+#ifdef CONFIG_CORTEX_M_DWT
+	am_hal_pwrctrl_periph_enable(AM_HAL_PWRCTRL_PERIPH_DEBUG);
+#endif
 }
 
 #if CONFIG_CACHE_MANAGEMENT
diff --git a/tests/drivers/disk/disk_performance/boards/apollo4p_evb.conf b/tests/drivers/disk/disk_performance/boards/apollo4p_evb.conf
@@ -0,0 +1,8 @@
+CONFIG_MMC_STACK=y
+
+CONFIG_MAIN_STACK_SIZE=8192
+CONFIG_IDLE_STACK_SIZE=4096
+CONFIG_AMBIQ_SDIO_ASYNC=y
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
diff --git a/tests/drivers/disk/disk_performance/boards/apollo510_evb.conf b/tests/drivers/disk/disk_performance/boards/apollo510_evb.conf
@@ -0,0 +1,5 @@
+CONFIG_MMC_STACK=y
+
+CONFIG_MAIN_STACK_SIZE=8192
+CONFIG_IDLE_STACK_SIZE=4096
+CONFIG_AMBIQ_SDIO_ASYNC=y

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ void soc_early_init_hook(void)`
`57`	`57`
`58`	`58`	`/* Enable Dcache */`
`59`	`59`	`sys_cache_data_enable();`
	`60`	`+`
	`61`	`+#ifdef CONFIG_CORTEX_M_DWT`
	`62`	`+ am_hal_pwrctrl_periph_enable(AM_HAL_PWRCTRL_PERIPH_DEBUG);`
	`63`	`+#endif`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`#if CONFIG_CACHE_MANAGEMENT`