[PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT

[PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT

[Sachin Kamat]

Added MFC codec support to SMDKV310 DT file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4210-smdkv310.dts |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index f634907..8481f8f 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -189,4 +189,9 @@
 			};
 		};
 	};
+
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+	};
 };
-- 
1.7.4.1

Re: [PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT

[Sylwester Nawrocki]

On 01/29/2013 05:13 AM, Sachin Kamat wrote:
> Added MFC codec support to SMDKV310 DT file.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  arch/arm/boot/dts/exynos4210-smdkv310.dts |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
> index f634907..8481f8f 100644
> --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
> +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
> @@ -189,4 +189,9 @@
>  			};
>  		};
>  	};
> +
> +	codec@13400000 {
> +		samsung,mfc-r = <0x43000000 0x800000>;
> +		samsung,mfc-l = <0x51000000 0x800000>;

With the change as I proposed in patch 2/6 you need to add:

		status = "okay";

in this node and for all other boards in the further patches
in this series.

--

Thanks,
Sylwester

Re: [PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT

[Sachin Kamat]

Hi Sylwester,

>> +     codec@13400000 {
>> +             samsung,mfc-r = <0x43000000 0x800000>;
>> +             samsung,mfc-l = <0x51000000 0x800000>;
>
> With the change as I proposed in patch 2/6 you need to add:
>
>                 status = "okay";
>
> in this node and for all other boards in the further patches
> in this series.

Right. Will update the series with your comments and re-send it.
Thank you for reviewing.

-- 
With warm regards,
Sachin

[PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4

[Sachin Kamat]

Changes since v1:
Addressed comments from Sylwester
  - Updated documentation
  - Added 'status' to the nodes
  - Updated Kconfig entry

This series is based on for-next branch of Kukjin Kim's tree.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Sachin Kamat (6):
  ARM: dts: Update MFC DT binding documentation
  ARM: dts: Add MFC codec support for Exynos4 DT machines
  ARM: dts: Add MFC codec support to SMDKV310 DT
  ARM: dts: Add MFC codec support to Origen DT
  ARM: dts: Add MFC codec entry to exynos4412-origen DT file
  ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file

 .../devicetree/bindings/media/s5p-mfc.txt          |   21 ++++++++++++++++++++
 arch/arm/boot/dts/exynos4.dtsi                     |    8 +++++++
 arch/arm/boot/dts/exynos4210-origen.dts            |    6 +++++
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |    6 +++++
 arch/arm/boot/dts/exynos4412-origen.dts            |    6 +++++
 arch/arm/boot/dts/exynos4412-smdk4412.dts          |    6 +++++
 arch/arm/mach-exynos/Kconfig                       |    1 +
 arch/arm/mach-exynos/mach-exynos4-dt.c             |   17 ++++++++++++++++
 8 files changed, 71 insertions(+), 0 deletions(-)

-- 
1.7.4.1

[PATCH 1/6] ARM: dts: Update MFC DT binding documentation

[Sachin Kamat]

Added an example for bindings for illustration and clarity.

Cc: devicetree-discuss@lists.ozlabs.org
Cc: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 .../devicetree/bindings/media/s5p-mfc.txt          |   21 ++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 67ec3d4..bf0182d 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -21,3 +21,24 @@ Required properties:
 
   - samsung,mfc-l : Base address of the second memory bank used by MFC
 		    for DMA contiguous memory allocation and its size.
+
+Optional properties:
+  - samsung,power-domain : power-domain property defined with a phandle
+			   to respective power domain.
+
+Example:
+SoC specific DT entry:
+
+mfc: codec@13400000 {
+	compatible = "samsung,mfc-v5";
+	reg = <0x13400000 0x10000>;
+	interrupts = <0 94 0>;
+	samsung,power-domain = <&pd_mfc>;
+};
+
+Board specific DT entry:
+
+codec@13400000 {
+	samsung,mfc-r = <0x43000000 0x800000>;
+	samsung,mfc-l = <0x51000000 0x800000>;
+};
-- 
1.7.4.1

[PATCH 2/6] ARM: dts: Add MFC codec support for Exynos4 DT machines

[Sachin Kamat]

This patch adds MFC codec support for Exynos4 DT machines.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4.dtsi         |    8 ++++++++
 arch/arm/mach-exynos/Kconfig           |    1 +
 arch/arm/mach-exynos/mach-exynos4-dt.c |   17 +++++++++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..6581bb2 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -131,6 +131,14 @@
 		status = "disabled";
 	};
 
+	mfc: codec@13400000 {
+		compatible = "samsung,mfc-v5";
+		reg = <0x13400000 0x10000>;
+		interrupts = <0 94 0>;
+		samsung,power-domain = <&pd_mfc>;
+		status = "disabled";
+	};
+
 	serial@13800000 {
 		compatible = "samsung,exynos4210-uart";
 		reg = <0x13800000 0x100>;
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e103c29..f0d8f09 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -415,6 +415,7 @@ config MACH_EXYNOS4_DT
 	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
 	select PINCTRL
 	select PINCTRL_EXYNOS4
+	select S5P_DEV_MFC
 	select USE_OF
 	help
 	  Machine support for Samsung Exynos4 machine with device tree enabled.
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc..8ae8da1 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -12,7 +12,9 @@
 */
 
 #include <linux/of_platform.h>
+#include <linux/of_fdt.h>
 #include <linux/serial_core.h>
+#include <linux/memblock.h>
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>
@@ -20,6 +22,7 @@
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
+#include <plat/mfc.h>
 
 #include "common.h"
 
@@ -80,6 +83,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
 				"exynos-tmu", NULL),
+	OF_DEV_AUXDATA("samsung,mfc-v5", 0x13400000, "s5p-mfc", NULL),
 	{},
 };
 
@@ -102,6 +106,18 @@ static char const *exynos4_dt_compat[] __initdata = {
 	NULL
 };
 
+static void __init exynos4_reserve(void)
+{
+#ifdef CONFIG_S5P_DEV_MFC
+	struct s5p_mfc_dt_meminfo mfc_mem;
+
+	/* Reserve memory for MFC only if it's available */
+	mfc_mem.compatible = "samsung,mfc-v5";
+	if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))
+		s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,
+				mfc_mem.lsize);
+#endif
+}
 DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
 	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */
 	.smp		= smp_ops(exynos_smp_ops),
