RE: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

RE: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Arun Kumar K]

Hi Kukjin,

As suggested by you, the function exynos_fdt_find_mfc_mem() can be moved to plat-samsung.
I feel plat-samsung/s5p-dev-mfc.c would be a good place. Hope it is ok?
Also I will wrap it with #ifdef CONFIG_OF for non-dt mode.
I will post the updated patch with the suggested changes.

Regards
Arun

On Wed, Sep 26, 2012 at 7:42 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Karol Lewandowski wrote:
>>
>> On 09/22/2012 08:07 PM, Arun Kumar K wrote:
>>
>> > This patch adds device tree entry for MFC v6 in the Exynos5
>> > SoC. Makes the required changes in the clock files and adds
>> > MFC to the DT device list.
>> >
>> > Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
>> > Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
>>
>>
>> Looks good for me. FWIW, I could probably add
>>
>> Acked-by: Karol Lewandowski <k.lewandowsk@samsung.com>
>>
> Happens following build error with exynos4_defconfig because of non-DT ?
>
> arch/arm/mach-exynos/common.c: In function 'exynos_fdt_find_mfc_mem':
> arch/arm/mach-exynos/common.c:1058: error: implicit declaration of function 'of_flat_dt_is_compatible'
> arch/arm/mach-exynos/common.c:1061: error: implicit declaration of function 'of_get_flat_dt_prop'
> arch/arm/mach-exynos/common.c:1061: warning: assignment makes pointer from integer without a cast
> arch/arm/mach-exynos/common.c:1064: error: implicit declaration of function 'of_read_ulong'
> arch/arm/mach-exynos/common.c:1066: warning: assignment makes pointer from integer without a cast
> arch/arm/mach-exynos/common.c:1071: warning: assignment makes pointer from integer without a cast
> arch/arm/mach-exynos/common.c:1076: warning: assignment makes pointer from integer without a cast
> make[1]: *** [arch/arm/mach-exynos/common.o] Error 1
>
> And I think, firstly we could move the function exynos_fdt_find_mfc_mem() into plat-samsung/ for using on other Samsung stuff such as s5pv210 and need to enclose '#ifdef CONFIG_OF" for non-DT?
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Arun Kumar K]

Hi Tomasz,

> Maybe the base address and size could be merged into one property with two
> values, as it is done with the reg property? What do you think?
>
>> +     codec@11000000 {
>> +             samsung,mfc-r = <0x43000000>;
>> +             samsung,mfc-r-size = <8388608>;
>> +             samsung,mfc-l = <0x51000000>;
>> +             samsung,mfc-l-size = <8388608>;
>
> It would look like this:
>
>                 samsung-mfc-r = <0x43000000 0x800000>;
>                 samsung-mfc-l = <0x51000000 0x800000>;
>

Thanks for the suggestion. It sure looks better this way.
I will include this change and post updated patch.

Regards
Arun

Re: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Tomasz Figa]

Hi Arun,

A little nitpick inline.

