diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
| commit | af31ff8a1496c68089c3a2ff50d45c64ec765d34 (patch) | |
| tree | 5671465bb6ba3a17b66ce04eb7fab4220c70a73b /include/dt-bindings/clock/qcom,gcc-msm8974.h | |
| parent | 535f95d0a6164c60f3c34a0864d653e016decde1 (diff) | |
| parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151008.0ll_20151008.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'include/dt-bindings/clock/qcom,gcc-msm8974.h')
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-msm8974.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/qcom,gcc-msm8974.h b/include/dt-bindings/clock/qcom,gcc-msm8974.h index 51e51c860fe6..81d32f639190 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8974.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8974.h @@ -321,4 +321,7 @@ #define GCC_SDCC1_CDCCAL_SLEEP_CLK 304 #define GCC_SDCC1_CDCCAL_FF_CLK 305 +/* gdscs */ +#define USB_HS_HSIC_GDSC 0 + #endif |