@@ -114,4 +130,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
 	.timer		= &exynos4_timer,
 	.dt_compat	= exynos4_dt_compat,
 	.restart        = exynos4_restart,
+	.reserve	= exynos4_reserve,
 MACHINE_END
-- 
1.7.4.1

[PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT

[Sachin Kamat]

Added MFC codec support to SMDKV310 DT file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4210-smdkv310.dts |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index f634907..2b1e03a 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -43,6 +43,12 @@
 		status = "okay";
 	};
 
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+		status = "okay";
+	};
+
 	serial@13800000 {
 		status = "okay";
 	};
-- 
1.7.4.1

[PATCH 4/6] ARM: dts: Add MFC codec support to Origen DT

[Sachin Kamat]

This patch adds MFC codec support to Origen DT file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4210-origen.dts |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index f271001..052606b 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -57,6 +57,12 @@
 		status = "okay";
 	};
 
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+		status = "okay";
+	};
+
 	serial@13800000 {
 		status = "okay";
 	};
-- 
1.7.4.1

[PATCH 5/6] ARM: dts: Add MFC codec entry to exynos4412-origen DT file

[Sachin Kamat]

Added MFC codec entry to exynos4412-origen.dts.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4412-origen.dts |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 4eba374..e066fc6 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -44,6 +44,12 @@
 		status = "okay";
 	};
 
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+		status = "okay";
+	};
+
 	serial@13800000 {
 		status = "okay";
 	};
