Index: device/inoco/sb30/ProjectConfig.mk =================================================================== --- device/inoco/sb30/ProjectConfig.mk +++ device/inoco/sb30/ProjectConfig.mk @@ -205,7 +205,7 @@ MTK_BT_BLUEDROID_DUN_GW_12 = no MTK_BT_BLUEDROID_HFP_AG_17 = no MTK_BT_BLUEDROID_PLUS = yes -MTK_BT_CHIP = MTK_MT7668 +MTK_BT_CHIP = MTK_CONSYS_MT8167 MTK_BT_CUSTOM = yes MTK_BT_FM_OVER_BT_VIA_CONTROLLER = no MTK_BT_HOST_SNOOP_LOG_SUPPORT = yes @@ -280,7 +280,7 @@ MTK_CIP_SUPPORT = no MTK_CLEARMOTION_SUPPORT = no MTK_CMAS_SUPPORT = no -MTK_COMBO_CHIP = MT7668 +MTK_COMBO_CHIP = CONSYS_8167 MTK_COMBO_NAND_SUPPORT = no MTK_COMBO_PSM_RX_TH = 1600 MTK_COMBO_PSM_TX_TH = 400 @@ -382,7 +382,7 @@ MTK_FLV_PLAYBACK_SUPPORT = yes MTK_FMRADIO_APP = no MTK_FM_50KHZ_SUPPORT = no -MTK_FM_CHIP = +MTK_FM_CHIP = MT6625_FM MTK_FM_RX_AUDIO = FM_DIGITAL_INPUT MTK_FM_RX_SUPPORT = no MTK_FM_SHORT_ANTENNA_SUPPORT = no Index: kernel-4.4/arch/arm/configs/sb30_debug_defconfig =================================================================== --- kernel-4.4/arch/arm/configs/sb30_debug_defconfig +++ kernel-4.4/arch/arm/configs/sb30_debug_defconfig @@ -129,7 +129,7 @@ CONFIG_MTK_HWMON=y # CONFIG_MTK_CCCI_DEVICES is not set CONFIG_MTK_COMBO=y -CONFIG_MTK_COMBO_CHIP_MT7668=y +CONFIG_MTK_COMBO_CHIP_CONSYS_8167=y CONFIG_MTK_COMBO_BT=y CONFIG_MTK_COMBO_WIFI=y # CONFIG_MTK_WAPI_SUPPORT is not set @@ -332,7 +332,6 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MTK_EMMC_SUPPORT=y CONFIG_MMC_MTK=y -CONFIG_MMC_MTK_COMM_SDIO=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y @@ -414,3 +413,4 @@ CONFIG_V5VPERIPHERAL=y CONFIG_I2C_CHARDEV=y CONFIG_INOCO_UARTIRQ=y +CONFIG_MTK_BTIF=y Index: kernel-4.4/arch/arm/configs/sb30_defconfig =================================================================== --- kernel-4.4/arch/arm/configs/sb30_defconfig +++ kernel-4.4/arch/arm/configs/sb30_defconfig @@ -126,7 +126,7 @@ CONFIG_MTK_HWMON=y # CONFIG_MTK_CCCI_DEVICES is not set CONFIG_MTK_COMBO=y -CONFIG_MTK_COMBO_CHIP_MT7668=y +CONFIG_MTK_COMBO_CHIP_CONSYS_8167=y CONFIG_MTK_COMBO_BT=y CONFIG_MTK_COMBO_WIFI=y # CONFIG_MTK_WAPI_SUPPORT is not set @@ -323,7 +323,6 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MTK_EMMC_SUPPORT=y CONFIG_MMC_MTK=y -CONFIG_MMC_MTK_COMM_SDIO=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y @@ -393,3 +392,4 @@ CONFIG_V5VPERIPHERAL=y CONFIG_I2C_CHARDEV=y CONFIG_INOCO_UARTIRQ=y +CONFIG_MTK_BTIF=y Index: kernel-4.4/arch/arm/configs/sb30_rpi_debug_defconfig =================================================================== --- kernel-4.4/arch/arm/configs/sb30_rpi_debug_defconfig +++ kernel-4.4/arch/arm/configs/sb30_rpi_debug_defconfig @@ -129,7 +129,7 @@ CONFIG_MTK_HWMON=y # CONFIG_MTK_CCCI_DEVICES is not set CONFIG_MTK_COMBO=y -CONFIG_MTK_COMBO_CHIP_MT7668=y +CONFIG_MTK_COMBO_CHIP_CONSYS_8167=y CONFIG_MTK_COMBO_BT=y CONFIG_MTK_COMBO_WIFI=y # CONFIG_MTK_WAPI_SUPPORT is not set @@ -332,7 +332,6 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MTK_EMMC_SUPPORT=y CONFIG_MMC_MTK=y -CONFIG_MMC_MTK_COMM_SDIO=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y @@ -416,3 +415,4 @@ CONFIG_INOCO_UARTIRQ=y CONFIG_INPUT_POLLDEV=y CONFIG_TOUCHSCREEN_RPI_FT5406=y +CONFIG_MTK_BTIF=y Index: kernel-4.4/arch/arm/configs/sb30_rpi_defconfig =================================================================== --- kernel-4.4/arch/arm/configs/sb30_rpi_defconfig +++ kernel-4.4/arch/arm/configs/sb30_rpi_defconfig @@ -126,7 +126,7 @@ CONFIG_MTK_HWMON=y # CONFIG_MTK_CCCI_DEVICES is not set CONFIG_MTK_COMBO=y -CONFIG_MTK_COMBO_CHIP_MT7668=y +CONFIG_MTK_COMBO_CHIP_CONSYS_8167=y CONFIG_MTK_COMBO_BT=y CONFIG_MTK_COMBO_WIFI=y # CONFIG_MTK_WAPI_SUPPORT is not set @@ -323,7 +323,6 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MTK_EMMC_SUPPORT=y CONFIG_MMC_MTK=y -CONFIG_MMC_MTK_COMM_SDIO=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y @@ -395,3 +394,4 @@ CONFIG_INOCO_UARTIRQ=y CONFIG_INPUT_POLLDEV=y CONFIG_TOUCHSCREEN_RPI_FT5406=y +CONFIG_MTK_BTIF=y