[PATCH v2 0/5] DT/ARCH updates for MFC

[PATCH v2 0/5] DT/ARCH updates for MFC

[Arun Kumar K]

The patch series updates the DT nodes of MFC in Exynos4,
Exynos 5250 and creates node in 5420. Also updates the
memory reserve in exynos5 for mfc-v7.

Changes from v1:
- Made status disabled in dtsi and enable in dts
  as suggested by Sachin Kamat.
- Moved common properties to exynos5.dtsi as
  suggested by Chander.
- Updated binding documentation for special clk removal
- Updated exynos4 dtsi

Arun Kumar K (5):
  ARM: dts: Update clocks entry in MFC binding documentation
  ARM: dts: Remove unsused MFC clock from exynos4
  ARM: dts: Update 5250 MFC node
  ARM: dts: Add MFC node for exynos 5420
  ARM: EXYNOS: Add mfc-v7 to memory reserve

 .../devicetree/bindings/media/s5p-mfc.txt          |   10 +++++-----
 arch/arm/boot/dts/exynos4.dtsi                     |    4 ++--
 arch/arm/boot/dts/exynos5.dtsi                     |    5 +++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    4 ++--
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |    6 ++++++
 arch/arm/boot/dts/exynos5420.dtsi                  |    7 +++++++
 arch/arm/mach-exynos/mach-exynos5-dt.c             |   14 +++++++++-----
 7 files changed, 36 insertions(+), 14 deletions(-)

-- 
1.7.9.5

[PATCH v2 1/5] ARM: dts: Update clocks entry in MFC binding documentation

[Arun Kumar K]

MFC driver is updated to use only one clock instead of
two. Correcting this in the binding documentation.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 .../devicetree/bindings/media/s5p-mfc.txt          |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index df37b02..d75c3e5 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -15,9 +15,9 @@ Required properties:
 	  mapped region.
 
   - interrupts : MFC interrupt number to the CPU.
-  - clocks : from common clock binding: handle to mfc clocks.
-  - clock-names : from common clock binding: must contain "sclk_mfc" and "mfc",
-		  corresponding to entries in the clocks property.
+  - clocks : from common clock binding: handle to mfc clock.
+  - clock-names : from common clock binding: must contain "mfc",
+		  corresponding to entry in the clocks property.
 
   - samsung,mfc-r : Base address of the first memory bank used by MFC
 		    for DMA contiguous memory allocation and its size.
@@ -37,8 +37,8 @@ mfc: codec@13400000 {
 	reg = <0x13400000 0x10000>;
 	interrupts = <0 94 0>;
 	samsung,power-domain = <&pd_mfc>;
-	clocks = <&clock 170>, <&clock 273>;
-	clock-names = "sclk_mfc", "mfc";
+	clocks = <&clock 273>;
+	clock-names = "mfc";
 };
 
 Board specific DT entry:
-- 
1.7.9.5

[PATCH v2 2/5] ARM: dts: Remove unsused MFC clock from exynos4

[Arun Kumar K]

Removes the unused sclk_mfc from exynos4 dtsi file.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 arch/arm/boot/dts/exynos4.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 3f94fe8..0f213a3 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -160,8 +160,8 @@
 		reg = <0x13400000 0x10000>;
 		interrupts = <0 94 0>;
 		samsung,power-domain = <&pd_mfc>;
-		clocks = <&clock 170>, <&clock 273>;
-		clock-names = "sclk_mfc", "mfc";
+		clocks = <&clock 273>;
+		clock-names = "mfc";
 		status = "disabled";
 	};
 
-- 
1.7.9.5

[PATCH v2 3/5] ARM: dts: Update 5250 MFC node

[Arun Kumar K]

The patch adds the MFC clock entry for the 5250 SoC and
also moves the common params to newly added exynos5.dtsi.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 arch/arm/boot/dts/exynos5.dtsi    |    5 +++++
 arch/arm/boot/dts/exynos5250.dtsi |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index f65e124..7966a10 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -108,4 +108,9 @@
 		interrupts = <0 42 0>;
 		status = "disabled";
 	};