On Saturday 22 of September 2012 23:37:17 Arun Kumar K wrote:
> This patch adds device tree entry for MFC v6 in the Exynos5
> SoC. Makes the required changes in the clock files and adds
> MFC to the DT device list.
> 
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> ---
>  .../devicetree/bindings/media/s5p-mfc.txt          |   27 ++++++++++++++
> arch/arm/boot/dts/exynos5250-smdk5250.dts          |    7 ++++
> arch/arm/boot/dts/exynos5250.dtsi                  |    6 +++
>  arch/arm/mach-exynos/Kconfig                       |    1 +
>  arch/arm/mach-exynos/clock-exynos5.c               |    2 +-
>  arch/arm/mach-exynos/common.c                      |   37
> ++++++++++++++++++++ arch/arm/mach-exynos/common.h                     
> |   10 +++++ arch/arm/mach-exynos/mach-exynos5-dt.c             |   16
> ++++++++ 8 files changed, 105 insertions(+), 1 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
> 
> diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt
> b/Documentation/devicetree/bindings/media/s5p-mfc.txt new file mode
> 100644
> index 0000000..f95e775
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
> @@ -0,0 +1,27 @@
> +* Samsung Multi Format Codec (MFC)
> +
> +Multi Format Codec (MFC) is the IP present in Samsung SoCs which
> +supports high resolution decoding and encoding functionalities.
> +The MFC device driver is a v4l2 driver which can encode/decode
> +video raw/elementary streams and has support for all popular
> +video codecs.
> +
> +Required properties:
> +  - compatible : value should be either one among the following
> +	(a) "samsung,mfc-v5" for MFC v5 present in Exynos4 SoCs
> +	(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs
> +
> +  - reg : Physical base address of the IP registers and length of memory
> +	  mapped region.
> +
> +  - interrupts : MFC interrupt number to the CPU.
> +
> +  - samsung,mfc-r : Base address of the first memory bank used by MFC
> +		    for DMA contiguous memory allocation.
> +
> +  - samsung,mfc-r-size : Size of the first memory bank.
> +
> +  - samsung,mfc-l : Base address of the second memory bank used by MFC
> +		    for DMA contiguous memory allocation.
> +
> +  - samsung,mfc-l-size : Size of the second memory bank.

Maybe the base address and size could be merged into one property with two 
values, as it is done with the reg property? What do you think?

> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 8a5e348..99890ec
> 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -109,4 +109,11 @@
>  	spi_2: spi@12d40000 {
>  		status = "disabled";
>  	};
> +
> +	codec@11000000 {
> +		samsung,mfc-r = <0x43000000>;
> +		samsung,mfc-r-size = <8388608>;
> +		samsung,mfc-l = <0x51000000>;
> +		samsung,mfc-l-size = <8388608>;

It would look like this:

		samsung-mfc-r = <0x43000000 0x800000>;
		samsung-mfc-l = <0x51000000 0x800000>;

Best regards,
Tomasz Figa

RE: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Kukjin Kim]

Karol Lewandowski wrote:
> 
> On 09/22/2012 08:07 PM, Arun Kumar K wrote:
> 
> > This patch adds device tree entry for MFC v6 in the Exynos5
> > SoC. Makes the required changes in the clock files and adds
> > MFC to the DT device list.
> >
> > Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> > Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
> 
> 
> Looks good for me. FWIW, I could probably add
> 
> Acked-by: Karol Lewandowski <k.lewandowsk@samsung.com>
> 
Happens following build error with exynos4_defconfig because of non-DT ?

arch/arm/mach-exynos/common.c: In function 'exynos_fdt_find_mfc_mem':
arch/arm/mach-exynos/common.c:1058: error: implicit declaration of function 'of_flat_dt_is_compatible'
arch/arm/mach-exynos/common.c:1061: error: implicit declaration of function 'of_get_flat_dt_prop'
arch/arm/mach-exynos/common.c:1061: warning: assignment makes pointer from integer without a cast
arch/arm/mach-exynos/common.c:1064: error: implicit declaration of function 'of_read_ulong'
arch/arm/mach-exynos/common.c:1066: warning: assignment makes pointer from integer without a cast
arch/arm/mach-exynos/common.c:1071: warning: assignment makes pointer from integer without a cast
arch/arm/mach-exynos/common.c:1076: warning: assignment makes pointer from integer without a cast
make[1]: *** [arch/arm/mach-exynos/common.o] Error 1

And I think, firstly we could move the function exynos_fdt_find_mfc_mem() into plat-samsung/ for using on other Samsung stuff such as s5pv210 and need to enclose '#ifdef CONFIG_OF" for non-DT?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: [PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Karol Lewandowski]

On 09/22/2012 08:07 PM, Arun Kumar K wrote:

> This patch adds device tree entry for MFC v6 in the Exynos5
> SoC. Makes the required changes in the clock files and adds
> MFC to the DT device list.
> 
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> Signed-off-by: Arun Kumar K <arun.kk@samsung.com>


Looks good for me. FWIW, I could probably add

Acked-by: Karol Lewandowski <k.lewandowsk@samsung.com>

Regards,
-- 
Karol Lewandowski | Samsung Poland R&D Center | Linux/Platform

[PATCH v4] ARM: EXYNOS: Add MFC device tree support

[Arun Kumar K]

This patch adds device tree entry for MFC v6 in the Exynos5
SoC. Makes the required changes in the clock files and adds
MFC to the DT device list.

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 .../devicetree/bindings/media/s5p-mfc.txt          |   27 ++++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    7 ++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 +++
 arch/arm/mach-exynos/Kconfig                       |    1 +
 arch/arm/mach-exynos/clock-exynos5.c               |    2 +-
 arch/arm/mach-exynos/common.c                      |   37 ++++++++++++++++++++
 arch/arm/mach-exynos/common.h                      |   10 +++++
 arch/arm/mach-exynos/mach-exynos5-dt.c             |   16 ++++++++
 8 files changed, 105 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt

diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
new file mode 100644
index 0000000..f95e775
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -0,0 +1,27 @@
+* Samsung Multi Format Codec (MFC)
+
+Multi Format Codec (MFC) is the IP present in Samsung SoCs which
+supports high resolution decoding and encoding functionalities.
+The MFC device driver is a v4l2 driver which can encode/decode
+video raw/elementary streams and has support for all popular
+video codecs.
+
+Required properties:
+  - compatible : value should be either one among the following
+	(a) "samsung,mfc-v5" for MFC v5 present in Exynos4 SoCs
+	(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs
+
+  - reg : Physical base address of the IP registers and length of memory
+	  mapped region.
+
+  - interrupts : MFC interrupt number to the CPU.
+
+  - samsung,mfc-r : Base address of the first memory bank used by MFC
+		    for DMA contiguous memory allocation.
+
+  - samsung,mfc-r-size : Size of the first memory bank.
+
+  - samsung,mfc-l : Base address of the second memory bank used by MFC
+		    for DMA contiguous memory allocation.
+
+  - samsung,mfc-l-size : Size of the second memory bank.
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 8a5e348..99890ec 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -109,4 +109,11 @@
 	spi_2: spi@12d40000 {
 		status = "disabled";
 	};
+
+	codec@11000000 {
+		samsung,mfc-r = <0x43000000>;
+		samsung,mfc-r-size = <8388608>;
+		samsung,mfc-l = <0x51000000>;
+		samsung,mfc-l-size = <8388608>;
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index b55794b..d2ae4ff 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -62,6 +62,12 @@
 		interrupts = <0 42 0>;
 	};
 
+	codec@11000000 {
+		compatible = "samsung,mfc-v6";
+		reg = <0x11000000 0x10000>;
+		interrupts = <0 96 0>;
+	};
+
 	rtc {
 		compatible = "samsung,s3c6410-rtc";
 		reg = <0x101E0000 0x100>;
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4372075..a0677f6 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -64,6 +64,7 @@ config SOC_EXYNOS5250
 	select SAMSUNG_DMADEV
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
+	select S5P_DEV_MFC
 	help
 	  Enable EXYNOS5250 SoC support
 
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index f3171c3..452316b 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -669,7 +669,7 @@ static struct clk exynos5_init_clocks_off[] = {
 		.ctrlbit	= (1 << 25),
 	}, {
 		.name		= "mfc",
-		.devname	= "s5p-mfc",
+		.devname	= "s5p-mfc-v6",
 		.enable		= exynos5_clk_ip_mfc_ctrl,
 		.ctrlbit	= (1 << 0),
 	}, {
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 715b690..90e484e 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -22,6 +22,7 @@
 #include <linux/export.h>
 #include <linux/irqdomain.h>
 #include <linux/of_address.h>
+#include <linux/of_fdt.h>
 
 #include <asm/proc-fns.h>
 #include <asm/exception.h>
@@ -1043,3 +1044,39 @@ static int __init exynos_init_irq_eint(void)
 	return 0;
 }
 arch_initcall(exynos_init_irq_eint);
+
+int exynos_fdt_find_mfc_mem(unsigned long node, const char *uname,
+		int depth, void *data)
+{
+	__be32 *prop;
+	unsigned long len;
+	struct mfc_dt_meminfo *mfc_mem = data;
+
+	if (!data)
+		return 0;
+
+	if (!of_flat_dt_is_compatible(node, mfc_mem->compatible))
+		return 0;
+
+	prop = of_get_flat_dt_prop(node, "samsung,mfc-l", &len);
+	if (!prop)
+		return 0;
+	mfc_mem->loff = of_read_ulong(prop, len/4);
+
+	prop = of_get_flat_dt_prop(node, "samsung,mfc-l-size", &len);
+	if (!prop)
+		return 0;
+	mfc_mem->lsize = of_read_ulong(prop, len/4);
+
+	prop = of_get_flat_dt_prop(node, "samsung,mfc-r", &len);
+	if (!prop)
+		return 0;
+	mfc_mem->roff = of_read_ulong(prop, len/4);
+
+	prop = of_get_flat_dt_prop(node, "samsung,mfc-r-size", &len);
+	if (!prop)
+		return 0;
+	mfc_mem->rsize = of_read_ulong(prop, len/4);
+
+	return 1;
+}
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index aed2eeb..c56d352 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -12,6 +12,14 @@
 #ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H
 #define __ARCH_ARM_MACH_EXYNOS_COMMON_H
 
+struct mfc_dt_meminfo {
+	unsigned long	loff;
+	unsigned long	lsize;
+	unsigned long	roff;
+	unsigned long	rsize;
+	char		*compatible;
+};
+
 extern struct sys_timer exynos4_timer;
 
 void exynos_init_io(struct map_desc *mach_desc, int size);
@@ -20,6 +28,8 @@ void exynos5_init_irq(void);
 void exynos4_restart(char mode, const char *cmd);
 void exynos5_restart(char mode, const char *cmd);
 void exynos_init_late(void);
+int exynos_fdt_find_mfc_mem(unsigned long node, const char *uname,
+		int depth, void *data);
 
 #ifdef CONFIG_PM_GENERIC_DOMAINS
 int exynos_pm_late_initcall(void);
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index e707eb1..17fd144 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -11,6 +11,8 @@
 
 #include <linux/of_platform.h>
 #include <linux/serial_core.h>
+#include <linux/memblock.h>
+#include <linux/of_fdt.h>
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>
@@ -18,6 +20,7 @@
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
+#include <plat/mfc.h>
 
 #include "common.h"
 
@@ -64,6 +67,7 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"exynos-gsc.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
 				"exynos-gsc.3", NULL),
+	OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
 	{},
 };
 
@@ -84,6 +88,17 @@ static char const *exynos5250_dt_compat[] __initdata = {
 	NULL
 };
 
+static void __init exynos5_reserve(void)
+{
+	struct mfc_dt_meminfo mfc_mem;
+
+	/* Reserve memory for MFC only if it's available */
+	mfc_mem.compatible = "samsung,mfc-v6";
+	if (of_scan_flat_dt(exynos_fdt_find_mfc_mem, &mfc_mem))
+		s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,
+				mfc_mem.lsize);
+}
+
 DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)")
 	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
 	.init_irq	= exynos5_init_irq,
@@ -94,4 +109,5 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)")
 	.timer		= &exynos4_timer,
 	.dt_compat	= exynos5250_dt_compat,
 	.restart        = exynos5_restart,
+	.reserve	= exynos5_reserve,
 MACHINE_END
-- 
1.7.0.4