diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-12-22 07:07:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-22 07:07:05 -0800 |
| commit | 4aad5ae6791793514903a124a1ae9db47607a5b5 (patch) | |
| tree | bdeb5a37df382a10033c6f162e0297a28d78f466 | |
| parent | e02e9030a1d85eebdc46d3fe67240a496eb1339d (diff) | |
| parent | af73b58eff57ccb60e8d1e51bd903292e4a590f2 (diff) | |
Merge "defconfig: sa515m: Add PTP config" into LE.UM.4.1.1_rb1.11LE.UM.4.1.1-02910-sa515m
| -rw-r--r-- | arch/arm/configs/vendor/sa515m-perf_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/vendor/sa515m_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/vendor/sa515m-perf_defconfig b/arch/arm/configs/vendor/sa515m-perf_defconfig index e7983ea49239..3cdf7941c9e0 100644 --- a/arch/arm/configs/vendor/sa515m-perf_defconfig +++ b/arch/arm/configs/vendor/sa515m-perf_defconfig @@ -256,7 +256,7 @@ CONFIG_SPMI=y CONFIG_SLIMBUS=y CONFIG_PPS=y CONFIG_PPS_CLIENT_GPIO=y -# CONFIG_PTP_1588_CLOCK is not set +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_SDXPRAIRIE=y CONFIG_GPIOLIB=y diff --git a/arch/arm/configs/vendor/sa515m_defconfig b/arch/arm/configs/vendor/sa515m_defconfig index 9d13c0218a65..64966dbfdcd5 100644 --- a/arch/arm/configs/vendor/sa515m_defconfig +++ b/arch/arm/configs/vendor/sa515m_defconfig @@ -256,7 +256,7 @@ CONFIG_SPMI=y CONFIG_SLIMBUS=y CONFIG_PPS=y CONFIG_PPS_CLIENT_GPIO=y -# CONFIG_PTP_1588_CLOCK is not set +CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_SDXPRAIRIE=y CONFIG_GPIOLIB=y |