+
+	codec@11000000 {
+		reg = <0x11000000 0x10000>;
+		interrupts = <0 96 0>;
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index d04ab0a..5ffdae9 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -165,9 +165,9 @@
 
 	codec@11000000 {
 		compatible = "samsung,mfc-v6";
-		reg = <0x11000000 0x10000>;
-		interrupts = <0 96 0>;
 		samsung,power-domain = <&pd_mfc>;
+		clocks = <&clock 266>;
+		clock-names = "mfc";
 	};
 
 	rtc {
-- 
1.7.9.5

[PATCH v2 4/5] ARM: dts: Add MFC node for exynos 5420

[Arun Kumar K]

The patch adds MFC nodes for exynos 5420 and for
smdk 5420 board.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 arch/arm/boot/dts/exynos5420-smdk5420.dts |    6 ++++++
 arch/arm/boot/dts/exynos5420.dtsi         |    7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 08607df..09ebecf 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -30,4 +30,10 @@
 			clock-frequency = <24000000>;
 		};
 	};
+
+	codec@11000000 {
+		samsung,mfc-r = <0x43000000 0x800000>;
+		samsung,mfc-l = <0x51000000 0x800000>;
+		status = "okay";
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 8474d63..3ef604d 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -100,4 +100,11 @@
 		clocks = <&clock 260>, <&clock 131>;
 		clock-names = "uart", "clk_uart_baud0";
 	};
+
+	codec@11000000 {
+		compatible = "samsung,mfc-v7";
+		clocks = <&clock 401>;
+		clock-names = "mfc";
+		status = "disabled";
+	};
 };
-- 
1.7.9.5

[PATCH v2 5/5] ARM: EXYNOS: Add mfc-v7 to memory reserve

[Arun Kumar K]

The patch updates the exynos5 memory reservation to reserve
memory for mfc-v7 also in addition to v6.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
---
 arch/arm/mach-exynos/mach-exynos5-dt.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index f874b77..fdb6181 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -60,13 +60,17 @@ static char const *exynos5_dt_compat[] __initdata = {
 static void __init exynos5_reserve(void)
 {
 #ifdef CONFIG_S5P_DEV_MFC
-	struct s5p_mfc_dt_meminfo mfc_mem;
+	int i;
+	struct s5p_mfc_dt_meminfo mfc_mem[] = {
+		{.compatible = "samsung,mfc-v6"},
+		{.compatible = "samsung,mfc-v7"},
+	};
 
 	/* Reserve memory for MFC only if it's available */
-	mfc_mem.compatible = "samsung,mfc-v6";
-	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);
+	for (i = 0; i < ARRAY_SIZE(mfc_mem); i++)
+		if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem[i]))
+			s5p_mfc_reserve_mem(mfc_mem[i].roff, mfc_mem[i].rsize,
+					mfc_mem[i].loff, mfc_mem[i].lsize);
 #endif
 }
 
-- 
1.7.9.5

RE: [PATCH v2 0/5] DT/ARCH updates for MFC

[Kukjin Kim]

Arun Kumar K wrote:
> 
> The patch series updates the DT nodes of MFC in Exynos4,
> Exynos 5250 and creates node in 5420. Also updates the
> memory reserve in exynos5 for mfc-v7.
> 
> Changes from v1:
> - Made status disabled in dtsi and enable in dts
>   as suggested by Sachin Kamat.
> - Moved common properties to exynos5.dtsi as
>   suggested by Chander.
> - Updated binding documentation for special clk removal
> - Updated exynos4 dtsi
> 
> Arun Kumar K (5):
>   ARM: dts: Update clocks entry in MFC binding documentation
>   ARM: dts: Remove unsused MFC clock from exynos4
>   ARM: dts: Update 5250 MFC node
>   ARM: dts: Add MFC node for exynos 5420
>   ARM: EXYNOS: Add mfc-v7 to memory reserve
> 
>  .../devicetree/bindings/media/s5p-mfc.txt          |   10 +++++-----
>  arch/arm/boot/dts/exynos4.dtsi                     |    4 ++--
>  arch/arm/boot/dts/exynos5.dtsi                     |    5 +++++
>  arch/arm/boot/dts/exynos5250.dtsi                  |    4 ++--
>  arch/arm/boot/dts/exynos5420-smdk5420.dts          |    6 ++++++
>  arch/arm/boot/dts/exynos5420.dtsi                  |    7 +++++++
>  arch/arm/mach-exynos/mach-exynos5-dt.c             |   14 +++++++++-----
>  7 files changed, 36 insertions(+), 14 deletions(-)
> 
> --
> 1.7.9.5

Basically, looks good to me except making common stuff into the
exynos5.dtsi. Because as I commented on another thread, upcoming exynos5 has
different address and IRQ# for mfc. So please respin so that this could be
merged for v3.12.

Thanks,
Kukjin