Merge branch 'feature/add_power_control_soc_cap' into 'master'

Add Power control specific soc capability See merge request espressif/esp-idf!22871
espressif · Mar 24, 2023 · f1084c2 · f1084c2
2 parents 089b11c + 9179456
commit f1084c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
@@ -591,7 +591,7 @@ config BT_NIMBLE_MAX_PERIODIC_ADVERTISER_LIST
 
 config BT_NIMBLE_BLE_POWER_CONTROL
     bool "Enable support for BLE Power Control"
-    depends on BT_NIMBLE_50_FEATURE_SUPPORT && (IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32H2)
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_BLE_POWER_CONTROL_SUPPORTED
     default n
     help
         Set this option to enable the Power Control feature

diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in
@@ -1206,3 +1206,7 @@ config SOC_BLE_50_SUPPORTED
 config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
     bool
     default y
+
+config SOC_BLE_POWER_CONTROL_SUPPORTED
+    bool
+    default y
diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h
@@ -496,3 +496,4 @@
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
 #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1)   /*!< Support BLE device privacy mode */
+#define SOC_BLE_POWER_CONTROL_SUPPORTED (1)    /*!< Support Bluetooth Power Control */
diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
@@ -1122,3 +1122,7 @@ config SOC_BLE_50_SUPPORTED
 config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
     bool
     default y
+
+config SOC_BLE_POWER_CONTROL_SUPPORTED
+    bool
+    default y
diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h
@@ -480,3 +480,4 @@
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
 #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1)   /*!< Support BLE device privacy mode */
+#define SOC_BLE_POWER_CONTROL_SUPPORTED (1)    /*!< Support Bluetooth Power Control */