lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'u300' into devel

Browse Source
This commit is contained in:
Russell King
2009-09-21 16:03:13 +01:00
parent 9c5e8fecc4 ee2b805c8e
commit 59b69e27ca
16 changed files with 1056 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/amba/pl022.h
View File

@@ -136,12 +136,12 @@ enum ssp_tx_level_trig {
/**
* enum SPI Clock Phase - clock phase (Motorola SPI interface only)
* @SSP_CLK_RISING_EDGE: Receive data on rising edge
* @SSP_CLK_FALLING_EDGE: Receive data on falling edge
* @SSP_CLK_FIRST_EDGE: Receive data on first edge transition (actual direction depends on polarity)
* @SSP_CLK_SECOND_EDGE: Receive data on second edge transition (actual direction depends on polarity)
*/
enum ssp_spi_clk_phase {
SSP_CLK_RISING_EDGE,
SSP_CLK_FALLING_EDGE
SSP_CLK_FIRST_EDGE,
SSP_CLK_SECOND_EDGE
};
/**