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

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

[Sachin Kamat]

Resending this series after adding support for some Exynos4412 boards
(patches 5 and 6) and renaming the patch titles to "ARM: dts: ".

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          |   13 +++++++++++++
 arch/arm/boot/dts/exynos4.dtsi                     |    7 +++++++
 arch/arm/boot/dts/exynos4210-origen.dts            |    5 +++++
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |    5 +++++
 arch/arm/boot/dts/exynos4412-origen.dts            |    5 +++++
 arch/arm/boot/dts/exynos4412-smdk4412.dts          |    5 +++++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |   17 +++++++++++++++++
 7 files changed, 57 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          |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 67ec3d4..261c9dc 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -21,3 +21,16 @@ Required properties:
 
   - samsung,mfc-l : Base address of the second memory bank used by MFC
 		    for DMA contiguous memory allocation and its size.
+
+Example:
+
+mfc: codec@13400000 {
+	compatible = "samsung,mfc-v5";
+	reg = <0x13400000 0x10000>;
+	interrupts = <0 94 0>;
+};
+
+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         |    7 +++++++
 arch/arm/mach-exynos/mach-exynos4-dt.c |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..1122fb1 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -289,4 +289,11 @@
 			interrupts = <0 34 0>;
 		};
 	};
+
+	mfc: codec@13400000 {
+		compatible = "samsung,mfc-v5";
+		reg = <0x13400000 0x10000>;
+		interrupts = <0 94 0>;
+		samsung,power-domain = <&pd_mfc>;
+	};
 };
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 |    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

[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 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index f271001..cd0d1e2 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -121,4 +121,9 @@
 			linux,default-trigger = "heartbeat";
 		};
 	};
+
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+	};
 };
-- 
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 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 4eba374..d9766da 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -59,4 +59,9 @@
 	serial@13830000 {
 		status = "okay";
 	};
+
+	codec@13400000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+	};
 };
-- 
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 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

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

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

[Sylwester Nawrocki]

Hi Sachin,

On 01/29/2013 05:13 AM, Sachin Kamat wrote:
> 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          |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
> index 67ec3d4..261c9dc 100644
> --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
> +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
> @@ -21,3 +21,16 @@ Required properties:
>  
>    - samsung,mfc-l : Base address of the second memory bank used by MFC
>  		    for DMA contiguous memory allocation and its size.
> +
> +Example:

Maybe adding a comment that this is a SoC...

> +mfc: codec@13400000 {
> +	compatible = "samsung,mfc-v5";
> +	reg = <0x13400000 0x10000>;
> +	interrupts = <0 94 0>;
> +};

and the board specific part would make it more clear ?

> +codec@13400000 {
> +	samsung,mfc-r = <0x43000000 0x800000>;
> +	samsung,mfc-l = <0x51000000 0x800000>;
> +};

Also please note that in the first node above you need
status = "disabled"; line, so the MFC is disabled by default.
Then in dts files for boards that use the codec it can be
overridden to enable the device as needed.

--

Thanks,
Sylwester

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

[Sylwester Nawrocki]

On 01/29/2013 05:13 AM, Sachin Kamat wrote:
> 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         |    7 +++++++
>  arch/arm/mach-exynos/mach-exynos4-dt.c |   17 +++++++++++++++++
>  2 files changed, 24 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
> index e1347fc..1122fb1 100644
> --- a/arch/arm/boot/dts/exynos4.dtsi
> +++ b/arch/arm/boot/dts/exynos4.dtsi
> @@ -289,4 +289,11 @@
>  			interrupts = <0 34 0>;
>  		};
>  	};
> +
> +	mfc: codec@13400000 {
> +		compatible = "samsung,mfc-v5";
> +		reg = <0x13400000 0x10000>;
> +		interrupts = <0 94 0>;
> +		samsung,power-domain = <&pd_mfc>;

Please add:
		status = "disabled";

> +	};
>  };
> 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

Where is this symbol supposed to be enabled ?

Don't you need a change like this as a part of this patch ?

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 1d9312a..1ae72d9 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -413,6 +413,7 @@ config MACH_EXYNOS4_DT
        select USE_OF
        select EXYNOS4_SETUP_USB_PHY
        select ARM_DMA_USE_IOMMU if EXYNOS_IOMMU
+       select S5P_DEV_MFC
        help
          Machine support for Samsung Exynos4 machine with device tree enabled.
          Select this if a fdt blob is available for the Exynos4 SoC based board.

--

Thanks,
Sylwester

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 1/6] ARM: dts: Update MFC DT binding documentation

[Sachin Kamat]

Hi Sylwester,

>> +Example:
>
> Maybe adding a comment that this is a SoC...
>
>> +mfc: codec@13400000 {
>> +     compatible = "samsung,mfc-v5";
>> +     reg = <0x13400000 0x10000>;
>> +     interrupts = <0 94 0>;
>> +};
>
> and the board specific part would make it more clear ?

Absolutely :)

>
>> +codec@13400000 {
>> +     samsung,mfc-r = <0x43000000 0x800000>;
>> +     samsung,mfc-l = <0x51000000 0x800000>;
>> +};
>
> Also please note that in the first node above you need
> status = "disabled"; line, so the MFC is disabled by default.
> Then in dts files for boards that use the codec it can be
> overridden to enable the device as needed.

Right.


-- 
With warm regards,
Sachin

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

[Sachin Kamat]

Hi Sylwester,


>> +     mfc: codec@13400000 {
>> +             compatible = "samsung,mfc-v5";
>> +             reg = <0x13400000 0x10000>;
>> +             interrupts = <0 94 0>;
>> +             samsung,power-domain = <&pd_mfc>;
>
> Please add:
>                 status = "disabled";

OK

>
>> +     };
>>  };
>> +static void __init exynos4_reserve(void)
>> +{
>> +#ifdef CONFIG_S5P_DEV_MFC
>
> Where is this symbol supposed to be enabled ?
>
> Don't you need a change like this as a part of this patch ?

Yes. Good catch. Since this symbol was defined under other machines
which were getting enabled, I did not notice this.

>

-- 
With warm regards,
Sachin

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 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