[PATCH 0/2] ARM: SAMSUNG: Add platform data support for s5p-tv driver
s5p-tv driver in 3.4-rc1 makes device platform data mandatory. This patchset adds the related platform data in plat-samsung. Tushar Behera (2): ARM: SAMSUNG: Add API to set platform data for s5p-tv driver ARM: EXYNOS: Set HDMI platform data in Origen board arch/arm/mach-exynos/mach-origen.c|7 +++ arch/arm/plat-samsung/devs.c | 25 + arch/arm/plat-samsung/include/plat/hdmi.h | 16 3 files changed, 48 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h -- 1.7.4.1 -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] ARM: SAMSUNG: Add API to set platform data for s5p-tv driver
Commit 350f2f4dad64 ([media] v4l: s5p-tv: hdmi: add support for
platform data) makes the presence of platform data mandatory for s5p-tv
driver. Adding an API to plat-samsung for this purpose.
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/plat-samsung/devs.c | 25 +
arch/arm/plat-samsung/include/plat/hdmi.h | 16
2 files changed, 41 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 8b928f9..0ac3884 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -31,6 +31,8 @@
#include linux/ioport.h
#include linux/platform_data/s3c-hsudc.h
+#include media/s5p_hdmi.h
+
#include asm/irq.h
#include asm/pmu.h
#include asm/mach/arch.h
@@ -770,6 +772,29 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct
s3c2410_platform_i2c *pd)
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
s5p_device_i2c_hdmiphy);
}
+
+struct s5p_hdmi_platform_data s5p_hdmi_def_platdata;
+
+void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+ struct i2c_board_info *mhl_info, int mhl_bus)
+{
+ struct s5p_hdmi_platform_data *pd = s5p_hdmi_def_platdata;
+
+ if (soc_is_exynos4210())
+ pd-hdmiphy_bus = 8;
+ else if (soc_is_s5pv210())
+ pd-hdmiphy_bus = 3;
+ else
+ pd-hdmiphy_bus = 0;
+
+ pd-hdmiphy_info = hdmiphy_info;
+ pd-mhl_info = mhl_info;
+ pd-mhl_bus = mhl_bus;
+
+ s3c_set_platdata(pd, sizeof(struct s5p_hdmi_platform_data),
+ s5p_device_hdmi);
+}
+
#endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
/* I2S */
diff --git a/arch/arm/plat-samsung/include/plat/hdmi.h
b/arch/arm/plat-samsung/include/plat/hdmi.h
new file mode 100644
index 000..5dc7347
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/hdmi.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics Co.Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __PLAT_SAMSUNG_HDMI_H
+#define __PLAT_SAMSUNG_HDMI_H __FILE__
+
+extern void s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+ struct i2c_board_info *mhl_info, int mhl_bus);
+
+#endif /* __PLAT_SAMSUNG_HDMI_H */
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] ARM: EXYNOS: Set HDMI platform data in Origen board
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/mach-exynos/mach-origen.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index 878d4c9..ac6f78f 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -41,6 +41,7 @@
#include plat/pd.h
#include plat/fb.h
#include plat/mfc.h
+#include plat/hdmi.h
#include mach/ohci.h
#include mach/map.h
@@ -671,6 +672,11 @@ static void __init origen_bt_setup(void)
s3c_gpio_setpull(EXYNOS4_GPX2(2), S3C_GPIO_PULL_NONE);
}
+/* I2C module and id for HDMIPHY */
+static struct i2c_board_info hdmiphy_info = {
+ I2C_BOARD_INFO(hdmiphy, 0x38),
+};
+
static void s5p_tv_setup(void)
{
/* Direct HPD to HDMI chip */
@@ -718,6 +724,7 @@ static void __init origen_machine_init(void)
s5p_tv_setup();
s5p_i2c_hdmiphy_set_platdata(NULL);
+ s5p_hdmi_set_platdata(hdmiphy_info, NULL, 0);
s5p_fimd0_set_platdata(origen_lcd_pdata);
--
1.7.4.1
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: SAMSUNG: Add API to set platform data for s5p-tv driver
Hi Tushbar Behera,
On 04/05/2012 10:24 AM, Tushar Behera wrote:
Commit 350f2f4dad64 ([media] v4l: s5p-tv: hdmi: add support for
platform data) makes the presence of platform data mandatory for s5p-tv
driver. Adding an API to plat-samsung for this purpose.
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/plat-samsung/devs.c | 25 +
arch/arm/plat-samsung/include/plat/hdmi.h | 16
2 files changed, 41 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 8b928f9..0ac3884 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -31,6 +31,8 @@
#include linux/ioport.h
#include linux/platform_data/s3c-hsudc.h
+#include media/s5p_hdmi.h
+
#include asm/irq.h
#include asm/pmu.h
#include asm/mach/arch.h
@@ -770,6 +772,29 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct
s3c2410_platform_i2c *pd)
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
s5p_device_i2c_hdmiphy);
}
+
+struct s5p_hdmi_platform_data s5p_hdmi_def_platdata;
+
+void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+ struct i2c_board_info *mhl_info, int mhl_bus)
+{
+ struct s5p_hdmi_platform_data *pd = s5p_hdmi_def_platdata;
+
+ if (soc_is_exynos4210())
+ pd-hdmiphy_bus = 8;
I found that hdmiphy is installed on 8th controller on all probably all
chips from Exynos4*1* family not only 4210. It should be reflected here.
+ else if (soc_is_s5pv210())
+ pd-hdmiphy_bus = 3;
+ else
+ pd-hdmiphy_bus = 0;
+
+ pd-hdmiphy_info = hdmiphy_info;
+ pd-mhl_info = mhl_info;
+ pd-mhl_bus = mhl_bus;
+
+ s3c_set_platdata(pd, sizeof(struct s5p_hdmi_platform_data),
+ s5p_device_hdmi);
+}
+
#endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
/* I2S */
diff --git a/arch/arm/plat-samsung/include/plat/hdmi.h
b/arch/arm/plat-samsung/include/plat/hdmi.h
new file mode 100644
index 000..5dc7347
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/hdmi.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics Co.Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __PLAT_SAMSUNG_HDMI_H
+#define __PLAT_SAMSUNG_HDMI_H __FILE__
+
+extern void s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+ struct i2c_board_info *mhl_info, int mhl_bus);
+
+#endif /* __PLAT_SAMSUNG_HDMI_H */
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] ARM: EXYNOS: Set HDMI platform data in Origen board
Hi Tushar Behera,
On 04/05/2012 10:24 AM, Tushar Behera wrote:
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/mach-exynos/mach-origen.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index 878d4c9..ac6f78f 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -41,6 +41,7 @@
#include plat/pd.h
#include plat/fb.h
#include plat/mfc.h
+#include plat/hdmi.h
#include mach/ohci.h
#include mach/map.h
@@ -671,6 +672,11 @@ static void __init origen_bt_setup(void)
s3c_gpio_setpull(EXYNOS4_GPX2(2), S3C_GPIO_PULL_NONE);
}
+/* I2C module and id for HDMIPHY */
+static struct i2c_board_info hdmiphy_info = {
+ I2C_BOARD_INFO(hdmiphy, 0x38),
I warn you :) that the s5p-hdmiphy driver is going to use driver variant
to handle per-platform setup arrays for HDMIPHY. Refer to patch
http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/45756/focus=45757
If the mentioned patch gets merged into the mainline then the support
for HDMI will be broken on your machine.
Regards,
Tomasz Stanislawski
+};
+
static void s5p_tv_setup(void)
{
/* Direct HPD to HDMI chip */
@@ -718,6 +724,7 @@ static void __init origen_machine_init(void)
s5p_tv_setup();
s5p_i2c_hdmiphy_set_platdata(NULL);
+ s5p_hdmi_set_platdata(hdmiphy_info, NULL, 0);
s5p_fimd0_set_platdata(origen_lcd_pdata);
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] ARM: EXYNOS: Set HDMI platform data in Origen board
On 04/05/2012 03:07 PM, Tomasz Stanislawski wrote:
Hi Tushar Behera,
On 04/05/2012 10:24 AM, Tushar Behera wrote:
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/mach-exynos/mach-origen.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index 878d4c9..ac6f78f 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -41,6 +41,7 @@
#include plat/pd.h
#include plat/fb.h
#include plat/mfc.h
+#include plat/hdmi.h
#include mach/ohci.h
#include mach/map.h
@@ -671,6 +672,11 @@ static void __init origen_bt_setup(void)
s3c_gpio_setpull(EXYNOS4_GPX2(2), S3C_GPIO_PULL_NONE);
}
+/* I2C module and id for HDMIPHY */
+static struct i2c_board_info hdmiphy_info = {
+I2C_BOARD_INFO(hdmiphy, 0x38),
I warn you :) that the s5p-hdmiphy driver is going to use driver variant
to handle per-platform setup arrays for HDMIPHY. Refer to patch
http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/45756/focus=45757
If the mentioned patch gets merged into the mainline then the support
for HDMI will be broken on your machine.
Please correct me if I am wrong.
Above patch doesn't remove the usage of platform data, it is still
mandatory to pass platform data from board file. Hence I need to pass a
valid platform data structure to the driver.
With your current patch, won't it just ignore the hdmiphy_info passed
through the platform data and use driver variant to handle per-platform
setup arrays for HDMIPHY.
The reason I am worried is that the support for s5p-tv as such is broken
now because of mandatory usage of platform data. Had it not been the
case, the need for my patch won't have arised. :(
Nevertheless, what do you think is the best solution right now?
--
Tushar Behera
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: SAMSUNG: Add API to set platform data for s5p-tv driver
On 04/05/2012 02:56 PM, Tomasz Stanislawski wrote:
Hi Tushbar Behera,
On 04/05/2012 10:24 AM, Tushar Behera wrote:
Commit 350f2f4dad64 ([media] v4l: s5p-tv: hdmi: add support for
platform data) makes the presence of platform data mandatory for s5p-tv
driver. Adding an API to plat-samsung for this purpose.
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
---
arch/arm/plat-samsung/devs.c | 25 +
arch/arm/plat-samsung/include/plat/hdmi.h | 16
2 files changed, 41 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 8b928f9..0ac3884 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -31,6 +31,8 @@
#include linux/ioport.h
#include linux/platform_data/s3c-hsudc.h
+#include media/s5p_hdmi.h
+
#include asm/irq.h
#include asm/pmu.h
#include asm/mach/arch.h
@@ -770,6 +772,29 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct
s3c2410_platform_i2c *pd)
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
s5p_device_i2c_hdmiphy);
}
+
+struct s5p_hdmi_platform_data s5p_hdmi_def_platdata;
+
+void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+struct i2c_board_info *mhl_info, int mhl_bus)
+{
+struct s5p_hdmi_platform_data *pd = s5p_hdmi_def_platdata;
+
+if (soc_is_exynos4210())
+pd-hdmiphy_bus = 8;
I found that hdmiphy is installed on 8th controller on all probably all
chips from Exynos4*1* family not only 4210. It should be reflected here.
Thanks for pointing out ... I will update for other variants also.
+else if (soc_is_s5pv210())
+pd-hdmiphy_bus = 3;
+else
+pd-hdmiphy_bus = 0;
+
+pd-hdmiphy_info = hdmiphy_info;
+pd-mhl_info = mhl_info;
+pd-mhl_bus = mhl_bus;
+
+s3c_set_platdata(pd, sizeof(struct s5p_hdmi_platform_data),
+s5p_device_hdmi);
+}
+
#endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
/* I2S */
diff --git a/arch/arm/plat-samsung/include/plat/hdmi.h
b/arch/arm/plat-samsung/include/plat/hdmi.h
new file mode 100644
index 000..5dc7347
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/hdmi.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics Co.Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __PLAT_SAMSUNG_HDMI_H
+#define __PLAT_SAMSUNG_HDMI_H __FILE__
+
+extern void s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
+struct i2c_board_info *mhl_info, int mhl_bus);
+
+#endif /* __PLAT_SAMSUNG_HDMI_H */
--
Tushar Behera
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Fix compiler warning in dma.c file
On 04/03/12 01:30, Sachin Kamat wrote:
Fixes the following warning:
warning: ‘dma_dmamask’ defined but not used [-Wunused-variable]
Signed-off-by: Sachin Kamatsachin.ka...@linaro.org
---
arch/arm/mach-exynos/dma.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
index 3983abe..69aaa45 100644
--- a/arch/arm/mach-exynos/dma.c
+++ b/arch/arm/mach-exynos/dma.c
@@ -35,8 +35,6 @@
#includemach/irqs.h
#includemach/dma.h
-static u64 dma_dmamask = DMA_BIT_MASK(32);
-
static u8 exynos4210_pdma0_peri[] = {
DMACH_PCM0_RX,
DMACH_PCM0_TX,
Applied, thanks.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
On 04/03/12 15:33, Paul Gortmaker wrote: Hi, On Wed, Mar 28, 2012 at 8:14 PM, Kukjin Kimkgene@samsung.com wrote: This patch fixes missing mach-s3c24xx/common.h which has been lost when regarding s3c24xx directories merged. Just checking that the updated version of this patch is headed in for 3.4 -- we are still seeing the failure in linux-next builds and it would be nice to close out the build regressions in there as quickly as possible, since they tend to mask other regressions from being seen. Hi Paul, Yeah right and I updated it in my -next. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] Samsung fixes-1 for v3.4
Hi Arnd, Olof Please pull samsung-fixes-1 for v3.4 from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-samsung-fixes-1 They are for fix uart stuff on exynos, build warning and omission file happened during resolving merge conflict on s3c24xx. If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-samsung-fixes-1 Colin Cross (1): ARM: EXYNOS: fix CONFIG_DEBUG_LL Dima Zavin (1): ARM: EXYNOS: use chip_id reg in uncompress to select uart base phys Il Han (1): ARM: EXYNOS: fix ISO C90 warning Kukjin Kim (1): ARM: S3C24XX: fix missing common.h in mach-s3c24xx/ Sachin Kamat (1): ARM: EXYNOS: Fix compiler warning in dma.c file arch/arm/mach-exynos/common.c |3 ++- arch/arm/mach-exynos/dma.c |2 -- arch/arm/mach-exynos/include/mach/debug-macro.S |7 +++ arch/arm/mach-exynos/include/mach/uncompress.h | 17 - arch/arm/mach-s3c24xx/common.h | 18 ++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 arch/arm/mach-s3c24xx/common.h -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] exynos cpufreq fix for v3.4
On Thu, Apr 5, 2012 at 8:26 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof, Please pull fix exposure of exynos cpufreq. Now, exynos4x12-cpufreq and exynos5250-cpufreq can be selected on non-exynos stuff and it means can happen build error. I got the ack from Dave and he agreed to send this to Linus via samsung tree. So please pull this and send to upstream. If any problem, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-cpufreq-exynos-fixes Thanks, pulled. -Olof -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] Samsung fixes-1 for v3.4
On Thu, Apr 5, 2012 at 8:30 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof Please pull samsung-fixes-1 for v3.4 from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-samsung-fixes-1 They are for fix uart stuff on exynos, build warning and omission file happened during resolving merge conflict on s3c24xx. If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-samsung-fixes-1 Thanks, pulled. -Olof -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
According to commit 719a4240(mfd: Remove unused LDO supply field
from WM8994 pdata), the LDO supply field should be removed from
the initializer.
Cc: Mark Brown broo...@opensource.wolfsonmicro.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-s5pv210/mach-aquila.c |4 ++--
arch/arm/mach-s5pv210/mach-goni.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c
b/arch/arm/mach-s5pv210/mach-aquila.c
index a9ea64e..48d018f 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -484,8 +484,8 @@ static struct wm8994_pdata wm8994_platform_data = {
.gpio_defaults[8] = 0x0100,
.gpio_defaults[9] = 0x0100,
.gpio_defaults[10] = 0x0100,
- .ldo[0] = { S5PV210_MP03(6), NULL, wm8994_ldo1_data }, /* XM0FRNB_2 */
- .ldo[1] = { 0, NULL, wm8994_ldo2_data },
+ .ldo[0] = { S5PV210_MP03(6), wm8994_ldo1_data }, /* XM0FRNB_2 */
+ .ldo[1] = { 0, wm8994_ldo2_data },
};
/* GPIO I2C PMIC */
diff --git a/arch/arm/mach-s5pv210/mach-goni.c
b/arch/arm/mach-s5pv210/mach-goni.c
index 2cf5ed7..a8933de 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -674,8 +674,8 @@ static struct wm8994_pdata wm8994_platform_data = {
.gpio_defaults[8] = 0x0100,
.gpio_defaults[9] = 0x0100,
.gpio_defaults[10] = 0x0100,
- .ldo[0] = { S5PV210_MP03(6), NULL, wm8994_ldo1_data }, /* XM0FRNB_2 */
- .ldo[1] = { 0, NULL, wm8994_ldo2_data },
+ .ldo[0] = { S5PV210_MP03(6), wm8994_ldo1_data }, /* XM0FRNB_2 */
+ .ldo[1] = { 0, wm8994_ldo2_data },
};
/* GPIO I2C PMIC */
--
1.7.2.3
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Add missing definition for IRQ_I2S0
Tushar Behera wrote: This fixes following build error when sound support is selected on EXYNOS4 platform. sound/soc/samsung/idma.c: In function ‘idma_close’: sound/soc/samsung/idma.c:327:11: error: ‘IRQ_I2S0’ undeclared (first use in this function) Signed-off-by: Tushar Beheratushar.beh...@linaro.org --- arch/arm/mach-exynos/include/mach/irqs.h |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index 9bee853..591e785 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h @@ -212,6 +212,8 @@ #define IRQ_MFC EXYNOS4_IRQ_MFC #define IRQ_SDO EXYNOS4_IRQ_SDO +#define IRQ_I2S0 EXYNOS4_IRQ_I2S0 + #define IRQ_ADC EXYNOS4_IRQ_ADC0 #define IRQ_TCEXYNOS4_IRQ_PEN0 OK, will apply. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] video: s3c-fb: Add device tree support
On Fri, Mar 30, 2012 at 2:23, Thomas Abraham thomas.abra...@linaro.org wrote: Subject: [PATCH v2] video: s3c-fb: Add device tree support Add device tree based discovery support for Samsung's display controller framebuffer driver. Cc: Jingoo Han jg1@samsung.com Cc: Grant Likely grant.lik...@secretlab.ca Cc: Rob Herring rob.herr...@calxeda.com Signed-off-by: Thomas Abraham thomas.abra...@linaro.org --- .../devicetree/bindings/fb/samsung-fb.txt | 148 + drivers/video/s3c-fb.c | 230 +++- 2 files changed, 370 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/samsung-fb.txt diff --git a/Documentation/devicetree/bindings/fb/samsung-fb.txt b/Documentation/devicetree/bindings/fb/samsung-fb.txt new file mode 100644 index 000..612bd9f --- /dev/null +++ b/Documentation/devicetree/bindings/fb/samsung-fb.txt @@ -0,0 +1,148 @@ +* Samsung Display Controller Framebuffer Controller + +The display controller is used to transfer image data from memory to a +external display device such as an RGB interface LCD panel. It supports +various color formats such as rgb and yuv. It also supports multiple window +overlays. + +Required properties: + +- compatible: should be one of the following + - samsung,exynos4210-fimd: for fimd compatible with Exynos4210 fimd + - samsung,s5pv210-fimd: for fimd compatible with s5pv210 fimd + +- reg: physical base address of the controller and length of memory + mapped region. + +- interrupts: Three interrupts should be specified. The format of the + interrupt specifier depends on the interrupt controller. The interrupts + should be specified in the following order. + - VSYNC (Video Frame) interrupt + - Video FIFO level interrupt + - FIMD System Interrupt + +- gpios: The gpios used to interface with the external LCD panel. For a + panel with rgb interface, the gpio interface consists of video data + lines, HSYNC, VSYNC, Pixel Clock and Data Enable. The gpio's used for + these interface lines can be listed under this property in any order. + +- samsung,fimd-display: The fimd controller is interfaced with the a + display device such as a lcd panel. This property should specify the + phandle of the display device node. For a display device node that + represents a RGB type display interface, it is expected to specify the + video interface timing using the following properties. + + - lcd-htiming: Specifies the horizontal timing for the overlay. The +horizontal timing includes four parameters in the following order. + +- horizontal back porch (in number of lcd clocks) +- horizontal front porch (in number of lcd clocks) +- hsync pulse width (in number of lcd clocks) +- Display panels X resolution. + + - lcd-vtiming: Specifies the vertical timing for the overlay. The +vertical timing includes four parameters in the following order. + +- vertical back porch (in number of lcd lines) +- vertical front porch (in number of lcd lines) +- vsync pulse width (in number of lcd clocks) +- Y resolution. + +- Overlay/Windows: Multiple overlays/windows can be specified as child + nodes. Each window should have the following properties (optional + window properties are marked as 'optional'). + + - samsung,fimd-win-id: Specifies the window number of the fimd controller. + + - samsung,fimd-win-bpp: Specifies the bits per pixel. Two values should + be specified in the following order. +- default-bpp: bpp supported by the overlay. +- max-bpp: maximum required bpp for the overlay. + + - samsung,fimd-win-res: (OPTIONAL) Specifies the window resolution in +pixels. The resolution contains the X and Y pixel values with X being +specified first. If this property is not specified, the window +resolution is set to be equal to the display panel resolution. + + - samsung,fimd-win-virtres: (OPTIONAL) Specifies the resolution of the +virtual frame buffer for the window. The resolution contains the X +and Y resolution in pixels with value of X being the specified first. + +Optional properties: + +- samsung,fimd-vidout-rgb: Video output format is RGB. +- samsung,fimd-inv-hsync: invert hsync pulse polarity. +- samsung,fimd-inv-vsync: invert vsync pulse polarity. +- samsung,fimd-inv-vclk: invert video clock polarity. +- samsung,fimd-inv-vden: invert video enable signal polarity. +- samsung,fimd-frame-rate: Number of video frames per second. + +Example: + +The following is an example for the fimd framebuffer controller is split +into two portions. The SoC specific portion can be specified in the SoC +specific
[PATCH] ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
This patch is omitted in v2 patch of Jaecheol Lee. drivers/cpufreq/exynos5250-cpufreq.c: In function 'set_clkdiv': drivers/cpufreq/exynos5250-cpufreq.c:144: error: 'EXYNOS5_CLKDIV_STATCPU0' undeclared (first use in this function) drivers/cpufreq/exynos5250-cpufreq.c:144: error: (Each undeclared identifier is reported only once drivers/cpufreq/exynos5250-cpufreq.c:144: error: for each function it appears in.) drivers/cpufreq/exynos5250-cpufreq.c:150: error: 'EXYNOS5_CLKDIV_CPU1' undeclared (first use in this function) drivers/cpufreq/exynos5250-cpufreq.c:152: error: 'EXYNOS5_CLKDIV_STATCPU1' undeclared (first use in this function) drivers/cpufreq/exynos5250-cpufreq.c: In function 'set_apll': drivers/cpufreq/exynos5250-cpufreq.c:166: error: 'EXYNOS5_CLKMUX_STATCPU' undeclared (first use in this function) drivers/cpufreq/exynos5250-cpufreq.c:173: error: 'EXYNOS5_APLL_LOCK' undeclared (first use in this function) drivers/cpufreq/exynos5250-cpufreq.c: In function 'exynos5250_cpufreq_init': drivers/cpufreq/exynos5250-cpufreq.c:312: error: 'EXYNOS5_CLKDIV_CPU1' undeclared (first use in this function) Cc: Jaecheol Lee jc@samsung.com Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com --- arch/arm/mach-exynos/include/mach/regs-clock.h |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/regs-clock.h b/arch/arm/mach-exynos/include/mach/regs-clock.h index e141c1f..6a47d47 100644 --- a/arch/arm/mach-exynos/include/mach/regs-clock.h +++ b/arch/arm/mach-exynos/include/mach/regs-clock.h @@ -255,13 +255,18 @@ /* For EXYNOS5250 */ +#define EXYNOS5_APLL_LOCK EXYNOS_CLKREG(0x0) #define EXYNOS5_APLL_CON0 EXYNOS_CLKREG(0x00100) #define EXYNOS5_CLKSRC_CPU EXYNOS_CLKREG(0x00200) +#define EXYNOS5_CLKMUX_STATCPU EXYNOS_CLKREG(0x00400) #define EXYNOS5_CLKDIV_CPU0EXYNOS_CLKREG(0x00500) #define EXYNOS5_MPLL_CON0 EXYNOS_CLKREG(0x04100) #define EXYNOS5_CLKSRC_CORE1 EXYNOS_CLKREG(0x04204) #define EXYNOS5_CLKGATE_IP_COREEXYNOS_CLKREG(0x04900) +#define EXYNOS5_CLKDIV_CPU1EXYNOS_CLKREG(0x00504) +#define EXYNOS5_CLKDIV_STATCPU0EXYNOS_CLKREG(0x00600) +#define EXYNOS5_CLKDIV_STATCPU1EXYNOS_CLKREG(0x00604) #define EXYNOS5_CLKDIV_ACP EXYNOS_CLKREG(0x08500) -- 1.7.0.4 -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
