* [PATCH 0/3] DW-MSHC support on Exynos4412-TRATS2 board
@ 2013-12-12 16:18 ` Tomasz Figa
0 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
This series fixes spotted issues with DW-MSHC support on Exynos4x12
SoCs and then enables DW-MSHC controller to handle eMMC memory on
Exynos4412-TRATS2 board. As opposed to using sdhci-s3c for eMMC,
MMC 4.4 extensions can be used and in general performance is improved.
Tested on Exynos4412-TRATS2 board.
Tomasz Figa (3):
clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes
ARM: dts: exynos4412-trats2: Use MSHC controller for eMMC memory
arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +----
arch/arm/boot/dts/exynos4412-origen.dts | 5 +----
arch/arm/boot/dts/exynos4412-trats2.dts | 20 ++++++++++++++++----
arch/arm/boot/dts/exynos4412.dtsi | 8 --------
arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++
drivers/clk/samsung/clk-exynos4.c | 3 ++-
6 files changed, 33 insertions(+), 21 deletions(-)
--
1.8.4.3
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
2013-12-12 16:18 ` Tomasz Figa
@ 2013-12-12 16:18 ` Tomasz Figa
-1 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-samsung-soc, Kyungmin Park, Thomas Abraham,
Sylwester Nawrocki, Arnd Bergmann, Olof Johansson, Stephen Warren,
Kukjin Kim, Mike Turquette, Tomasz Figa
The clock was missing CLK_SET_RATE_PARENT flag, which caused rate
setting failures due to inability of reconfiguration of second
divider behind it.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/clk/samsung/clk-exynos4.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index ad5ff50..d967571 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -530,7 +530,8 @@ static struct samsung_div_clock exynos4_div_clks[] __initdata = {
DIV(sclk_i2s1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
DIV(none, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
- DIV(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8),
+ DIV_F(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
+ CLK_SET_RATE_PARENT, 0),
DIV(none, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
DIV(none, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
DIV(none, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/3] clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
@ 2013-12-12 16:18 ` Tomasz Figa
0 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
The clock was missing CLK_SET_RATE_PARENT flag, which caused rate
setting failures due to inability of reconfiguration of second
divider behind it.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/clk/samsung/clk-exynos4.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index ad5ff50..d967571 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -530,7 +530,8 @@ static struct samsung_div_clock exynos4_div_clks[] __initdata = {
DIV(sclk_i2s1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
DIV(none, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
- DIV(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8),
+ DIV_F(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
+ CLK_SET_RATE_PARENT, 0),
DIV(none, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
DIV(none, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
DIV(none, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes
2013-12-12 16:18 ` Tomasz Figa
@ 2013-12-12 16:18 ` Tomasz Figa
-1 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-samsung-soc, Kyungmin Park, Thomas Abraham,
Sylwester Nawrocki, Arnd Bergmann, Olof Johansson, Stephen Warren,
Kukjin Kim, Mike Turquette, Tomasz Figa
All SoCs from Exynos4x12 series contain the MSHC block, so its node can
be located in exynos4x12.dtsi. In addition, missing clock specifiers
are added, generic SoC attributes are moved from board dts files
to common dtsi file of SoC family and the node is renamed to a more
generic name to follow node naming recommendations.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +----
arch/arm/boot/dts/exynos4412-origen.dts | 5 +----
arch/arm/boot/dts/exynos4412.dtsi | 8 --------
arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 46c678e..8aad5f7 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -38,9 +38,7 @@
};
};
- mshc@12550000 {
- #address-cells = <1>;
- #size-cells = <0>;
+ mmc@12550000 {
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
vmmc-supply = <&ldo20_reg &buck8_reg>;
@@ -49,7 +47,6 @@
num-slots = <1>;
supports-highspeed;
broken-cd;
- fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index d65984c..0fe0161 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -122,9 +122,7 @@
status = "okay";
};
- mshc@12550000 {
- #address-cells = <1>;
- #size-cells = <0>;
+ mmc@12550000 {
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
status = "okay";
@@ -132,7 +130,6 @@
num-slots = <1>;
supports-highspeed;
broken-cd;
- fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index e743e67..7a0c871 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -34,7 +34,6 @@
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
<0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
};
-
mct@10050000 {
compatible = "samsung,exynos4412-mct";
reg = <0x10050000 0x800>;
@@ -61,11 +60,4 @@
};
};
- mshc@12550000 {
- compatible = "samsung,exynos4412-dw-mshc";
- reg = <0x12550000 0x1000>;
- interrupts = <0 77 0>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
};
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index ad531fe..1917c82 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -28,6 +28,7 @@
pinctrl3 = &pinctrl_3;
fimc-lite0 = &fimc_lite_0;
fimc-lite1 = &fimc_lite_1;
+ mshc0 = &mshc_0;
};
pd_isp: isp-power-domain@10023CA0 {
@@ -176,4 +177,16 @@
};
};
};
+
+ mshc_0: mmc@12550000 {
+ compatible = "samsung,exynos4412-dw-mshc";
+ reg = <0x12550000 0x1000>;
+ interrupts = <0 77 0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ fifo-depth = <0x80>;
+ clocks = <&clock 301>, <&clock 149>;
+ clock-names = "biu", "ciu";
+ status = "disabled";
+ };
};
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/3] ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes
@ 2013-12-12 16:18 ` Tomasz Figa
0 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
All SoCs from Exynos4x12 series contain the MSHC block, so its node can
be located in exynos4x12.dtsi. In addition, missing clock specifiers
are added, generic SoC attributes are moved from board dts files
to common dtsi file of SoC family and the node is renamed to a more
generic name to follow node naming recommendations.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +----
arch/arm/boot/dts/exynos4412-origen.dts | 5 +----
arch/arm/boot/dts/exynos4412.dtsi | 8 --------
arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 46c678e..8aad5f7 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -38,9 +38,7 @@
};
};
- mshc at 12550000 {
- #address-cells = <1>;
- #size-cells = <0>;
+ mmc at 12550000 {
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
vmmc-supply = <&ldo20_reg &buck8_reg>;
@@ -49,7 +47,6 @@
num-slots = <1>;
supports-highspeed;
broken-cd;
- fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index d65984c..0fe0161 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -122,9 +122,7 @@
status = "okay";
};
- mshc at 12550000 {
- #address-cells = <1>;
- #size-cells = <0>;
+ mmc at 12550000 {
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
status = "okay";
@@ -132,7 +130,6 @@
num-slots = <1>;
supports-highspeed;
broken-cd;
- fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index e743e67..7a0c871 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -34,7 +34,6 @@
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
<0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
};
-
mct at 10050000 {
compatible = "samsung,exynos4412-mct";
reg = <0x10050000 0x800>;
@@ -61,11 +60,4 @@
};
};
- mshc at 12550000 {
- compatible = "samsung,exynos4412-dw-mshc";
- reg = <0x12550000 0x1000>;
- interrupts = <0 77 0>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
};
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index ad531fe..1917c82 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -28,6 +28,7 @@
pinctrl3 = &pinctrl_3;
fimc-lite0 = &fimc_lite_0;
fimc-lite1 = &fimc_lite_1;
+ mshc0 = &mshc_0;
};
pd_isp: isp-power-domain at 10023CA0 {
@@ -176,4 +177,16 @@
};
};
};
+
+ mshc_0: mmc at 12550000 {
+ compatible = "samsung,exynos4412-dw-mshc";
+ reg = <0x12550000 0x1000>;
+ interrupts = <0 77 0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ fifo-depth = <0x80>;
+ clocks = <&clock 301>, <&clock 149>;
+ clock-names = "biu", "ciu";
+ status = "disabled";
+ };
};
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: dts: exynos4412-trats2: Use MSHC controller for eMMC memory
2013-12-12 16:18 ` Tomasz Figa
@ 2013-12-12 16:18 ` Tomasz Figa
-1 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-samsung-soc, Kyungmin Park, Thomas Abraham,
Sylwester Nawrocki, Arnd Bergmann, Olof Johansson, Stephen Warren,
Kukjin Kim, Mike Turquette, Tomasz Figa
This patch removes device tree node of SDHCI0 controller and replaces
it with MSHC to enable support MMC 4.4 and improve performance of eMMC
memory.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/boot/dts/exynos4412-trats2.dts | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index fb7b9ae..890ad27 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -442,13 +442,25 @@
};
};
- sdhci@12510000 {
- bus-width = <8>;
+ mmc@12550000 {
+ num-slots = <1>;
+ supports-highspeed;
+ broken-cd;
non-removable;
- pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
- pinctrl-names = "default";
+ card-detect-delay = <200>;
vmmc-supply = <&vemmc_reg>;
+ clock-frequency = <400000000>;
+ samsung,dw-mshc-ciu-div = <0>;
+ samsung,dw-mshc-sdr-timing = <2 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+ pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+ pinctrl-names = "default";
status = "okay";
+
+ slot@0 {
+ reg = <0>;
+ bus-width = <8>;
+ };
};
serial@13800000 {
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/3] ARM: dts: exynos4412-trats2: Use MSHC controller for eMMC memory
@ 2013-12-12 16:18 ` Tomasz Figa
0 siblings, 0 replies; 10+ messages in thread
From: Tomasz Figa @ 2013-12-12 16:18 UTC (permalink / raw)
To: linux-arm-kernel
This patch removes device tree node of SDHCI0 controller and replaces
it with MSHC to enable support MMC 4.4 and improve performance of eMMC
memory.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/boot/dts/exynos4412-trats2.dts | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index fb7b9ae..890ad27 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -442,13 +442,25 @@
};
};
- sdhci at 12510000 {
- bus-width = <8>;
+ mmc at 12550000 {
+ num-slots = <1>;
+ supports-highspeed;
+ broken-cd;
non-removable;
- pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
- pinctrl-names = "default";
+ card-detect-delay = <200>;
vmmc-supply = <&vemmc_reg>;
+ clock-frequency = <400000000>;
+ samsung,dw-mshc-ciu-div = <0>;
+ samsung,dw-mshc-sdr-timing = <2 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+ pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+ pinctrl-names = "default";
status = "okay";
+
+ slot at 0 {
+ reg = <0>;
+ bus-width = <8>;
+ };
};
serial at 13800000 {
--
1.8.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] DW-MSHC support on Exynos4412-TRATS2 board
2013-12-12 16:18 ` Tomasz Figa
@ 2013-12-20 22:16 ` Kukjin Kim
-1 siblings, 0 replies; 10+ messages in thread
From: Kukjin Kim @ 2013-12-20 22:16 UTC (permalink / raw)
To: Tomasz Figa
Cc: linux-arm-kernel, linux-samsung-soc, Mike Turquette,
Arnd Bergmann, Stephen Warren, Kyungmin Park, Kukjin Kim,
Thomas Abraham, Sylwester Nawrocki, Olof Johansson
On 12/13/13 01:18, Tomasz Figa wrote:
> This series fixes spotted issues with DW-MSHC support on Exynos4x12
> SoCs and then enables DW-MSHC controller to handle eMMC memory on
> Exynos4412-TRATS2 board. As opposed to using sdhci-s3c for eMMC,
> MMC 4.4 extensions can be used and in general performance is improved.
>
> Tested on Exynos4412-TRATS2 board.
>
> Tomasz Figa (3):
> clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
> ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes
> ARM: dts: exynos4412-trats2: Use MSHC controller for eMMC memory
>
> arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +----
> arch/arm/boot/dts/exynos4412-origen.dts | 5 +----
> arch/arm/boot/dts/exynos4412-trats2.dts | 20 ++++++++++++++++----
> arch/arm/boot/dts/exynos4412.dtsi | 8 --------
> arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++
> drivers/clk/samsung/clk-exynos4.c | 3 ++-
> 6 files changed, 33 insertions(+), 21 deletions(-)
>
Looks good to me, applied.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/3] DW-MSHC support on Exynos4412-TRATS2 board
@ 2013-12-20 22:16 ` Kukjin Kim
0 siblings, 0 replies; 10+ messages in thread
From: Kukjin Kim @ 2013-12-20 22:16 UTC (permalink / raw)
To: linux-arm-kernel
On 12/13/13 01:18, Tomasz Figa wrote:
> This series fixes spotted issues with DW-MSHC support on Exynos4x12
> SoCs and then enables DW-MSHC controller to handle eMMC memory on
> Exynos4412-TRATS2 board. As opposed to using sdhci-s3c for eMMC,
> MMC 4.4 extensions can be used and in general performance is improved.
>
> Tested on Exynos4412-TRATS2 board.
>
> Tomasz Figa (3):
> clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
> ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes
> ARM: dts: exynos4412-trats2: Use MSHC controller for eMMC memory
>
> arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +----
> arch/arm/boot/dts/exynos4412-origen.dts | 5 +----
> arch/arm/boot/dts/exynos4412-trats2.dts | 20 ++++++++++++++++----
> arch/arm/boot/dts/exynos4412.dtsi | 8 --------
> arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++
> drivers/clk/samsung/clk-exynos4.c | 3 ++-
> 6 files changed, 33 insertions(+), 21 deletions(-)
>
Looks good to me, applied.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 10+ messages in thread