diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 12:05:17 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 12:05:17 -0400 |
| commit | 415d2b3392d7a80903e0f97f051201aa02bf20e9 (patch) | |
| tree | 47492d2386a0e7f00ef645313cb44ae4960b7e7e /include/linux/mfd/syscon | |
| parent | 4f65245f2d178b9cba48350620d76faa4a098841 (diff) | |
| parent | b8e759b8f6dab1c473c30ac12709095d0b81078e (diff) | |
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'include/linux/mfd/syscon')
| -rw-r--r-- | include/linux/mfd/syscon/exynos4-pmu.h | 21 | ||||
| -rw-r--r-- | include/linux/mfd/syscon/exynos5-pmu.h | 19 |
2 files changed, 0 insertions, 40 deletions
diff --git a/include/linux/mfd/syscon/exynos4-pmu.h b/include/linux/mfd/syscon/exynos4-pmu.h deleted file mode 100644 index 278b1b1549e9..000000000000 --- a/include/linux/mfd/syscon/exynos4-pmu.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2015 Samsung Electronics Co., Ltd. | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ | ||
| 10 | #define _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ | ||
| 11 | |||
| 12 | /* Exynos4 PMU register definitions */ | ||
| 13 | |||
| 14 | /* MIPI_PHYn_CONTROL register offset: n = 0..1 */ | ||
| 15 | #define EXYNOS4_MIPI_PHY_CONTROL(n) (0x710 + (n) * 4) | ||
| 16 | #define EXYNOS4_MIPI_PHY_ENABLE (1 << 0) | ||
| 17 | #define EXYNOS4_MIPI_PHY_SRESETN (1 << 1) | ||
| 18 | #define EXYNOS4_MIPI_PHY_MRESETN (1 << 2) | ||
| 19 | #define EXYNOS4_MIPI_PHY_RESET_MASK (3 << 1) | ||
| 20 | |||
| 21 | #endif /* _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ */ | ||
diff --git a/include/linux/mfd/syscon/exynos5-pmu.h b/include/linux/mfd/syscon/exynos5-pmu.h deleted file mode 100644 index b4942a32b81d..000000000000 --- a/include/linux/mfd/syscon/exynos5-pmu.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Exynos5 SoC series Power Management Unit (PMU) register offsets | ||
| 3 | * and bit definitions. | ||
| 4 | * | ||
| 5 | * Copyright (C) 2014 Samsung Electronics Co., Ltd. | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_ | ||
| 13 | #define _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_ | ||
| 14 | |||
| 15 | #define EXYNOS5_PHY_ENABLE BIT(0) | ||
| 16 | #define EXYNOS5_MIPI_PHY_S_RESETN BIT(1) | ||
| 17 | #define EXYNOS5_MIPI_PHY_M_RESETN BIT(2) | ||
| 18 | |||
| 19 | #endif /* _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_ */ | ||