diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2017-07-02 13:04:25 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2017-07-02 13:04:25 +0100 |
commit | 563749e0f2f2e6e3e01296a04f28f85f58eeec47 (patch) | |
tree | d67899cd46d95092d6d66004a893cb5ede3fa45c | |
parent | dcf9506473845f900320ffbc5cc5b9200d9946da (diff) | |
download | kernel-563749e0f2f2e6e3e01296a04f28f85f58eeec47.tar.gz kernel-563749e0f2f2e6e3e01296a04f28f85f58eeec47.tar.xz kernel-563749e0f2f2e6e3e01296a04f28f85f58eeec47.zip |
minor QCom config cleanups
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC | 1 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS (renamed from baseconfig/arm/CONFIG_PHY_QCOM_USB_HS) | 0 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC (renamed from baseconfig/arm/CONFIG_PHY_QCOM_USB_HSIC) | 0 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI | 1 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
-rw-r--r-- | kernel-aarch64.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 |
14 files changed, 18 insertions, 12 deletions
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC b/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC new file mode 100644 index 000000000..b52487909 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC @@ -0,0 +1 @@ +CONFIG_EXTCON_QCOM_SPMI_MISC=m diff --git a/baseconfig/arm/CONFIG_PHY_QCOM_USB_HS b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS index 61e98f856..61e98f856 100644 --- a/baseconfig/arm/CONFIG_PHY_QCOM_USB_HS +++ b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS diff --git a/baseconfig/arm/CONFIG_PHY_QCOM_USB_HSIC b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC index 0b25aa233..0b25aa233 100644 --- a/baseconfig/arm/CONFIG_PHY_QCOM_USB_HSIC +++ b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI new file mode 100644 index 000000000..0c3fcd784 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI @@ -0,0 +1 @@ +CONFIG_USB_CHIPIDEA_ULPI=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC b/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC new file mode 100644 index 000000000..b52487909 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC @@ -0,0 +1 @@ +CONFIG_EXTCON_QCOM_SPMI_MISC=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS new file mode 100644 index 000000000..61e98f856 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS @@ -0,0 +1 @@ +CONFIG_PHY_QCOM_USB_HS=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC new file mode 100644 index 000000000..0b25aa233 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC @@ -0,0 +1 @@ +CONFIG_PHY_QCOM_USB_HSIC=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI new file mode 100644 index 000000000..0c3fcd784 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI @@ -0,0 +1 @@ +CONFIG_USB_CHIPIDEA_ULPI=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 67deecfba..e125ad2b5 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1489,7 +1489,7 @@ CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_GPIO=m CONFIG_EXTCON=m # CONFIG_EXTCON_MAX3355 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=m @@ -5714,7 +5714,7 @@ CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_ULPI=m CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c600220f1..02d90e5b8 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1479,7 +1479,7 @@ CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_GPIO=m CONFIG_EXTCON=m # CONFIG_EXTCON_MAX3355 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=m @@ -5691,7 +5691,7 @@ CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_ULPI=m CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 134cd13d7..04c29d4d9 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1603,7 +1603,7 @@ CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_MAX3355 is not set CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_PALMAS=m -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=m @@ -6230,7 +6230,7 @@ CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_ULPI=m CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index d061701c3..448ecc388 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4048,8 +4048,8 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_QCOM_USB_HS=m +# CONFIG_PHY_QCOM_USB_HSIC is not set +# CONFIG_PHY_QCOM_USB_HS is not set CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 22190420e..29d2c5e2a 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4027,8 +4027,8 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_QCOM_USB_HS=m +# CONFIG_PHY_QCOM_USB_HSIC is not set +# CONFIG_PHY_QCOM_USB_HS is not set CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index be52c3628..7e984f880 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1593,7 +1593,7 @@ CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_MAX3355 is not set CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_PALMAS=m -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=m @@ -6207,7 +6207,7 @@ CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_ULPI=m CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y |