diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-19 04:47:30 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-19 04:47:30 -0400 |
commit | 0d4a42f6bd298e826620585e766a154ab460617a (patch) | |
tree | 406d8f7778691d858dbe3e48e4bbb10e99c0a58a /include/media/adv7343.h | |
parent | d62b4892f3d9f7dd2002e5309be10719d6805b0f (diff) | |
parent | a937536b868b8369b98967929045f1df54234323 (diff) |
Merge tag 'v3.9-rc3' into drm-intel-next-queued
Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in
commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date: Wed Feb 27 17:02:56 2013 -0800
lib/scatterlist: add simple page iterator
The merge itself is just two trivial conflicts:
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/media/adv7343.h')
-rw-r--r-- | include/media/adv7343.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/include/media/adv7343.h b/include/media/adv7343.h index d6f8a4e1a1fc..944757be49bb 100644 --- a/include/media/adv7343.h +++ b/include/media/adv7343.h | |||
@@ -20,4 +20,56 @@ | |||
20 | #define ADV7343_COMPONENT_ID (1) | 20 | #define ADV7343_COMPONENT_ID (1) |
21 | #define ADV7343_SVIDEO_ID (2) | 21 | #define ADV7343_SVIDEO_ID (2) |
22 | 22 | ||
23 | /** | ||
24 | * adv7343_power_mode - power mode configuration. | ||
25 | * @sleep_mode: on enable the current consumption is reduced to micro ampere | ||
26 | * level. All DACs and the internal PLL circuit are disabled. | ||
27 | * Registers can be read from and written in sleep mode. | ||
28 | * @pll_control: PLL and oversampling control. This control allows internal | ||
29 | * PLL 1 circuit to be powered down and the oversampling to be | ||
30 | * switched off. | ||
31 | * @dac_1: power on/off DAC 1. | ||
32 | * @dac_2: power on/off DAC 2. | ||
33 | * @dac_3: power on/off DAC 3. | ||
34 | * @dac_4: power on/off DAC 4. | ||
35 | * @dac_5: power on/off DAC 5. | ||
36 | * @dac_6: power on/off DAC 6. | ||
37 | * | ||
38 | * Power mode register (Register 0x0), for more info refer REGISTER MAP ACCESS | ||
39 | * section of datasheet[1], table 17 page no 30. | ||
40 | * | ||
41 | * [1] http://www.analog.com/static/imported-files/data_sheets/ADV7342_7343.pdf | ||
42 | */ | ||
43 | struct adv7343_power_mode { | ||
44 | bool sleep_mode; | ||
45 | bool pll_control; | ||
46 | bool dac_1; | ||
47 | bool dac_2; | ||
48 | bool dac_3; | ||
49 | bool dac_4; | ||
50 | bool dac_5; | ||
51 | bool dac_6; | ||
52 | }; | ||
53 | |||
54 | /** | ||
55 | * struct adv7343_sd_config - SD Only Output Configuration. | ||
56 | * @sd_dac_out1: Configure SD DAC Output 1. | ||
57 | * @sd_dac_out2: Configure SD DAC Output 2. | ||
58 | */ | ||
59 | struct adv7343_sd_config { | ||
60 | /* SD only Output Configuration */ | ||
61 | bool sd_dac_out1; | ||
62 | bool sd_dac_out2; | ||
63 | }; | ||
64 | |||
65 | /** | ||
66 | * struct adv7343_platform_data - Platform data values and access functions. | ||
67 | * @mode_config: Configuration for power mode. | ||
68 | * @sd_config: SD Only Configuration. | ||
69 | */ | ||
70 | struct adv7343_platform_data { | ||
71 | struct adv7343_power_mode mode_config; | ||
72 | struct adv7343_sd_config sd_config; | ||
73 | }; | ||
74 | |||
23 | #endif /* End of #ifndef ADV7343_H */ | 75 | #endif /* End of #ifndef ADV7343_H */ |