-- 
1.7.4.1

[PATCH 6/6] ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file

[Sachin Kamat]

Added MFC DT entry to exynos4412-smdk4412.dts file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/boot/dts/exynos4412-smdk4412.dts |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index e885971..6ae4276 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -34,6 +34,12 @@
 		status = "okay";
 	};
 
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+		status = "okay";
+	};
+
 	serial@13800000 {
 		status = "okay";
 	};
-- 
1.7.4.1

Re: [PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4

[Sylwester Nawrocki]

On 01/30/2013 08:11 AM, Sachin Kamat wrote:
> Changes since v1:
> Addressed comments from Sylwester
>   - Updated documentation
>   - Added 'status' to the nodes
>   - Updated Kconfig entry
> 
> This series is based on for-next branch of Kukjin Kim's tree.
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> Sachin Kamat (6):
>   ARM: dts: Update MFC DT binding documentation
>   ARM: dts: Add MFC codec support for Exynos4 DT machines
>   ARM: dts: Add MFC codec support to SMDKV310 DT
>   ARM: dts: Add MFC codec support to Origen DT
>   ARM: dts: Add MFC codec entry to exynos4412-origen DT file
>   ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file

Thanks Sachin. For the whole series:

Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I have also tested patch 2/6 on an Exynos4412 based board,
just added the mfc clock entries in the codec node.

--

Regards,
Sylwester

Re: [PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4

[Sachin Kamat]

>
> Thanks Sachin. For the whole series:
>
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>
> I have also tested patch 2/6 on an Exynos4412 based board,
> just added the mfc clock entries in the codec node.

Thanks Sylwester for your review and testing.


-- 
With warm regards,
Sachin

Re: [PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4

[Sachin Kamat]

Hi Kukjin,

On 30 January 2013 14:30, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote:
> On 01/30/2013 08:11 AM, Sachin Kamat wrote:
>> Changes since v1:
>> Addressed comments from Sylwester
>>   - Updated documentation
>>   - Added 'status' to the nodes
>>   - Updated Kconfig entry
>>
>> This series is based on for-next branch of Kukjin Kim's tree.
>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>> Sachin Kamat (6):
>>   ARM: dts: Update MFC DT binding documentation
>>   ARM: dts: Add MFC codec support for Exynos4 DT machines
>>   ARM: dts: Add MFC codec support to SMDKV310 DT
>>   ARM: dts: Add MFC codec support to Origen DT
>>   ARM: dts: Add MFC codec entry to exynos4412-origen DT file
>>   ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file
>
> Thanks Sachin. For the whole series:
>
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>

Can you please review/add this patch series?


-- 
With warm regards,
Sachin

RE: [PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4

[Kukjin Kim]

Sachin Kamat wrote:
> 
> Hi Kukjin,
> 
> On 30 January 2013 14:30, Sylwester Nawrocki <s.nawrocki@samsung.com>
> wrote:
> > On 01/30/2013 08:11 AM, Sachin Kamat wrote:
> >> Changes since v1:
> >> Addressed comments from Sylwester
> >>   - Updated documentation
> >>   - Added 'status' to the nodes
> >>   - Updated Kconfig entry
> >>
> >> This series is based on for-next branch of Kukjin Kim's tree.
> >> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> >> Sachin Kamat (6):
> >>   ARM: dts: Update MFC DT binding documentation
> >>   ARM: dts: Add MFC codec support for Exynos4 DT machines
> >>   ARM: dts: Add MFC codec support to SMDKV310 DT
> >>   ARM: dts: Add MFC codec support to Origen DT
> >>   ARM: dts: Add MFC codec entry to exynos4412-origen DT file
> >>   ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file
> >
> > Thanks Sachin. For the whole series:
> >
> > Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >
> 
> Can you please review/add this patch series?
> 
Looks good to me, applied.

Thanks.

- Kukjin