diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/linux/platform_data/mipi-csis.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/linux/platform_data/mipi-csis.h')
| -rw-r--r-- | include/linux/platform_data/mipi-csis.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/platform_data/mipi-csis.h b/include/linux/platform_data/mipi-csis.h index bf34e17cee7f..c2fd9024717c 100644 --- a/include/linux/platform_data/mipi-csis.h +++ b/include/linux/platform_data/mipi-csis.h | |||
| @@ -25,13 +25,4 @@ struct s5p_platform_mipi_csis { | |||
| 25 | u8 hs_settle; | 25 | u8 hs_settle; |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | /** | ||
| 29 | * s5p_csis_phy_enable - global MIPI-CSI receiver D-PHY control | ||
| 30 | * @id: MIPI-CSIS harware instance index (0...1) | ||
| 31 | * @on: true to enable D-PHY and deassert its reset | ||
| 32 | * false to disable D-PHY | ||
| 33 | * @return: 0 on success, or negative error code on failure | ||
| 34 | */ | ||
| 35 | int s5p_csis_phy_enable(int id, bool on); | ||
| 36 | |||
| 37 | #endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */ | 28 | #endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */ |