diff options
-rw-r--r-- | arch/arm/plat-s5p/dev-csis0.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s5p/dev-csis1.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s5p/include/plat/mipi_csis.h (renamed from arch/arm/plat-s5p/include/plat/csis.h) | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/plat-s5p/dev-csis0.c b/arch/arm/plat-s5p/dev-csis0.c index dfab1c85f54f..e3aabef5e347 100644 --- a/arch/arm/plat-s5p/dev-csis0.c +++ b/arch/arm/plat-s5p/dev-csis0.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2010 Samsung Electronics | 2 | * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd. |
3 | * | 3 | * |
4 | * S5P series device definition for MIPI-CSIS channel 0 | 4 | * S5P series device definition for MIPI-CSIS channel 0 |
5 | * | 5 | * |
diff --git a/arch/arm/plat-s5p/dev-csis1.c b/arch/arm/plat-s5p/dev-csis1.c index e3053f27fbbf..08b91b580207 100644 --- a/arch/arm/plat-s5p/dev-csis1.c +++ b/arch/arm/plat-s5p/dev-csis1.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2010 Samsung Electronics | 2 | * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd. |
3 | * | 3 | * |
4 | * S5P series device definition for MIPI-CSIS channel 1 | 4 | * S5P series device definition for MIPI-CSIS channel 1 |
5 | * | 5 | * |
diff --git a/arch/arm/plat-s5p/include/plat/csis.h b/arch/arm/plat-s5p/include/plat/mipi_csis.h index 51e308c7981d..8b3ada88df7a 100644 --- a/arch/arm/plat-s5p/include/plat/csis.h +++ b/arch/arm/plat-s5p/include/plat/mipi_csis.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2010 Samsung Electronics | 2 | * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd. |
3 | * | 3 | * |
4 | * S5P series MIPI CSI slave device support | 4 | * S5P series MIPI CSI slave device support |
5 | * | 5 | * |
@@ -8,11 +8,11 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef PLAT_S5P_CSIS_H_ | 11 | #ifndef PLAT_S5P_MIPI_CSIS_H_ |
12 | #define PLAT_S5P_CSIS_H_ __FILE__ | 12 | #define PLAT_S5P_MIPI_CSIS_H_ __FILE__ |
13 | 13 | ||
14 | /** | 14 | /** |
15 | * struct s5p_platform_mipi_csis - platform data for MIPI-CSIS | 15 | * struct s5p_platform_mipi_csis - platform data for S5P MIPI-CSIS driver |
16 | * @clk_rate: bus clock frequency | 16 | * @clk_rate: bus clock frequency |
17 | * @lanes: number of data lanes used | 17 | * @lanes: number of data lanes used |
18 | * @alignment: data alignment in bits | 18 | * @alignment: data alignment in bits |
@@ -25,4 +25,4 @@ struct s5p_platform_mipi_csis { | |||
25 | u8 hs_settle; | 25 | u8 hs_settle; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | #endif /* PLAT_S5P_CSIS_H_ */ | 28 | #endif /* PLAT_S5P_MIPI_CSIS_H_ */ |