* [PATCH 0/7] s5p-fimc/mipi-csis drivers cleanup
@ 2012-09-17 10:48 Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Sylwester Nawrocki
0 siblings, 1 reply; 8+ messages in thread
From: Sylwester Nawrocki @ 2012-09-17 10:48 UTC (permalink / raw)
To: linux-arm-kernel
This series is a cleanup of s5p-fimc/mipi-csis drivers and changes required
for adding device tree support. It depends on Arnd's platform data headers
cleanup patch:
"ARM: samsung: move platform_data definitions"
git.kernel.org/?p=linux/kernel/git/arm/arm-soc.git;a=commit;h=d7243bd51b783ffd2
Sylwester Nawrocki (7):
ARM: samsung: Remove unused fields from FIMC and CSIS platform data
ARM: samsung: Change __s5p_mipi_phy_control() function signature
ARM: EXYNOS: Change MIPI-CSIS device regulator supply names
s5p-csis: Replace phy_enable platform data callback with direct call
s5p-fimc: Remove unused platform data structure fields
s5p-csis: Allow to specify pixel clock's source through platform data
s5p-csis: Change regulator supply names
arch/arm/mach-exynos/mach-nuri.c | 7 ++-----
arch/arm/mach-exynos/mach-origen.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 7 ++-----
arch/arm/plat-samsung/setup-mipiphy.c | 20 +++++++-------------
drivers/media/video/s5p-fimc/mipi-csis.c | 23 +++++++++++++----------
include/linux/platform_data/mipi-csis.h | 30 ++++++++++++------------------
include/media/s5p_fimc.h | 2 --
7 files changed, 38 insertions(+), 55 deletions(-)
--
1.7.11.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data
2012-09-17 10:48 [PATCH 0/7] s5p-fimc/mipi-csis drivers cleanup Sylwester Nawrocki
@ 2012-09-17 10:51 ` Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature Sylwester Nawrocki
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2012-09-17 10:51 UTC (permalink / raw)
To: linux-arm-kernel
The MIPI-CSI2 bus data alignment is now being derived from the media
bus pixel code, the drivers don't use the corresponding structure
fields, so remove them. Also remove the s5p_csis_phy_enable callback
which is now used directly by s5p-csis driver.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
---
arch/arm/mach-exynos/mach-nuri.c | 3 ---
arch/arm/mach-exynos/mach-universal_c210.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 667aefc..da6e7ce 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = {
static struct s5p_platform_mipi_csis mipi_csis_platdata = {
.clk_rate = 166000000UL,
.lanes = 2,
- .alignment = 32,
.hs_settle = 12,
- .phy_enable = s5p_csis_phy_enable,
};
#define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
.bus_type = FIMC_MIPI_CSI2,
.board_info = &m5mols_board_info,
.clk_frequency = 24000000UL,
- .csi_data_align = 32,
},
};
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 3056fa7..0b0a2d0 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -944,9 +944,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = {
static struct s5p_platform_mipi_csis mipi_csis_platdata = {
.clk_rate = 166000000UL,
.lanes = 2,
- .alignment = 32,
.hs_settle = 12,
- .phy_enable = s5p_csis_phy_enable,
};
#define GPIO_CAM_LEVEL_EN(n) EXYNOS4210_GPE4(n + 3)
@@ -1011,7 +1009,6 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
.board_info = &m5mols_board_info,
.i2c_bus_num = 0,
.clk_frequency = 24000000UL,
- .csi_data_align = 32,
},
#endif
};
--
1.7.11.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature
2012-09-17 10:51 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Sylwester Nawrocki
@ 2012-09-17 10:51 ` Sylwester Nawrocki
2012-09-17 11:06 ` Kukjin Kim
2012-09-17 10:51 ` [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names Sylwester Nawrocki
2012-09-17 11:02 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Kukjin Kim
2 siblings, 1 reply; 8+ messages in thread
From: Sylwester Nawrocki @ 2012-09-17 10:51 UTC (permalink / raw)
To: linux-arm-kernel
Replace pdev argument __s5p_mipi_phy_control() helper with plain int
so MIPI-CSIS hardware instance index can be passed directly making
the function usable on platforms instantiated from device tree.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
---
arch/arm/plat-samsung/setup-mipiphy.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/arch/arm/plat-samsung/setup-mipiphy.c b/arch/arm/plat-samsung/setup-mipiphy.c
index 683c466..1474593 100644
--- a/arch/arm/plat-samsung/setup-mipiphy.c
+++ b/arch/arm/plat-samsung/setup-mipiphy.c
@@ -14,24 +14,18 @@
#include <linux/spinlock.h>
#include <mach/regs-clock.h>
-static int __s5p_mipi_phy_control(struct platform_device *pdev,
- bool on, u32 reset)
+static int __s5p_mipi_phy_control(int id, bool on, u32 reset)
{
static DEFINE_SPINLOCK(lock);
void __iomem *addr;
unsigned long flags;
- int pid;
u32 cfg;
- if (!pdev)
+ id = max(0, id);
+ if (id > 1)
return -EINVAL;
- pid = (pdev->id == -1) ? 0 : pdev->id;
-
- if (pid != 0 && pid != 1)
- return -EINVAL;
-
- addr = S5P_MIPI_DPHY_CONTROL(pid);
+ addr = S5P_MIPI_DPHY_CONTROL(id);
spin_lock_irqsave(&lock, flags);
@@ -52,12 +46,12 @@ static int __s5p_mipi_phy_control(struct platform_device *pdev,
return 0;
}
-int s5p_csis_phy_enable(struct platform_device *pdev, bool on)
+int s5p_csis_phy_enable(int id, bool on)
{
- return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_SRESETN);
+ return __s5p_mipi_phy_control(id, on, S5P_MIPI_DPHY_SRESETN);
}
int s5p_dsim_phy_enable(struct platform_device *pdev, bool on)
{
- return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_MRESETN);
+ return __s5p_mipi_phy_control(pdev->id, on, S5P_MIPI_DPHY_MRESETN);
}
--
1.7.11.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names
2012-09-17 10:51 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature Sylwester Nawrocki
@ 2012-09-17 10:51 ` Sylwester Nawrocki
2012-09-17 11:07 ` Kukjin Kim
2012-09-17 11:02 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Kukjin Kim
2 siblings, 1 reply; 8+ messages in thread
From: Sylwester Nawrocki @ 2012-09-17 10:51 UTC (permalink / raw)
To: linux-arm-kernel
Rename MIPI-CSIS regulator supply names to match definitions in
the driver after commit "s5p-csis: Change regulator supply names".
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-origen.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index da6e7ce..bfe6955 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = {
};
static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {
REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */
- REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+ REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
};
static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {
- REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+ REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
};
static struct regulator_consumer_supply __initdata max8997_ldo5_[] = {
REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 65ac45b..b58bbca 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -96,12 +96,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = {
};
static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
- REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+ REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
};
static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
- REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+ REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
};
static struct regulator_consumer_supply __initdata ldo7_consumer[] = {
REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 0b0a2d0..ac00757 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -211,7 +211,7 @@ static struct regulator_consumer_supply lp3974_ldo3_consumer[] = {
REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
- REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
+ REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"),
};
static struct regulator_init_data lp3974_ldo3_data = {
@@ -275,7 +275,7 @@ static struct regulator_init_data lp3974_ldo6_data = {
};
static struct regulator_consumer_supply lp3974_ldo7_consumer[] = {
- REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"),
+ REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"),
};
static struct regulator_init_data lp3974_ldo7_data = {
--
1.7.11.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data
2012-09-17 10:51 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names Sylwester Nawrocki
@ 2012-09-17 11:02 ` Kukjin Kim
2012-09-17 11:24 ` Sylwester Nawrocki
2 siblings, 1 reply; 8+ messages in thread
From: Kukjin Kim @ 2012-09-17 11:02 UTC (permalink / raw)
To: linux-arm-kernel
Sylwester Nawrocki wrote:
>
> The MIPI-CSI2 bus data alignment is now being derived from the media
> bus pixel code, the drivers don't use the corresponding structure
> fields, so remove them. Also remove the s5p_csis_phy_enable callback
> which is now used directly by s5p-csis driver.
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
Acked-by: Kukjin Kim <kgene.kim@samsung•com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> ---
> arch/arm/mach-exynos/mach-nuri.c | 3 ---
> arch/arm/mach-exynos/mach-universal_c210.c | 3 ---
> 2 files changed, 6 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-
> nuri.c
> index 667aefc..da6e7ce 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev
> = {
> static struct s5p_platform_mipi_csis mipi_csis_platdata = {
> .clk_rate = 166000000UL,
> .lanes = 2,
> - .alignment = 32,
> .hs_settle = 12,
> - .phy_enable = s5p_csis_phy_enable,
> };
>
> #define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */
> @@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info
nuri_camera_sensors[]
> = {
> .bus_type = FIMC_MIPI_CSI2,
> .board_info = &m5mols_board_info,
> .clk_frequency = 24000000UL,
> - .csi_data_align = 32,
> },
> };
>
> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-
> exynos/mach-universal_c210.c
> index 3056fa7..0b0a2d0 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -944,9 +944,7 @@ static struct platform_device cam_s_if_fixed_reg_dev =
> {
> static struct s5p_platform_mipi_csis mipi_csis_platdata = {
> .clk_rate = 166000000UL,
> .lanes = 2,
> - .alignment = 32,
> .hs_settle = 12,
> - .phy_enable = s5p_csis_phy_enable,
> };
>
> #define GPIO_CAM_LEVEL_EN(n) EXYNOS4210_GPE4(n + 3)
> @@ -1011,7 +1009,6 @@ static struct s5p_fimc_isp_info
> universal_camera_sensors[] = {
> .board_info = &m5mols_board_info,
> .i2c_bus_num = 0,
> .clk_frequency = 24000000UL,
> - .csi_data_align = 32,
> },
> #endif
> };
> --
> 1.7.11.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature
2012-09-17 10:51 ` [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature Sylwester Nawrocki
@ 2012-09-17 11:06 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2012-09-17 11:06 UTC (permalink / raw)
To: linux-arm-kernel
Sylwester Nawrocki wrote:
>
> Replace pdev argument __s5p_mipi_phy_control() helper with plain int
> so MIPI-CSIS hardware instance index can be passed directly making
> the function usable on platforms instantiated from device tree.
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
Acked-by: Kukjin <kgene.kim@samsung•com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> ---
> arch/arm/plat-samsung/setup-mipiphy.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/plat-samsung/setup-mipiphy.c b/arch/arm/plat-
> samsung/setup-mipiphy.c
> index 683c466..1474593 100644
> --- a/arch/arm/plat-samsung/setup-mipiphy.c
> +++ b/arch/arm/plat-samsung/setup-mipiphy.c
> @@ -14,24 +14,18 @@
> #include <linux/spinlock.h>
> #include <mach/regs-clock.h>
>
> -static int __s5p_mipi_phy_control(struct platform_device *pdev,
> - bool on, u32 reset)
> +static int __s5p_mipi_phy_control(int id, bool on, u32 reset)
> {
> static DEFINE_SPINLOCK(lock);
> void __iomem *addr;
> unsigned long flags;
> - int pid;
> u32 cfg;
>
> - if (!pdev)
> + id = max(0, id);
> + if (id > 1)
> return -EINVAL;
>
> - pid = (pdev->id == -1) ? 0 : pdev->id;
> -
> - if (pid != 0 && pid != 1)
> - return -EINVAL;
> -
> - addr = S5P_MIPI_DPHY_CONTROL(pid);
> + addr = S5P_MIPI_DPHY_CONTROL(id);
>
> spin_lock_irqsave(&lock, flags);
>
> @@ -52,12 +46,12 @@ static int __s5p_mipi_phy_control(struct
> platform_device *pdev,
> return 0;
> }
>
> -int s5p_csis_phy_enable(struct platform_device *pdev, bool on)
> +int s5p_csis_phy_enable(int id, bool on)
> {
> - return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_SRESETN);
> + return __s5p_mipi_phy_control(id, on, S5P_MIPI_DPHY_SRESETN);
> }
>
> int s5p_dsim_phy_enable(struct platform_device *pdev, bool on)
> {
> - return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_MRESETN);
> + return __s5p_mipi_phy_control(pdev->id, on, S5P_MIPI_DPHY_MRESETN);
> }
> --
> 1.7.11.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names
2012-09-17 10:51 ` [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names Sylwester Nawrocki
@ 2012-09-17 11:07 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2012-09-17 11:07 UTC (permalink / raw)
To: linux-arm-kernel
Sylwester Nawrocki wrote:
>
> Rename MIPI-CSIS regulator supply names to match definitions in
> the driver after commit "s5p-csis: Change regulator supply names".
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
Acked-by: Kukjin Kim <kgene.kim@samsung•com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> ---
> arch/arm/mach-exynos/mach-nuri.c | 4 ++--
> arch/arm/mach-exynos/mach-origen.c | 4 ++--
> arch/arm/mach-exynos/mach-universal_c210.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-
> nuri.c
> index da6e7ce..bfe6955 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata
> max8997_ldo1_[] = {
> };
> static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {
> REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */
> - REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
> + REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
> };
> static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {
> - REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
> + REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
> };
> static struct regulator_consumer_supply __initdata max8997_ldo5_[] = {
> REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */
> diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-
> exynos/mach-origen.c
> index 65ac45b..b58bbca 100644
> --- a/arch/arm/mach-exynos/mach-origen.c
> +++ b/arch/arm/mach-exynos/mach-origen.c
> @@ -96,12 +96,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[]
> __initdata = {
> };
>
> static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
> - REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
> + REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
> REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
> REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
> };
> static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
> - REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
> + REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
> };
> static struct regulator_consumer_supply __initdata ldo7_consumer[] = {
> REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */
> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-
> exynos/mach-universal_c210.c
> index 0b0a2d0..ac00757 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -211,7 +211,7 @@ static struct regulator_consumer_supply
> lp3974_ldo3_consumer[] = {
> REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
> REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
> REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
> - REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
> + REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"),
> };
>
> static struct regulator_init_data lp3974_ldo3_data = {
> @@ -275,7 +275,7 @@ static struct regulator_init_data lp3974_ldo6_data = {
> };
>
> static struct regulator_consumer_supply lp3974_ldo7_consumer[] = {
> - REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"),
> + REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"),
> };
>
> static struct regulator_init_data lp3974_ldo7_data = {
> --
> 1.7.11.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data
2012-09-17 11:02 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Kukjin Kim
@ 2012-09-17 11:24 ` Sylwester Nawrocki
0 siblings, 0 replies; 8+ messages in thread
From: Sylwester Nawrocki @ 2012-09-17 11:24 UTC (permalink / raw)
To: linux-arm-kernel
On 09/17/2012 01:02 PM, Kukjin Kim wrote:
> Sylwester Nawrocki wrote:
>>
>> The MIPI-CSI2 bus data alignment is now being derived from the media
>> bus pixel code, the drivers don't use the corresponding structure
>> fields, so remove them. Also remove the s5p_csis_phy_enable callback
>> which is now used directly by s5p-csis driver.
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung•com>
>
> Acked-by: Kukjin Kim <kgene.kim@samsung•com>
Thank you for your ack on these three first patches, I'll then ask
Mauro to push it upstream through his tree. As he usually sends
his patches out late during merge window, there should hopefully
be no merge conflicts.
Regards,
--
Sylwester Nawrocki
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-09-17 11:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 10:48 [PATCH 0/7] s5p-fimc/mipi-csis drivers cleanup Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Sylwester Nawrocki
2012-09-17 10:51 ` [PATCH 2/7] ARM: samsung: Change __s5p_mipi_phy_control() function signature Sylwester Nawrocki
2012-09-17 11:06 ` Kukjin Kim
2012-09-17 10:51 ` [PATCH 3/7] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names Sylwester Nawrocki
2012-09-17 11:07 ` Kukjin Kim
2012-09-17 11:02 ` [PATCH 1/7] ARM: samsung: Remove unused fields from FIMC and CSIS platform data Kukjin Kim
2012-09-17 11:24 ` Sylwester Nawrocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox