* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-07 7:37 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel,
Jaehoon Chung
Since used the mmc_of_parse(), didn't parse the sub-node.
So we can remove the sub-node, because almost SoC used the only one card per a host.
And supports-highspeed can be replaced with "cap-mmc/sd-highspeed" property.
Changelog V10:
- Rebased for next.
- Remove conflict
Changelog V9:
- Fix typos.
- Relocated the warning message.
- Change patch's sequence.
Changelog V8:
- Add the warning message to notice that slot-node was removed.
(As Doug's suggestion)
Changelog V7:
- Fixed typo and modified the commit message.
Changelog V6:
- Fixed Wrong bit control for host's quirks and rename.
- Add "Acked-by" for each SoC maintainers.
Changelog V5:
- Rebased on v3.16-rc4.
- Add Acked-by.
Changelog V4:
- Fix the checkpatch error.
Changelog V3:
- Fix the wrong bus-width value.
- Use the slot->host->quirks instead of brq->quirks.
- Add tested-by and reviewd-by.
Changelog V2:
- Add the "mmc: dw_mmc: replace "disable-wp" from slot's quirks to host's quirk"
Jaehoon Chung (5):
mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
mmc: dw_mmc: modify the dt-binding for removing slot-node and
supports-highspeed
ARM: dts: exynos: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
ARM: dts: socfpga: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
ARM: dts: rockchip: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 ++++---------
.../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 ++++------
.../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 ++++------
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++-----
arch/arm/boot/dts/exynos4412-origen.dts | 8 ++-----
arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++-----
arch/arm/boot/dts/exynos5250-arndale.dts | 18 ++++----------
arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 ++++++--------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 ++++----------
arch/arm/boot/dts/exynos5250-snow.dts | 6 ++---
arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 ++++----------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 ++++----------
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++---------
arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++---------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++---------
arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++---------
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++--------
arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++----
arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++----
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++----
arch/arm/boot/dts/socfpga_vt.dts | 9 +++----
drivers/mmc/host/dw_mmc.c | 11 +++++++--
include/linux/mmc/dw_mmc.h | 2 ++
23 files changed, 92 insertions(+), 202 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-07 7:37 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-arm-kernel
Since used the mmc_of_parse(), didn't parse the sub-node.
So we can remove the sub-node, because almost SoC used the only one card per a host.
And supports-highspeed can be replaced with "cap-mmc/sd-highspeed" property.
Changelog V10:
- Rebased for next.
- Remove conflict
Changelog V9:
- Fix typos.
- Relocated the warning message.
- Change patch's sequence.
Changelog V8:
- Add the warning message to notice that slot-node was removed.
(As Doug's suggestion)
Changelog V7:
- Fixed typo and modified the commit message.
Changelog V6:
- Fixed Wrong bit control for host's quirks and rename.
- Add "Acked-by" for each SoC maintainers.
Changelog V5:
- Rebased on v3.16-rc4.
- Add Acked-by.
Changelog V4:
- Fix the checkpatch error.
Changelog V3:
- Fix the wrong bus-width value.
- Use the slot->host->quirks instead of brq->quirks.
- Add tested-by and reviewd-by.
Changelog V2:
- Add the "mmc: dw_mmc: replace "disable-wp" from slot's quirks to host's quirk"
Jaehoon Chung (5):
mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
mmc: dw_mmc: modify the dt-binding for removing slot-node and
supports-highspeed
ARM: dts: exynos: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
ARM: dts: socfpga: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
ARM: dts: rockchip: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 ++++---------
.../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 ++++------
.../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 ++++------
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++-----
arch/arm/boot/dts/exynos4412-origen.dts | 8 ++-----
arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++-----
arch/arm/boot/dts/exynos5250-arndale.dts | 18 ++++----------
arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 ++++++--------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 ++++----------
arch/arm/boot/dts/exynos5250-snow.dts | 6 ++---
arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 ++++----------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 ++++----------
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++---------
arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++---------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++---------
arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++---------
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++--------
arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++----
arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++----
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++----
arch/arm/boot/dts/socfpga_vt.dts | 9 +++----
drivers/mmc/host/dw_mmc.c | 11 +++++++--
include/linux/mmc/dw_mmc.h | 2 ++
23 files changed, 92 insertions(+), 202 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 1/5] mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-07 7:37 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel,
Jaehoon Chung
Slot quirks "disable-wp" is deprecated.
Instead, use the host quirk "disable-wp".
(Because the slot-node is removed in dt-file.)
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
---
drivers/mmc/host/dw_mmc.c | 11 +++++++++--
include/linux/mmc/dw_mmc.h | 2 ++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 1ac227c..47b52cc 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -997,7 +997,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
int gpio_ro = mmc_gpio_get_ro(mmc);
/* Use platform get_ro function, else try on board write protect */
- if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)
+ if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||
+ (slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))
read_only = 0;
else if (!IS_ERR_VALUE(gpio_ro))
read_only = gpio_ro;
@@ -2021,8 +2022,11 @@ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
/* get quirks */
for (idx = 0; idx < ARRAY_SIZE(of_slot_quirks); idx++)
- if (of_get_property(np, of_slot_quirks[idx].quirk, NULL))
+ if (of_get_property(np, of_slot_quirks[idx].quirk, NULL)) {
+ dev_warn(dev, "Slot quirk %s is deprecated\n",
+ of_slot_quirks[idx].quirk);
quirks |= of_slot_quirks[idx].id;
+ }
return quirks;
}
@@ -2238,6 +2242,9 @@ static struct dw_mci_of_quirks {
{
.quirk = "broken-cd",
.id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
+ }, {
+ .quirk = "disable-wp",
+ .id = DW_MCI_QUIRK_NO_WRITE_PROTECT,
},
};
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index babaea9..29ce014 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -213,6 +213,8 @@ struct dw_mci_dma_ops {
#define DW_MCI_QUIRK_HIGHSPEED BIT(2)
/* Unreliable card detection */
#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
+/* No write protect */
+#define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4)
/* Slot level quirks */
/* This slot has no write protect */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 1/5] mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
@ 2014-08-07 7:37 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-arm-kernel
Slot quirks "disable-wp" is deprecated.
Instead, use the host quirk "disable-wp".
(Because the slot-node is removed in dt-file.)
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
---
drivers/mmc/host/dw_mmc.c | 11 +++++++++--
include/linux/mmc/dw_mmc.h | 2 ++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 1ac227c..47b52cc 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -997,7 +997,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
int gpio_ro = mmc_gpio_get_ro(mmc);
/* Use platform get_ro function, else try on board write protect */
- if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)
+ if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||
+ (slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))
read_only = 0;
else if (!IS_ERR_VALUE(gpio_ro))
read_only = gpio_ro;
@@ -2021,8 +2022,11 @@ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
/* get quirks */
for (idx = 0; idx < ARRAY_SIZE(of_slot_quirks); idx++)
- if (of_get_property(np, of_slot_quirks[idx].quirk, NULL))
+ if (of_get_property(np, of_slot_quirks[idx].quirk, NULL)) {
+ dev_warn(dev, "Slot quirk %s is deprecated\n",
+ of_slot_quirks[idx].quirk);
quirks |= of_slot_quirks[idx].id;
+ }
return quirks;
}
@@ -2238,6 +2242,9 @@ static struct dw_mci_of_quirks {
{
.quirk = "broken-cd",
.id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
+ }, {
+ .quirk = "disable-wp",
+ .id = DW_MCI_QUIRK_NO_WRITE_PROTECT,
},
};
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index babaea9..29ce014 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -213,6 +213,8 @@ struct dw_mci_dma_ops {
#define DW_MCI_QUIRK_HIGHSPEED BIT(2)
/* Unreliable card detection */
#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
+/* No write protect */
+#define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4)
/* Slot level quirks */
/* This slot has no write protect */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-07 7:37 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel,
Jaehoon Chung
Almost all SoCs use one slot per host controller.
(Even if controller can support the multiple slot, Recommend to use one slot per host controller.)
Don't use the slot-node and deprecate the "supports-highspeed" property.
Instead, use the cap-mmc/sd-highspeed.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
---
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 +++++------------
.../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 +++++-------
.../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 +++++-------
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
index 532b1d4..6cd3525 100644
--- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
@@ -46,13 +46,14 @@ Required Properties:
- if CIU clock divider value is 0 (that is divide by 1), both tx and rx
phase shift clocks should be 0.
-Required properties for a slot:
+Required properties for a slot (Deprecated - Recommend to use one slot per host):
* gpios: specifies a list of gpios used for command, clock and data bus. The
first gpio is the command line and the second gpio is the clock line. The
rest of the gpios (depending on the bus-width property) are the data lines in
no particular order. The format of the gpio specifier depends on the gpio
controller.
+(Deprecated - Refer to Documentation/devicetree/binding/pinctrl/samsung-pinctrl.txt)
Example:
@@ -69,21 +70,13 @@ Example:
dwmmc0@12200000 {
num-slots = <1>;
- supports-highspeed;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
broken-cd;
fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,
- <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,
- <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,
- <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,
- <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;
- };
+ bus-width = <8>;
};
diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
index e5bc49f..3b35449 100644
--- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
@@ -34,13 +34,11 @@ Example:
num-slots = <1>;
vmmc-supply = <&ldo12>;
fifo-depth = <0x100>;
- supports-highspeed;
pinctrl-names = "default";
pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- cd-gpios = <&gpio10 3 0>;
- };
+ bus-width = <4>;
+ disable-wp;
+ cd-gpios = <&gpio10 3 0>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 2d4a725..346c609 100644
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -67,7 +67,8 @@ Optional properties:
* card-detect-delay: Delay in milli-seconds before detecting card after card
insert event. The default value is 0.
-* supports-highspeed: Enables support for high speed cards (up to 50MHz)
+* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
+ (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
* broken-cd: as documented in mmc core bindings.
@@ -98,14 +99,11 @@ board specific portions as listed below.
clock-frequency = <400000000>;
clock-freq-min-max = <400000 200000000>;
num-slots = <1>;
- supports-highspeed;
broken-cd;
fifo-depth = <0x80>;
card-detect-delay = <200>;
vmmc-supply = <&buck8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
@ 2014-08-07 7:37 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:37 UTC (permalink / raw)
To: linux-arm-kernel
Almost all SoCs use one slot per host controller.
(Even if controller can support the multiple slot, Recommend to use one slot per host controller.)
Don't use the slot-node and deprecate the "supports-highspeed" property.
Instead, use the cap-mmc/sd-highspeed.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
---
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 +++++------------
.../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 +++++-------
.../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 +++++-------
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
index 532b1d4..6cd3525 100644
--- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
@@ -46,13 +46,14 @@ Required Properties:
- if CIU clock divider value is 0 (that is divide by 1), both tx and rx
phase shift clocks should be 0.
-Required properties for a slot:
+Required properties for a slot (Deprecated - Recommend to use one slot per host):
* gpios: specifies a list of gpios used for command, clock and data bus. The
first gpio is the command line and the second gpio is the clock line. The
rest of the gpios (depending on the bus-width property) are the data lines in
no particular order. The format of the gpio specifier depends on the gpio
controller.
+(Deprecated - Refer to Documentation/devicetree/binding/pinctrl/samsung-pinctrl.txt)
Example:
@@ -69,21 +70,13 @@ Example:
dwmmc0 at 12200000 {
num-slots = <1>;
- supports-highspeed;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
broken-cd;
fifo-depth = <0x80>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,
- <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,
- <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,
- <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,
- <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;
- };
+ bus-width = <8>;
};
diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
index e5bc49f..3b35449 100644
--- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
@@ -34,13 +34,11 @@ Example:
num-slots = <1>;
vmmc-supply = <&ldo12>;
fifo-depth = <0x100>;
- supports-highspeed;
pinctrl-names = "default";
pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- cd-gpios = <&gpio10 3 0>;
- };
+ bus-width = <4>;
+ disable-wp;
+ cd-gpios = <&gpio10 3 0>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 2d4a725..346c609 100644
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -67,7 +67,8 @@ Optional properties:
* card-detect-delay: Delay in milli-seconds before detecting card after card
insert event. The default value is 0.
-* supports-highspeed: Enables support for high speed cards (up to 50MHz)
+* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
+ (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
* broken-cd: as documented in mmc core bindings.
@@ -98,14 +99,11 @@ board specific portions as listed below.
clock-frequency = <400000000>;
clock-freq-min-max = <400000 200000000>;
num-slots = <1>;
- supports-highspeed;
broken-cd;
fifo-depth = <0x80>;
card-detect-delay = <200>;
vmmc-supply = <&buck8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-07 7:38 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun-Sze3O3UU22JBDgjK7y7TUQ,
devicetree-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ,
dinguyen-EIB2kfCEclfQT0dZR+AlfA, Mark Rutland,
kgene.kim-Sze3O3UU22JBDgjK7y7TUQ,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Jaehoon Chung
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Reviewed-by: Tushar Behera <trblinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Tested-by: Sachin Kamat <sachin.kamat-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++------
arch/arm/boot/dts/exynos4412-origen.dts | 8 ++------
arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++------
arch/arm/boot/dts/exynos5250-arndale.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 +++++++----------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5250-snow.dts | 6 ++----
arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++-----------
13 files changed, 51 insertions(+), 140 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 6d6d23c..f5c0f81 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -54,17 +54,13 @@
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
watchdog@10060000 {
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index e925c9f..de15114 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -137,17 +137,13 @@
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
codec@13400000 {
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 11967f4..5e066cd 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -520,7 +520,6 @@
mmc@12550000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
non-removable;
card-detect-delay = <200>;
@@ -532,11 +531,8 @@
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
status = "okay";
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
serial@13800000 {
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index d0de1f5..42a3590 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -401,7 +401,6 @@
mmc_0: mmc@12200000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -410,17 +409,13 @@
vmmc-supply = <&mmc_reg>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc_2: mmc@12220000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
@@ -428,12 +423,9 @@
vmmc-supply = <&mmc_reg>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
};
i2s0: i2s@03830000 {
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
index e603e9c..89034fd 100644
--- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
@@ -89,7 +89,6 @@
mmc@12200000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -97,33 +96,25 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc@12220000 {
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- wp-gpios = <&gpc2 1 0>;
- };
+ bus-width = <4>;
+ wp-gpios = <&gpc2 1 0>;
+ cap-sd-highspeed;
};
mmc@12230000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -131,10 +122,8 @@
samsung,dw-mshc-ddr-timing = <1 2>;
/* See board-specific dts files for pin setup */
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
spi_1: spi@12d30000 {
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index b4b35ad..6a0f4c0 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -284,7 +284,6 @@
mmc@12200000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -292,29 +291,22 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc@12220000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
};
spi_1: spi@12d30000 {
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index f2b8c41..eb437f6 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -240,10 +240,8 @@
*/
mmc@12230000 {
status = "okay";
- slot@0 {
- pinctrl-names = "default";
- pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
- };
+ pinctrl-names = "default";
+ pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
};
i2c@12CD0000 {
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 8c84ab2..a803b60 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -69,7 +69,7 @@
num-slots = <1>;
broken-cd;
bypass-smu;
- supports-highspeed;
+ cap-mmc-highspeed;
supports-hs200-mode; /* 200 Mhz */
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -77,27 +77,19 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 7275bbd..be3e025 100644
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -40,33 +40,25 @@
&mmc_0 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-mmc-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&uart0 {
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 434fd9d..70a559c 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -50,7 +50,6 @@
mmc@12200000 {
status = "okay";
broken-cd;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
@@ -58,16 +57,12 @@
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
vmmc-supply = <&ldo10_reg>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc@12220000 {
status = "okay";
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
@@ -75,11 +70,8 @@
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
vmmc-supply = <&ldo10_reg>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
hsi2c_4: i2c@12CA0000 {
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 228a6b1..7b1ed2c 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -187,7 +187,7 @@
num-slots = <1>;
broken-cd;
caps2-mmc-hs200-1_8v;
- supports-highspeed;
+ cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
clock-frequency = <400000000>;
@@ -196,17 +196,13 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
samsung,dw-mshc-ciu-div = <3>;
@@ -214,11 +210,7 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 6052aa9..8be3d7b 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -76,34 +76,26 @@
mmc@12200000 {
status = "okay";
broken-cd;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc@12220000 {
status = "okay";
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
dp-controller@145B0000 {
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f3ee48b..a587dd6 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -185,7 +185,7 @@
num-slots = <1>;
broken-cd;
caps2-mmc-hs200-1_8v;
- supports-highspeed;
+ cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
clock-frequency = <400000000>;
@@ -194,17 +194,13 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot@0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
samsung,dw-mshc-ciu-div = <3>;
@@ -212,11 +208,7 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
};
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-07 7:38 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-arm-kernel
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
---
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++------
arch/arm/boot/dts/exynos4412-origen.dts | 8 ++------
arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++------
arch/arm/boot/dts/exynos5250-arndale.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 +++++++----------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5250-snow.dts | 6 ++----
arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +++++-----------
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++-----------
arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++-----------
13 files changed, 51 insertions(+), 140 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 6d6d23c..f5c0f81 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -54,17 +54,13 @@
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
watchdog at 10060000 {
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index e925c9f..de15114 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -137,17 +137,13 @@
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
codec at 13400000 {
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 11967f4..5e066cd 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -520,7 +520,6 @@
mmc at 12550000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
non-removable;
card-detect-delay = <200>;
@@ -532,11 +531,8 @@
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
status = "okay";
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
serial at 13800000 {
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index d0de1f5..42a3590 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -401,7 +401,6 @@
mmc_0: mmc at 12200000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -410,17 +409,13 @@
vmmc-supply = <&mmc_reg>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc_2: mmc at 12220000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
@@ -428,12 +423,9 @@
vmmc-supply = <&mmc_reg>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
};
i2s0: i2s at 03830000 {
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
index e603e9c..89034fd 100644
--- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
@@ -89,7 +89,6 @@
mmc at 12200000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -97,33 +96,25 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc at 12220000 {
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- wp-gpios = <&gpc2 1 0>;
- };
+ bus-width = <4>;
+ wp-gpios = <&gpc2 1 0>;
+ cap-sd-highspeed;
};
mmc at 12230000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -131,10 +122,8 @@
samsung,dw-mshc-ddr-timing = <1 2>;
/* See board-specific dts files for pin setup */
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
spi_1: spi at 12d30000 {
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index b4b35ad..6a0f4c0 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -284,7 +284,6 @@
mmc at 12200000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -292,29 +291,22 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc at 12220000 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
};
spi_1: spi at 12d30000 {
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index f2b8c41..eb437f6 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -240,10 +240,8 @@
*/
mmc at 12230000 {
status = "okay";
- slot at 0 {
- pinctrl-names = "default";
- pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
- };
+ pinctrl-names = "default";
+ pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
};
i2c at 12CD0000 {
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 8c84ab2..a803b60 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -69,7 +69,7 @@
num-slots = <1>;
broken-cd;
bypass-smu;
- supports-highspeed;
+ cap-mmc-highspeed;
supports-hs200-mode; /* 200 Mhz */
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
@@ -77,27 +77,19 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 7275bbd..be3e025 100644
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -40,33 +40,25 @@
&mmc_0 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-mmc-highspeed;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&uart0 {
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 434fd9d..70a559c 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -50,7 +50,6 @@
mmc at 12200000 {
status = "okay";
broken-cd;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
@@ -58,16 +57,12 @@
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
vmmc-supply = <&ldo10_reg>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc at 12220000 {
status = "okay";
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
@@ -75,11 +70,8 @@
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
vmmc-supply = <&ldo10_reg>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
hsi2c_4: i2c at 12CA0000 {
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 228a6b1..7b1ed2c 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -187,7 +187,7 @@
num-slots = <1>;
broken-cd;
caps2-mmc-hs200-1_8v;
- supports-highspeed;
+ cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
clock-frequency = <400000000>;
@@ -196,17 +196,13 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
samsung,dw-mshc-ciu-div = <3>;
@@ -214,11 +210,7 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 6052aa9..8be3d7b 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -76,34 +76,26 @@
mmc at 12200000 {
status = "okay";
broken-cd;
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
+ cap-mmc-highspeed;
};
mmc at 12220000 {
status = "okay";
- supports-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-sd-highspeed;
};
dp-controller at 145B0000 {
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f3ee48b..a587dd6 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -185,7 +185,7 @@
num-slots = <1>;
broken-cd;
caps2-mmc-hs200-1_8v;
- supports-highspeed;
+ cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
clock-frequency = <400000000>;
@@ -194,17 +194,13 @@
samsung,dw-mshc-ddr-timing = <0 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <8>;
- };
+ bus-width = <8>;
};
&mmc_2 {
status = "okay";
num-slots = <1>;
- supports-highspeed;
+ cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
samsung,dw-mshc-ciu-div = <3>;
@@ -212,11 +208,7 @@
samsung,dw-mshc-ddr-timing = <1 2>;
pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 4/5] ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-07 7:38 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel,
Jaehoon Chung
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Dinh Nguyen <dinguyen@altera.com>
---
arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++------
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++------
arch/arm/boot/dts/socfpga_vt.dts | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
index 12d1c2c..468fc4c 100644
--- a/arch/arm/boot/dts/socfpga_arria5.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
@@ -29,13 +29,10 @@
dwmmc0@ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
sysmgr@ffd08000 {
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
index bf51182..1ee03c4 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
@@ -30,13 +30,10 @@
dwmmc0@ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
ethernet@ff702000 {
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 09792b4..f9345e0 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -43,13 +43,10 @@
dwmmc0@ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
ethernet@ff700000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 4/5] ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-07 7:38 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-arm-kernel
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Dinh Nguyen <dinguyen@altera.com>
---
arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++------
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++------
arch/arm/boot/dts/socfpga_vt.dts | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
index 12d1c2c..468fc4c 100644
--- a/arch/arm/boot/dts/socfpga_arria5.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
@@ -29,13 +29,10 @@
dwmmc0 at ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
sysmgr at ffd08000 {
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
index bf51182..1ee03c4 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
@@ -30,13 +30,10 @@
dwmmc0 at ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
ethernet at ff702000 {
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 09792b4..f9345e0 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -43,13 +43,10 @@
dwmmc0 at ff704000 {
num-slots = <1>;
- supports-highspeed;
broken-cd;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- };
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
};
ethernet at ff700000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 5/5] ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-07 7:38 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel,
Jaehoon Chung
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
---
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++-----------
arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++-----
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 042f821d..665dd56 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -150,12 +150,8 @@
num-slots = <1>;
status = "okay";
vmmc-supply = <&vcc_sd0>;
-
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&mmc1 { /* wifi */
@@ -166,11 +162,8 @@
pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&uart0 {
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 171b610..ef72faf 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -181,11 +181,8 @@
status = "okay";
vmmc-supply = <&vcc_sd0>;
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&pinctrl {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCHv10 5/5] ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-07 7:38 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-07 7:38 UTC (permalink / raw)
To: linux-arm-kernel
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
---
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++-----------
arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++-----
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 042f821d..665dd56 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -150,12 +150,8 @@
num-slots = <1>;
status = "okay";
vmmc-supply = <&vcc_sd0>;
-
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&mmc1 { /* wifi */
@@ -166,11 +162,8 @@
pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&uart0 {
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 171b610..ef72faf 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -181,11 +181,8 @@
status = "okay";
vmmc-supply = <&vcc_sd0>;
- slot at 0 {
- reg = <0>;
- bus-width = <4>;
- disable-wp;
- };
+ bus-width = <4>;
+ disable-wp;
};
&pinctrl {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [PATCHv10 1/5] mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-11 9:45 ` Ulf Hansson
-1 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2014-08-11 9:45 UTC (permalink / raw)
To: Jaehoon Chung
Cc: linux-mmc, Chris Ball, tgih.jun, devicetree, Heiko Stübner,
dinguyen, Mark Rutland, Kukjin Kim, linux-samsung-soc,
linux-arm-kernel
On 7 August 2014 09:37, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Slot quirks "disable-wp" is deprecated.
> Instead, use the host quirk "disable-wp".
> (Because the slot-node is removed in dt-file.)
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
> Tested-by: Doug Anderson <dianders@chromium.org>
Thanks! Applied for next!
Kind regards
Uffe
> ---
> drivers/mmc/host/dw_mmc.c | 11 +++++++++--
> include/linux/mmc/dw_mmc.h | 2 ++
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 1ac227c..47b52cc 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -997,7 +997,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
> int gpio_ro = mmc_gpio_get_ro(mmc);
>
> /* Use platform get_ro function, else try on board write protect */
> - if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)
> + if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||
> + (slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))
> read_only = 0;
> else if (!IS_ERR_VALUE(gpio_ro))
> read_only = gpio_ro;
> @@ -2021,8 +2022,11 @@ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
>
> /* get quirks */
> for (idx = 0; idx < ARRAY_SIZE(of_slot_quirks); idx++)
> - if (of_get_property(np, of_slot_quirks[idx].quirk, NULL))
> + if (of_get_property(np, of_slot_quirks[idx].quirk, NULL)) {
> + dev_warn(dev, "Slot quirk %s is deprecated\n",
> + of_slot_quirks[idx].quirk);
> quirks |= of_slot_quirks[idx].id;
> + }
>
> return quirks;
> }
> @@ -2238,6 +2242,9 @@ static struct dw_mci_of_quirks {
> {
> .quirk = "broken-cd",
> .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
> + }, {
> + .quirk = "disable-wp",
> + .id = DW_MCI_QUIRK_NO_WRITE_PROTECT,
> },
> };
>
> diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
> index babaea9..29ce014 100644
> --- a/include/linux/mmc/dw_mmc.h
> +++ b/include/linux/mmc/dw_mmc.h
> @@ -213,6 +213,8 @@ struct dw_mci_dma_ops {
> #define DW_MCI_QUIRK_HIGHSPEED BIT(2)
> /* Unreliable card detection */
> #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
> +/* No write protect */
> +#define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4)
>
> /* Slot level quirks */
> /* This slot has no write protect */
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 1/5] mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
@ 2014-08-11 9:45 ` Ulf Hansson
0 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2014-08-11 9:45 UTC (permalink / raw)
To: linux-arm-kernel
On 7 August 2014 09:37, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Slot quirks "disable-wp" is deprecated.
> Instead, use the host quirk "disable-wp".
> (Because the slot-node is removed in dt-file.)
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
> Tested-by: Doug Anderson <dianders@chromium.org>
Thanks! Applied for next!
Kind regards
Uffe
> ---
> drivers/mmc/host/dw_mmc.c | 11 +++++++++--
> include/linux/mmc/dw_mmc.h | 2 ++
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 1ac227c..47b52cc 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -997,7 +997,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
> int gpio_ro = mmc_gpio_get_ro(mmc);
>
> /* Use platform get_ro function, else try on board write protect */
> - if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)
> + if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||
> + (slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))
> read_only = 0;
> else if (!IS_ERR_VALUE(gpio_ro))
> read_only = gpio_ro;
> @@ -2021,8 +2022,11 @@ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
>
> /* get quirks */
> for (idx = 0; idx < ARRAY_SIZE(of_slot_quirks); idx++)
> - if (of_get_property(np, of_slot_quirks[idx].quirk, NULL))
> + if (of_get_property(np, of_slot_quirks[idx].quirk, NULL)) {
> + dev_warn(dev, "Slot quirk %s is deprecated\n",
> + of_slot_quirks[idx].quirk);
> quirks |= of_slot_quirks[idx].id;
> + }
>
> return quirks;
> }
> @@ -2238,6 +2242,9 @@ static struct dw_mci_of_quirks {
> {
> .quirk = "broken-cd",
> .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
> + }, {
> + .quirk = "disable-wp",
> + .id = DW_MCI_QUIRK_NO_WRITE_PROTECT,
> },
> };
>
> diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
> index babaea9..29ce014 100644
> --- a/include/linux/mmc/dw_mmc.h
> +++ b/include/linux/mmc/dw_mmc.h
> @@ -213,6 +213,8 @@ struct dw_mci_dma_ops {
> #define DW_MCI_QUIRK_HIGHSPEED BIT(2)
> /* Unreliable card detection */
> #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
> +/* No write protect */
> +#define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4)
>
> /* Slot level quirks */
> /* This slot has no write protect */
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-11 9:46 ` Ulf Hansson
-1 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2014-08-11 9:46 UTC (permalink / raw)
To: Jaehoon Chung
Cc: linux-mmc, Chris Ball, tgih.jun, devicetree, Heiko Stübner,
dinguyen, Mark Rutland, Kukjin Kim, linux-samsung-soc,
linux-arm-kernel
On 7 August 2014 09:37, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Almost all SoCs use one slot per host controller.
> (Even if controller can support the multiple slot, Recommend to use one slot per host controller.)
> Don't use the slot-node and deprecate the "supports-highspeed" property.
> Instead, use the cap-mmc/sd-highspeed.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
Thanks! Applied for next!
Kind regards
Uffe
> ---
> .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 +++++------------
> .../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 +++++-------
> .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 +++++-------
> 3 files changed, 15 insertions(+), 26 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> index 532b1d4..6cd3525 100644
> --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> @@ -46,13 +46,14 @@ Required Properties:
> - if CIU clock divider value is 0 (that is divide by 1), both tx and rx
> phase shift clocks should be 0.
>
> -Required properties for a slot:
> +Required properties for a slot (Deprecated - Recommend to use one slot per host):
>
> * gpios: specifies a list of gpios used for command, clock and data bus. The
> first gpio is the command line and the second gpio is the clock line. The
> rest of the gpios (depending on the bus-width property) are the data lines in
> no particular order. The format of the gpio specifier depends on the gpio
> controller.
> +(Deprecated - Refer to Documentation/devicetree/binding/pinctrl/samsung-pinctrl.txt)
>
> Example:
>
> @@ -69,21 +70,13 @@ Example:
>
> dwmmc0@12200000 {
> num-slots = <1>;
> - supports-highspeed;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> broken-cd;
> fifo-depth = <0x80>;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,
> - <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,
> - <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,
> - <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,
> - <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;
> - };
> + bus-width = <8>;
> };
> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> index e5bc49f..3b35449 100644
> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> @@ -34,13 +34,11 @@ Example:
> num-slots = <1>;
> vmmc-supply = <&ldo12>;
> fifo-depth = <0x100>;
> - supports-highspeed;
> pinctrl-names = "default";
> pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - cd-gpios = <&gpio10 3 0>;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cd-gpios = <&gpio10 3 0>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
> diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> index 2d4a725..346c609 100644
> --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> @@ -67,7 +67,8 @@ Optional properties:
> * card-detect-delay: Delay in milli-seconds before detecting card after card
> insert event. The default value is 0.
>
> -* supports-highspeed: Enables support for high speed cards (up to 50MHz)
> +* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
> + (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
>
> * broken-cd: as documented in mmc core bindings.
>
> @@ -98,14 +99,11 @@ board specific portions as listed below.
> clock-frequency = <400000000>;
> clock-freq-min-max = <400000 200000000>;
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> fifo-depth = <0x80>;
> card-detect-delay = <200>;
> vmmc-supply = <&buck8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
@ 2014-08-11 9:46 ` Ulf Hansson
0 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2014-08-11 9:46 UTC (permalink / raw)
To: linux-arm-kernel
On 7 August 2014 09:37, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Almost all SoCs use one slot per host controller.
> (Even if controller can support the multiple slot, Recommend to use one slot per host controller.)
> Don't use the slot-node and deprecate the "supports-highspeed" property.
> Instead, use the cap-mmc/sd-highspeed.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
Thanks! Applied for next!
Kind regards
Uffe
> ---
> .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 +++++------------
> .../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 +++++-------
> .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 +++++-------
> 3 files changed, 15 insertions(+), 26 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> index 532b1d4..6cd3525 100644
> --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> @@ -46,13 +46,14 @@ Required Properties:
> - if CIU clock divider value is 0 (that is divide by 1), both tx and rx
> phase shift clocks should be 0.
>
> -Required properties for a slot:
> +Required properties for a slot (Deprecated - Recommend to use one slot per host):
>
> * gpios: specifies a list of gpios used for command, clock and data bus. The
> first gpio is the command line and the second gpio is the clock line. The
> rest of the gpios (depending on the bus-width property) are the data lines in
> no particular order. The format of the gpio specifier depends on the gpio
> controller.
> +(Deprecated - Refer to Documentation/devicetree/binding/pinctrl/samsung-pinctrl.txt)
>
> Example:
>
> @@ -69,21 +70,13 @@ Example:
>
> dwmmc0 at 12200000 {
> num-slots = <1>;
> - supports-highspeed;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> broken-cd;
> fifo-depth = <0x80>;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,
> - <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,
> - <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,
> - <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,
> - <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;
> - };
> + bus-width = <8>;
> };
> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> index e5bc49f..3b35449 100644
> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> @@ -34,13 +34,11 @@ Example:
> num-slots = <1>;
> vmmc-supply = <&ldo12>;
> fifo-depth = <0x100>;
> - supports-highspeed;
> pinctrl-names = "default";
> pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - cd-gpios = <&gpio10 3 0>;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cd-gpios = <&gpio10 3 0>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
> diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> index 2d4a725..346c609 100644
> --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> @@ -67,7 +67,8 @@ Optional properties:
> * card-detect-delay: Delay in milli-seconds before detecting card after card
> insert event. The default value is 0.
>
> -* supports-highspeed: Enables support for high speed cards (up to 50MHz)
> +* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
> + (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
>
> * broken-cd: as documented in mmc core bindings.
>
> @@ -98,14 +99,11 @@ board specific portions as listed below.
> clock-frequency = <400000000>;
> clock-freq-min-max = <400000 200000000>;
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> fifo-depth = <0x80>;
> card-detect-delay = <200>;
> vmmc-supply = <&buck8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 5/5] ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:38 ` Jaehoon Chung
@ 2014-08-11 14:38 ` Heiko Stübner
-1 siblings, 0 replies; 48+ messages in thread
From: Heiko Stübner @ 2014-08-11 14:38 UTC (permalink / raw)
To: Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, tgih.jun,
linux-mmc, Chris Ball, linux-samsung-soc, linux-arm-kernel,
dinguyen
Am Donnerstag, 7. August 2014, 16:38:02 schrieb Jaehoon Chung:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
I've added this one to my queue for 3.18
Heiko
> ---
> arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++-----------
> arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++-----
> 2 files changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 042f821d..665dd56 100644
> --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> @@ -150,12 +150,8 @@
> num-slots = <1>;
> status = "okay";
> vmmc-supply = <&vcc_sd0>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &mmc1 { /* wifi */
> @@ -166,11 +162,8 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
>
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &uart0 {
> diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts
> b/arch/arm/boot/dts/rk3188-radxarock.dts index 171b610..ef72faf 100644
> --- a/arch/arm/boot/dts/rk3188-radxarock.dts
> +++ b/arch/arm/boot/dts/rk3188-radxarock.dts
> @@ -181,11 +181,8 @@
> status = "okay";
> vmmc-supply = <&vcc_sd0>;
>
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &pinctrl {
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 5/5] ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-11 14:38 ` Heiko Stübner
0 siblings, 0 replies; 48+ messages in thread
From: Heiko Stübner @ 2014-08-11 14:38 UTC (permalink / raw)
To: linux-arm-kernel
Am Donnerstag, 7. August 2014, 16:38:02 schrieb Jaehoon Chung:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
I've added this one to my queue for 3.18
Heiko
> ---
> arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++-----------
> arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++-----
> 2 files changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 042f821d..665dd56 100644
> --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> @@ -150,12 +150,8 @@
> num-slots = <1>;
> status = "okay";
> vmmc-supply = <&vcc_sd0>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &mmc1 { /* wifi */
> @@ -166,11 +162,8 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
>
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &uart0 {
> diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts
> b/arch/arm/boot/dts/rk3188-radxarock.dts index 171b610..ef72faf 100644
> --- a/arch/arm/boot/dts/rk3188-radxarock.dts
> +++ b/arch/arm/boot/dts/rk3188-radxarock.dts
> @@ -181,11 +181,8 @@
> status = "okay";
> vmmc-supply = <&vcc_sd0>;
>
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &pinctrl {
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 4/5] ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:38 ` Jaehoon Chung
@ 2014-08-11 21:03 ` Dinh Nguyen
-1 siblings, 0 replies; 48+ messages in thread
From: Dinh Nguyen @ 2014-08-11 21:03 UTC (permalink / raw)
To: Jaehoon Chung
Cc: linux-mmc, Mark Rutland, devicetree, Ulf Hansson, Kukjin Kim,
Heiko Stübner, Seungwon Jeon, Chris Ball, linux-samsung-soc,
linux-arm-kernel, Dinh Nguyen
On Thu, Aug 7, 2014 at 2:38 AM, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Acked-by: Dinh Nguyen <dinguyen@altera.com>
> ---
I've queued this patch in my tree for v3.18.
Thanks,
Dinh
> arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++------
> arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++------
> arch/arm/boot/dts/socfpga_vt.dts | 9 +++------
> 3 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
> index 12d1c2c..468fc4c 100644
> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> @@ -29,13 +29,10 @@
>
> dwmmc0@ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> sysmgr@ffd08000 {
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> index bf51182..1ee03c4 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> @@ -30,13 +30,10 @@
>
> dwmmc0@ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> ethernet@ff702000 {
> diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
> index 09792b4..f9345e0 100644
> --- a/arch/arm/boot/dts/socfpga_vt.dts
> +++ b/arch/arm/boot/dts/socfpga_vt.dts
> @@ -43,13 +43,10 @@
>
> dwmmc0@ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> ethernet@ff700000 {
> --
> 1.7.9.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 4/5] ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-11 21:03 ` Dinh Nguyen
0 siblings, 0 replies; 48+ messages in thread
From: Dinh Nguyen @ 2014-08-11 21:03 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Aug 7, 2014 at 2:38 AM, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
> Acked-by: Dinh Nguyen <dinguyen@altera.com>
> ---
I've queued this patch in my tree for v3.18.
Thanks,
Dinh
> arch/arm/boot/dts/socfpga_arria5.dtsi | 9 +++------
> arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 +++------
> arch/arm/boot/dts/socfpga_vt.dts | 9 +++------
> 3 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
> index 12d1c2c..468fc4c 100644
> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> @@ -29,13 +29,10 @@
>
> dwmmc0 at ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> sysmgr at ffd08000 {
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> index bf51182..1ee03c4 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> @@ -30,13 +30,10 @@
>
> dwmmc0 at ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> ethernet at ff702000 {
> diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
> index 09792b4..f9345e0 100644
> --- a/arch/arm/boot/dts/socfpga_vt.dts
> +++ b/arch/arm/boot/dts/socfpga_vt.dts
> @@ -43,13 +43,10 @@
>
> dwmmc0 at ff704000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> };
>
> ethernet at ff700000 {
> --
> 1.7.9.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-07 7:38 ` Jaehoon Chung
@ 2014-08-18 12:23 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-18 12:23 UTC (permalink / raw)
To: Jaehoon Chung, linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel
Hi, Kukjin.
Socfpga and Rockchip were queued into each SoC tree.
I want to know whether this patch is queued or not into Samsung-Soc tree.
Do you have any other plan for this patch?
Best Regards,
Jaehoon Chung
On 08/07/2014 04:38 PM, Jaehoon Chung wrote:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++------
> arch/arm/boot/dts/exynos4412-origen.dts | 8 ++------
> arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++------
> arch/arm/boot/dts/exynos5250-arndale.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 +++++++----------------
> arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5250-snow.dts | 6 ++----
> arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++-----------
> 13 files changed, 51 insertions(+), 140 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> index 6d6d23c..f5c0f81 100644
> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> @@ -54,17 +54,13 @@
> status = "okay";
>
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> watchdog@10060000 {
> diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
> index e925c9f..de15114 100644
> --- a/arch/arm/boot/dts/exynos4412-origen.dts
> +++ b/arch/arm/boot/dts/exynos4412-origen.dts
> @@ -137,17 +137,13 @@
> status = "okay";
>
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> codec@13400000 {
> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
> index 11967f4..5e066cd 100644
> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> @@ -520,7 +520,6 @@
>
> mmc@12550000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> non-removable;
> card-detect-delay = <200>;
> @@ -532,11 +531,8 @@
> pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
> pinctrl-names = "default";
> status = "okay";
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> serial@13800000 {
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index d0de1f5..42a3590 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -401,7 +401,6 @@
> mmc_0: mmc@12200000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -410,17 +409,13 @@
> vmmc-supply = <&mmc_reg>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc_2: mmc@12220000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -428,12 +423,9 @@
> vmmc-supply = <&mmc_reg>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cap-sd-highspeed;
> };
>
> i2s0: i2s@03830000 {
> diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> index e603e9c..89034fd 100644
> --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> @@ -89,7 +89,6 @@
>
> mmc@12200000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -97,33 +96,25 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc@12220000 {
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - wp-gpios = <&gpc2 1 0>;
> - };
> + bus-width = <4>;
> + wp-gpios = <&gpc2 1 0>;
> + cap-sd-highspeed;
> };
>
> mmc@12230000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -131,10 +122,8 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> /* See board-specific dts files for pin setup */
>
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> spi_1: spi@12d30000 {
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index b4b35ad..6a0f4c0 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -284,7 +284,6 @@
> mmc@12200000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -292,29 +291,22 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc@12220000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cap-sd-highspeed;
> };
>
> spi_1: spi@12d30000 {
> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
> index f2b8c41..eb437f6 100644
> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> @@ -240,10 +240,8 @@
> */
> mmc@12230000 {
> status = "okay";
> - slot@0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
> - };
> + pinctrl-names = "default";
> + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
> };
>
> i2c@12CD0000 {
> diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
> index 8c84ab2..a803b60 100644
> --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
> +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
> @@ -69,7 +69,7 @@
> num-slots = <1>;
> broken-cd;
> bypass-smu;
> - supports-highspeed;
> + cap-mmc-highspeed;
> supports-hs200-mode; /* 200 Mhz */
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -77,27 +77,19 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
> diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
> index 7275bbd..be3e025 100644
> --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
> +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
> @@ -40,33 +40,25 @@
> &mmc_0 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-mmc-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &uart0 {
> diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> index 434fd9d..70a559c 100644
> --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> @@ -50,7 +50,6 @@
> mmc@12200000 {
> status = "okay";
> broken-cd;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <0 4>;
> @@ -58,16 +57,12 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> vmmc-supply = <&ldo10_reg>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc@12220000 {
> status = "okay";
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -75,11 +70,8 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> vmmc-supply = <&ldo10_reg>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> hsi2c_4: i2c@12CA0000 {
> diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> index 228a6b1..7b1ed2c 100644
> --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
> +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> @@ -187,7 +187,7 @@
> num-slots = <1>;
> broken-cd;
> caps2-mmc-hs200-1_8v;
> - supports-highspeed;
> + cap-mmc-highspeed;
> non-removable;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> @@ -196,17 +196,13 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -214,11 +210,7 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> };
>
>
> diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> index 6052aa9..8be3d7b 100644
> --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
> +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> @@ -76,34 +76,26 @@
> mmc@12200000 {
> status = "okay";
> broken-cd;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <0 4>;
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc@12220000 {
> status = "okay";
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> dp-controller@145B0000 {
> diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
> index f3ee48b..a587dd6 100644
> --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
> +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
> @@ -185,7 +185,7 @@
> num-slots = <1>;
> broken-cd;
> caps2-mmc-hs200-1_8v;
> - supports-highspeed;
> + cap-mmc-highspeed;
> non-removable;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> @@ -194,17 +194,13 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -212,11 +208,7 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot@0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> };
>
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-18 12:23 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-18 12:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Kukjin.
Socfpga and Rockchip were queued into each SoC tree.
I want to know whether this patch is queued or not into Samsung-Soc tree.
Do you have any other plan for this patch?
Best Regards,
Jaehoon Chung
On 08/07/2014 04:38 PM, Jaehoon Chung wrote:
> dw-mmc controller can support multiple slots.
> But, there are no use-cases anywhere. So we don't need to support the
> slot-node for dw-mmc controller.
> And "supports-highspeed" property in dw-mmc is deprecated.
> "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tushar Behera <trblinux@gmail.com>
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> Tested-by: Sachin Kamat <sachin.kamat@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++------
> arch/arm/boot/dts/exynos4412-origen.dts | 8 ++------
> arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++------
> arch/arm/boot/dts/exynos5250-arndale.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5250-cros-common.dtsi | 25 +++++++----------------
> arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5250-snow.dts | 6 ++----
> arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +++++-----------
> arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++-----------
> arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++-----------
> 13 files changed, 51 insertions(+), 140 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> index 6d6d23c..f5c0f81 100644
> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> @@ -54,17 +54,13 @@
> status = "okay";
>
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> watchdog at 10060000 {
> diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
> index e925c9f..de15114 100644
> --- a/arch/arm/boot/dts/exynos4412-origen.dts
> +++ b/arch/arm/boot/dts/exynos4412-origen.dts
> @@ -137,17 +137,13 @@
> status = "okay";
>
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> codec at 13400000 {
> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
> index 11967f4..5e066cd 100644
> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> @@ -520,7 +520,6 @@
>
> mmc at 12550000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> non-removable;
> card-detect-delay = <200>;
> @@ -532,11 +531,8 @@
> pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
> pinctrl-names = "default";
> status = "okay";
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> serial at 13800000 {
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index d0de1f5..42a3590 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -401,7 +401,6 @@
> mmc_0: mmc at 12200000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -410,17 +409,13 @@
> vmmc-supply = <&mmc_reg>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc_2: mmc at 12220000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -428,12 +423,9 @@
> vmmc-supply = <&mmc_reg>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cap-sd-highspeed;
> };
>
> i2s0: i2s at 03830000 {
> diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> index e603e9c..89034fd 100644
> --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> @@ -89,7 +89,6 @@
>
> mmc at 12200000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -97,33 +96,25 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc at 12220000 {
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - wp-gpios = <&gpc2 1 0>;
> - };
> + bus-width = <4>;
> + wp-gpios = <&gpc2 1 0>;
> + cap-sd-highspeed;
> };
>
> mmc at 12230000 {
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -131,10 +122,8 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> /* See board-specific dts files for pin setup */
>
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> spi_1: spi at 12d30000 {
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index b4b35ad..6a0f4c0 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -284,7 +284,6 @@
> mmc at 12200000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -292,29 +291,22 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc at 12220000 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> + cap-sd-highspeed;
> };
>
> spi_1: spi at 12d30000 {
> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
> index f2b8c41..eb437f6 100644
> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> @@ -240,10 +240,8 @@
> */
> mmc at 12230000 {
> status = "okay";
> - slot at 0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
> - };
> + pinctrl-names = "default";
> + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
> };
>
> i2c at 12CD0000 {
> diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
> index 8c84ab2..a803b60 100644
> --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
> +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
> @@ -69,7 +69,7 @@
> num-slots = <1>;
> broken-cd;
> bypass-smu;
> - supports-highspeed;
> + cap-mmc-highspeed;
> supports-hs200-mode; /* 200 Mhz */
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -77,27 +77,19 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
> diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
> index 7275bbd..be3e025 100644
> --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
> +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
> @@ -40,33 +40,25 @@
> &mmc_0 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-mmc-highspeed;
> broken-cd;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> + bus-width = <4>;
> + disable-wp;
> };
>
> &uart0 {
> diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> index 434fd9d..70a559c 100644
> --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> @@ -50,7 +50,6 @@
> mmc at 12200000 {
> status = "okay";
> broken-cd;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <0 4>;
> @@ -58,16 +57,12 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> vmmc-supply = <&ldo10_reg>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc at 12220000 {
> status = "okay";
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -75,11 +70,8 @@
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> vmmc-supply = <&ldo10_reg>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> hsi2c_4: i2c at 12CA0000 {
> diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> index 228a6b1..7b1ed2c 100644
> --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
> +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
> @@ -187,7 +187,7 @@
> num-slots = <1>;
> broken-cd;
> caps2-mmc-hs200-1_8v;
> - supports-highspeed;
> + cap-mmc-highspeed;
> non-removable;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> @@ -196,17 +196,13 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -214,11 +210,7 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> };
>
>
> diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> index 6052aa9..8be3d7b 100644
> --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
> +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> @@ -76,34 +76,26 @@
> mmc at 12200000 {
> status = "okay";
> broken-cd;
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <0 4>;
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> + cap-mmc-highspeed;
> };
>
> mmc at 12220000 {
> status = "okay";
> - supports-highspeed;
> card-detect-delay = <200>;
> samsung,dw-mshc-ciu-div = <3>;
> samsung,dw-mshc-sdr-timing = <2 3>;
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> + cap-sd-highspeed;
> };
>
> dp-controller at 145B0000 {
> diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
> index f3ee48b..a587dd6 100644
> --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
> +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
> @@ -185,7 +185,7 @@
> num-slots = <1>;
> broken-cd;
> caps2-mmc-hs200-1_8v;
> - supports-highspeed;
> + cap-mmc-highspeed;
> non-removable;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> @@ -194,17 +194,13 @@
> samsung,dw-mshc-ddr-timing = <0 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <8>;
> - };
> + bus-width = <8>;
> };
>
> &mmc_2 {
> status = "okay";
> num-slots = <1>;
> - supports-highspeed;
> + cap-sd-highspeed;
> card-detect-delay = <200>;
> clock-frequency = <400000000>;
> samsung,dw-mshc-ciu-div = <3>;
> @@ -212,11 +208,7 @@
> samsung,dw-mshc-ddr-timing = <1 2>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> -
> - slot at 0 {
> - reg = <0>;
> - bus-width = <4>;
> - };
> + bus-width = <4>;
> };
>
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-18 12:23 ` Jaehoon Chung
@ 2014-08-18 14:10 ` Andreas Färber
-1 siblings, 0 replies; 48+ messages in thread
From: Andreas Färber @ 2014-08-18 14:10 UTC (permalink / raw)
To: Jaehoon Chung, linux-mmc
Cc: Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko, dinguyen,
Mark Rutland, kgene.kim, linux-samsung-soc, linux-arm-kernel
Hi Jaehoon,
Am 18.08.2014 14:23, schrieb Jaehoon Chung:
> Socfpga and Rockchip were queued into each SoC tree.
> I want to know whether this patch is queued or not into Samsung-Soc tree.
> Do you have any other plan for this patch?
It isn't applied in his tree:
http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
In fact Kukjin has not applied any patches for 3 weeks now, which likely
means he's on vacation. I am hoping he will review this and the other
pending conflicting patches to decide on a merge order and fix any
trivial conflicts himself. ;)
Cheers,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-18 14:10 ` Andreas Färber
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Färber @ 2014-08-18 14:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jaehoon,
Am 18.08.2014 14:23, schrieb Jaehoon Chung:
> Socfpga and Rockchip were queued into each SoC tree.
> I want to know whether this patch is queued or not into Samsung-Soc tree.
> Do you have any other plan for this patch?
It isn't applied in his tree:
http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
In fact Kukjin has not applied any patches for 3 weeks now, which likely
means he's on vacation. I am hoping he will review this and the other
pending conflicting patches to decide on a merge order and fix any
trivial conflicts himself. ;)
Cheers,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-18 14:10 ` Andreas Färber
@ 2014-08-18 16:54 ` Kukjin Kim
-1 siblings, 0 replies; 48+ messages in thread
From: Kukjin Kim @ 2014-08-18 16:54 UTC (permalink / raw)
To: Andreas Färber
Cc: Jaehoon Chung, linux-mmc, Chris Ball, Ulf Hansson, tgih.jun,
devicetree, heiko, dinguyen, Mark Rutland, kgene.kim,
linux-samsung-soc, linux-arm-kernel
On 08/18/14 09:10, Andreas Färber wrote:
> Hi Jaehoon,
>
> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>> Socfpga and Rockchip were queued into each SoC tree.
>> I want to know whether this patch is queued or not into Samsung-Soc tree.
>> Do you have any other plan for this patch?
>
> It isn't applied in his tree:
>
> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>
> In fact Kukjin has not applied any patches for 3 weeks now, which likely
> means he's on vacation. I am hoping he will review this and the other
> pending conflicting patches to decide on a merge order and fix any
> trivial conflicts himself. ;)
>
Oh, I thought it has been queued in previous merge window with my ack.
OK, I've applied this in my tree for 3.18.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-18 16:54 ` Kukjin Kim
0 siblings, 0 replies; 48+ messages in thread
From: Kukjin Kim @ 2014-08-18 16:54 UTC (permalink / raw)
To: linux-arm-kernel
On 08/18/14 09:10, Andreas F?rber wrote:
> Hi Jaehoon,
>
> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>> Socfpga and Rockchip were queued into each SoC tree.
>> I want to know whether this patch is queued or not into Samsung-Soc tree.
>> Do you have any other plan for this patch?
>
> It isn't applied in his tree:
>
> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>
> In fact Kukjin has not applied any patches for 3 weeks now, which likely
> means he's on vacation. I am hoping he will review this and the other
> pending conflicting patches to decide on a merge order and fix any
> trivial conflicts himself. ;)
>
Oh, I thought it has been queued in previous merge window with my ack.
OK, I've applied this in my tree for 3.18.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-18 16:54 ` Kukjin Kim
@ 2014-08-18 17:06 ` Andreas Färber
-1 siblings, 0 replies; 48+ messages in thread
From: Andreas Färber @ 2014-08-18 17:06 UTC (permalink / raw)
To: Kukjin Kim
Cc: Jaehoon Chung, linux-mmc, Chris Ball, Ulf Hansson, tgih.jun,
devicetree, heiko, dinguyen, Mark Rutland, linux-samsung-soc,
linux-arm-kernel
Am 18.08.2014 18:54, schrieb Kukjin Kim:
> On 08/18/14 09:10, Andreas Färber wrote:
>> Hi Jaehoon,
>>
>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>> Socfpga and Rockchip were queued into each SoC tree.
>>> I want to know whether this patch is queued or not into Samsung-Soc
>>> tree.
>>> Do you have any other plan for this patch?
>>
>> It isn't applied in his tree:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>
>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>> means he's on vacation. I am hoping he will review this and the other
>> pending conflicting patches to decide on a merge order and fix any
>> trivial conflicts himself. ;)
>>
> Oh, I thought it has been queued in previous merge window with my ack.
>
> OK, I've applied this in my tree for 3.18.
So, are you dropping the snow mmc pinctrl patch Doug asked you to queue
before this one, and are you merging this with my exynos5250
cros-common/style cleanups yourself or do I need yet another respin?
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-18 17:06 ` Andreas Färber
0 siblings, 0 replies; 48+ messages in thread
From: Andreas Färber @ 2014-08-18 17:06 UTC (permalink / raw)
To: linux-arm-kernel
Am 18.08.2014 18:54, schrieb Kukjin Kim:
> On 08/18/14 09:10, Andreas F?rber wrote:
>> Hi Jaehoon,
>>
>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>> Socfpga and Rockchip were queued into each SoC tree.
>>> I want to know whether this patch is queued or not into Samsung-Soc
>>> tree.
>>> Do you have any other plan for this patch?
>>
>> It isn't applied in his tree:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>
>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>> means he's on vacation. I am hoping he will review this and the other
>> pending conflicting patches to decide on a merge order and fix any
>> trivial conflicts himself. ;)
>>
> Oh, I thought it has been queued in previous merge window with my ack.
>
> OK, I've applied this in my tree for 3.18.
So, are you dropping the snow mmc pinctrl patch Doug asked you to queue
before this one, and are you merging this with my exynos5250
cros-common/style cleanups yourself or do I need yet another respin?
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-18 17:06 ` Andreas Färber
@ 2014-08-18 17:40 ` Kukjin Kim
-1 siblings, 0 replies; 48+ messages in thread
From: Kukjin Kim @ 2014-08-18 17:40 UTC (permalink / raw)
To: Andreas Färber
Cc: Kukjin Kim, Jaehoon Chung, linux-mmc, Chris Ball, Ulf Hansson,
tgih.jun, devicetree, heiko, dinguyen, Mark Rutland,
linux-samsung-soc, linux-arm-kernel
On 08/18/14 12:06, Andreas Färber wrote:
> Am 18.08.2014 18:54, schrieb Kukjin Kim:
>> On 08/18/14 09:10, Andreas Färber wrote:
>>> Hi Jaehoon,
>>>
>>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>>> Socfpga and Rockchip were queued into each SoC tree.
>>>> I want to know whether this patch is queued or not into Samsung-Soc
>>>> tree.
>>>> Do you have any other plan for this patch?
>>>
>>> It isn't applied in his tree:
>>>
>>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>>
>>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>>> means he's on vacation. I am hoping he will review this and the other
>>> pending conflicting patches to decide on a merge order and fix any
>>> trivial conflicts himself. ;)
>>>
>> Oh, I thought it has been queued in previous merge window with my ack.
>>
>> OK, I've applied this in my tree for 3.18.
>
> So, are you dropping the snow mmc pinctrl patch Doug asked you to queue
> before this one, and are you merging this with my exynos5250
> cros-common/style cleanups yourself or do I need yet another respin?
>
Hi Andreas,
Thanks for your gentle reminder and I think I can handle it when I apply
it in my tree :)
Note I will check them today and if any problems, I'll let you know.
- Kukjin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-18 17:40 ` Kukjin Kim
0 siblings, 0 replies; 48+ messages in thread
From: Kukjin Kim @ 2014-08-18 17:40 UTC (permalink / raw)
To: linux-arm-kernel
On 08/18/14 12:06, Andreas F?rber wrote:
> Am 18.08.2014 18:54, schrieb Kukjin Kim:
>> On 08/18/14 09:10, Andreas F?rber wrote:
>>> Hi Jaehoon,
>>>
>>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>>> Socfpga and Rockchip were queued into each SoC tree.
>>>> I want to know whether this patch is queued or not into Samsung-Soc
>>>> tree.
>>>> Do you have any other plan for this patch?
>>>
>>> It isn't applied in his tree:
>>>
>>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>>
>>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>>> means he's on vacation. I am hoping he will review this and the other
>>> pending conflicting patches to decide on a merge order and fix any
>>> trivial conflicts himself. ;)
>>>
>> Oh, I thought it has been queued in previous merge window with my ack.
>>
>> OK, I've applied this in my tree for 3.18.
>
> So, are you dropping the snow mmc pinctrl patch Doug asked you to queue
> before this one, and are you merging this with my exynos5250
> cros-common/style cleanups yourself or do I need yet another respin?
>
Hi Andreas,
Thanks for your gentle reminder and I think I can handle it when I apply
it in my tree :)
Note I will check them today and if any problems, I'll let you know.
- Kukjin
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
2014-08-18 16:54 ` Kukjin Kim
@ 2014-08-19 3:52 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-19 3:52 UTC (permalink / raw)
To: Kukjin Kim, Andreas Färber
Cc: linux-mmc, Chris Ball, Ulf Hansson, tgih.jun, devicetree, heiko,
dinguyen, Mark Rutland, linux-samsung-soc, linux-arm-kernel
Hi, Kukjin
On 08/19/2014 01:54 AM, Kukjin Kim wrote:
> On 08/18/14 09:10, Andreas Färber wrote:
>> Hi Jaehoon,
>>
>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>> Socfpga and Rockchip were queued into each SoC tree.
>>> I want to know whether this patch is queued or not into Samsung-Soc tree.
>>> Do you have any other plan for this patch?
>>
>> It isn't applied in his tree:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>
>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>> means he's on vacation. I am hoping he will review this and the other
>> pending conflicting patches to decide on a merge order and fix any
>> trivial conflicts himself. ;)
>>
> Oh, I thought it has been queued in previous merge window with my ack.
>
> OK, I've applied this in my tree for 3.18.
Thanks!
Best Regards,
Jaehoon Chung
>
> Thanks,
> Kukjin
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
@ 2014-08-19 3:52 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-19 3:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Kukjin
On 08/19/2014 01:54 AM, Kukjin Kim wrote:
> On 08/18/14 09:10, Andreas F?rber wrote:
>> Hi Jaehoon,
>>
>> Am 18.08.2014 14:23, schrieb Jaehoon Chung:
>>> Socfpga and Rockchip were queued into each SoC tree.
>>> I want to know whether this patch is queued or not into Samsung-Soc tree.
>>> Do you have any other plan for this patch?
>>
>> It isn't applied in his tree:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/
>>
>> In fact Kukjin has not applied any patches for 3 weeks now, which likely
>> means he's on vacation. I am hoping he will review this and the other
>> pending conflicting patches to decide on a merge order and fix any
>> trivial conflicts himself. ;)
>>
> Oh, I thought it has been queued in previous merge window with my ack.
>
> OK, I've applied this in my tree for 3.18.
Thanks!
Best Regards,
Jaehoon Chung
>
> Thanks,
> Kukjin
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-07 7:37 ` Jaehoon Chung
@ 2014-08-25 11:21 ` Pavel Machek
-1 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-25 11:21 UTC (permalink / raw)
To: Jaehoon Chung
Cc: linux-mmc, Mark Rutland, devicetree, Ulf Hansson, kgene.kim,
heiko, tgih.jun, Chris Ball, linux-samsung-soc, linux-arm-kernel,
dinguyen
On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
> Since used the mmc_of_parse(), didn't parse the sub-node.
> So we can remove the sub-node, because almost SoC used the only one card per a host.
> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>property.
Would it be better to fix parsing of the device tree, and not to
change all the device trees?
Someone will want to do two slots sooner or later...
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-25 11:21 ` Pavel Machek
0 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-25 11:21 UTC (permalink / raw)
To: linux-arm-kernel
On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
> Since used the mmc_of_parse(), didn't parse the sub-node.
> So we can remove the sub-node, because almost SoC used the only one card per a host.
> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>property.
Would it be better to fix parsing of the device tree, and not to
change all the device trees?
Someone will want to do two slots sooner or later...
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-25 11:21 ` Pavel Machek
@ 2014-08-25 11:28 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 11:28 UTC (permalink / raw)
To: Pavel Machek
Cc: linux-mmc, Mark Rutland, devicetree, Ulf Hansson, kgene.kim,
heiko, tgih.jun, Chris Ball, linux-samsung-soc, linux-arm-kernel,
dinguyen
On 08/25/2014 08:21 PM, Pavel Machek wrote:
> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>> Since used the mmc_of_parse(), didn't parse the sub-node.
>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>> property.
>
> Would it be better to fix parsing of the device tree, and not to
> change all the device trees?
>
> Someone will want to do two slots sooner or later...
>
First, I had considered that controller can be supported the multiple slot.
But MMC maintainers and other people suggested that consider the only one card per a host.
Two slots or more don't have any benefit, (power or performance, etc).
Best Regards,
Jaehoon Chung
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-25 11:28 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 11:28 UTC (permalink / raw)
To: linux-arm-kernel
On 08/25/2014 08:21 PM, Pavel Machek wrote:
> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>> Since used the mmc_of_parse(), didn't parse the sub-node.
>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>> property.
>
> Would it be better to fix parsing of the device tree, and not to
> change all the device trees?
>
> Someone will want to do two slots sooner or later...
>
First, I had considered that controller can be supported the multiple slot.
But MMC maintainers and other people suggested that consider the only one card per a host.
Two slots or more don't have any benefit, (power or performance, etc).
Best Regards,
Jaehoon Chung
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-25 11:28 ` Jaehoon Chung
@ 2014-08-25 11:37 ` Pavel Machek
-1 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-25 11:37 UTC (permalink / raw)
To: Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
> On 08/25/2014 08:21 PM, Pavel Machek wrote:
> > On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
> >> Since used the mmc_of_parse(), didn't parse the sub-node.
> >> So we can remove the sub-node, because almost SoC used the only one card per a host.
> >> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
> >> property.
> >
> > Would it be better to fix parsing of the device tree, and not to
> > change all the device trees?
> >
> > Someone will want to do two slots sooner or later...
> >
>
> First, I had considered that controller can be supported the multiple slot.
> But MMC maintainers and other people suggested that consider the only one card per a host.
> Two slots or more don't have any benefit, (power or performance, etc).
Would you elaborate?
If I have a device like a phone, I may want to put one "slot" inside
phone for basic system, and offer second slot for user expansion
(initially empty).
Or I may want to have internal slot with a card to boot from and have
external slot (initially empty) for system update for embedded system.
I see quite an obvious benefit there.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-25 11:37 ` Pavel Machek
0 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-25 11:37 UTC (permalink / raw)
To: linux-arm-kernel
On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
> On 08/25/2014 08:21 PM, Pavel Machek wrote:
> > On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
> >> Since used the mmc_of_parse(), didn't parse the sub-node.
> >> So we can remove the sub-node, because almost SoC used the only one card per a host.
> >> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
> >> property.
> >
> > Would it be better to fix parsing of the device tree, and not to
> > change all the device trees?
> >
> > Someone will want to do two slots sooner or later...
> >
>
> First, I had considered that controller can be supported the multiple slot.
> But MMC maintainers and other people suggested that consider the only one card per a host.
> Two slots or more don't have any benefit, (power or performance, etc).
Would you elaborate?
If I have a device like a phone, I may want to put one "slot" inside
phone for basic system, and offer second slot for user expansion
(initially empty).
Or I may want to have internal slot with a card to boot from and have
external slot (initially empty) for system update for embedded system.
I see quite an obvious benefit there.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-25 11:37 ` Pavel Machek
@ 2014-08-25 12:09 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 12:09 UTC (permalink / raw)
To: Pavel Machek, Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
On 08/25/2014 08:37 PM, Pavel Machek wrote:
> On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
>> On 08/25/2014 08:21 PM, Pavel Machek wrote:
>>> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>>>> Since used the mmc_of_parse(), didn't parse the sub-node.
>>>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>>>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>>>> property.
>>>
>>> Would it be better to fix parsing of the device tree, and not to
>>> change all the device trees?
>>>
>>> Someone will want to do two slots sooner or later...
>>>
>>
>> First, I had considered that controller can be supported the multiple slot.
>> But MMC maintainers and other people suggested that consider the only one card per a host.
>> Two slots or more don't have any benefit, (power or performance, etc).
>
> Would you elaborate?
>
> If I have a device like a phone, I may want to put one "slot" inside
> phone for basic system, and offer second slot for user expansion
> (initially empty).
if multiple slot is supported, then a mmcqd should be processing for multiple slots.
It's too inefficient, and affect the whole performance reduction.
If want to offer the second slot for user expansion, add the host for expansion slot.
Almost All SoC didn't use the multiple slot per a host controller for eMMC/SD/SDIO.
If Some device(Phone) supports the SD-card and eMMC, then there are two Host IP.
One Host IP is used for eMMC, other is used for SD-card.
this is H/W design issue.
a) You means the below,
One Host IP -------- eMMC
|
---- SD
|
---- SDIO
b) We means the below
One Host IP -------- eMMC
One Host IP -------- SD
One Host IP -------- SDIO
In now, I knew every SoC have used like b) type. I didn't see a) type (especially, dwmmc's case).
If i missed something, let me know, plz.
Best Regards,
Jaehoon Chung
>
> Or I may want to have internal slot with a card to boot from and have
> external slot (initially empty) for system update for embedded system.
>
> I see quite an obvious benefit there.
> Pavel
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-25 12:09 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 12:09 UTC (permalink / raw)
To: linux-arm-kernel
On 08/25/2014 08:37 PM, Pavel Machek wrote:
> On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
>> On 08/25/2014 08:21 PM, Pavel Machek wrote:
>>> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>>>> Since used the mmc_of_parse(), didn't parse the sub-node.
>>>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>>>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>>>> property.
>>>
>>> Would it be better to fix parsing of the device tree, and not to
>>> change all the device trees?
>>>
>>> Someone will want to do two slots sooner or later...
>>>
>>
>> First, I had considered that controller can be supported the multiple slot.
>> But MMC maintainers and other people suggested that consider the only one card per a host.
>> Two slots or more don't have any benefit, (power or performance, etc).
>
> Would you elaborate?
>
> If I have a device like a phone, I may want to put one "slot" inside
> phone for basic system, and offer second slot for user expansion
> (initially empty).
if multiple slot is supported, then a mmcqd should be processing for multiple slots.
It's too inefficient, and affect the whole performance reduction.
If want to offer the second slot for user expansion, add the host for expansion slot.
Almost All SoC didn't use the multiple slot per a host controller for eMMC/SD/SDIO.
If Some device(Phone) supports the SD-card and eMMC, then there are two Host IP.
One Host IP is used for eMMC, other is used for SD-card.
this is H/W design issue.
a) You means the below,
One Host IP -------- eMMC
|
---- SD
|
---- SDIO
b) We means the below
One Host IP -------- eMMC
One Host IP -------- SD
One Host IP -------- SDIO
In now, I knew every SoC have used like b) type. I didn't see a) type (especially, dwmmc's case).
If i missed something, let me know, plz.
Best Regards,
Jaehoon Chung
>
> Or I may want to have internal slot with a card to boot from and have
> external slot (initially empty) for system update for embedded system.
>
> I see quite an obvious benefit there.
> Pavel
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-25 12:09 ` Jaehoon Chung
@ 2014-08-25 12:11 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 12:11 UTC (permalink / raw)
To: Pavel Machek
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
On 08/25/2014 09:09 PM, Jaehoon Chung wrote:
> On 08/25/2014 08:37 PM, Pavel Machek wrote:
>> On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
>>> On 08/25/2014 08:21 PM, Pavel Machek wrote:
>>>> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>>>>> Since used the mmc_of_parse(), didn't parse the sub-node.
>>>>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>>>>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>>>>> property.
>>>>
>>>> Would it be better to fix parsing of the device tree, and not to
>>>> change all the device trees?
>>>>
>>>> Someone will want to do two slots sooner or later...
>>>>
>>>
>>> First, I had considered that controller can be supported the multiple slot.
>>> But MMC maintainers and other people suggested that consider the only one card per a host.
>>> Two slots or more don't have any benefit, (power or performance, etc).
>>
>> Would you elaborate?
>>
>> If I have a device like a phone, I may want to put one "slot" inside
>> phone for basic system, and offer second slot for user expansion
>> (initially empty).
>
> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> It's too inefficient, and affect the whole performance reduction.
Sorry, Discard this comment. it means dwmci, not mmcqd.
>
> If want to offer the second slot for user expansion, add the host for expansion slot.
> Almost All SoC didn't use the multiple slot per a host controller for eMMC/SD/SDIO.
>
> If Some device(Phone) supports the SD-card and eMMC, then there are two Host IP.
> One Host IP is used for eMMC, other is used for SD-card.
>
> this is H/W design issue.
>
> a) You means the below,
>
> One Host IP -------- eMMC
> |
> ---- SD
> |
> ---- SDIO
>
> b) We means the below
> One Host IP -------- eMMC
> One Host IP -------- SD
> One Host IP -------- SDIO
>
> In now, I knew every SoC have used like b) type. I didn't see a) type (especially, dwmmc's case).
>
> If i missed something, let me know, plz.
>
> Best Regards,
> Jaehoon Chung
>
>>
>> Or I may want to have internal slot with a card to boot from and have
>> external slot (initially empty) for system update for embedded system.
>>
>> I see quite an obvious benefit there.
>> Pavel
>>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-25 12:11 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-25 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On 08/25/2014 09:09 PM, Jaehoon Chung wrote:
> On 08/25/2014 08:37 PM, Pavel Machek wrote:
>> On Mon 2014-08-25 20:28:21, Jaehoon Chung wrote:
>>> On 08/25/2014 08:21 PM, Pavel Machek wrote:
>>>> On Thu 2014-08-07 16:37:57, Jaehoon Chung wrote:
>>>>> Since used the mmc_of_parse(), didn't parse the sub-node.
>>>>> So we can remove the sub-node, because almost SoC used the only one card per a host.
>>>>> And supports-highspeed can be replaced with "cap-mmc/sd-highspeed"
>>>>> property.
>>>>
>>>> Would it be better to fix parsing of the device tree, and not to
>>>> change all the device trees?
>>>>
>>>> Someone will want to do two slots sooner or later...
>>>>
>>>
>>> First, I had considered that controller can be supported the multiple slot.
>>> But MMC maintainers and other people suggested that consider the only one card per a host.
>>> Two slots or more don't have any benefit, (power or performance, etc).
>>
>> Would you elaborate?
>>
>> If I have a device like a phone, I may want to put one "slot" inside
>> phone for basic system, and offer second slot for user expansion
>> (initially empty).
>
> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> It's too inefficient, and affect the whole performance reduction.
Sorry, Discard this comment. it means dwmci, not mmcqd.
>
> If want to offer the second slot for user expansion, add the host for expansion slot.
> Almost All SoC didn't use the multiple slot per a host controller for eMMC/SD/SDIO.
>
> If Some device(Phone) supports the SD-card and eMMC, then there are two Host IP.
> One Host IP is used for eMMC, other is used for SD-card.
>
> this is H/W design issue.
>
> a) You means the below,
>
> One Host IP -------- eMMC
> |
> ---- SD
> |
> ---- SDIO
>
> b) We means the below
> One Host IP -------- eMMC
> One Host IP -------- SD
> One Host IP -------- SDIO
>
> In now, I knew every SoC have used like b) type. I didn't see a) type (especially, dwmmc's case).
>
> If i missed something, let me know, plz.
>
> Best Regards,
> Jaehoon Chung
>
>>
>> Or I may want to have internal slot with a card to boot from and have
>> external slot (initially empty) for system update for embedded system.
>>
>> I see quite an obvious benefit there.
>> Pavel
>>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-25 12:11 ` Jaehoon Chung
@ 2014-08-26 10:19 ` Pavel Machek
-1 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-26 10:19 UTC (permalink / raw)
To: Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
Hi!
> >> Would you elaborate?
> >>
> >> If I have a device like a phone, I may want to put one "slot" inside
> >> phone for basic system, and offer second slot for user expansion
> >> (initially empty).
> >
> > if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> > It's too inefficient, and affect the whole performance reduction.
> Sorry, Discard this comment. it means dwmci, not mmcqd.
Well, that's a Linux problem, and for many applications, not even
problem at all.
Device tree should describe hardware, and hardware can do multiple
slots per controller, so device tree should describe multiple slots
per controller.
Now, the configuration may be uncommon, but you are moving from good
hardware description to bad hardware description.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-26 10:19 ` Pavel Machek
0 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-26 10:19 UTC (permalink / raw)
To: linux-arm-kernel
Hi!
> >> Would you elaborate?
> >>
> >> If I have a device like a phone, I may want to put one "slot" inside
> >> phone for basic system, and offer second slot for user expansion
> >> (initially empty).
> >
> > if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> > It's too inefficient, and affect the whole performance reduction.
> Sorry, Discard this comment. it means dwmci, not mmcqd.
Well, that's a Linux problem, and for many applications, not even
problem at all.
Device tree should describe hardware, and hardware can do multiple
slots per controller, so device tree should describe multiple slots
per controller.
Now, the configuration may be uncommon, but you are moving from good
hardware description to bad hardware description.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-26 10:19 ` Pavel Machek
@ 2014-08-27 3:11 ` Jaehoon Chung
-1 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-27 3:11 UTC (permalink / raw)
To: Pavel Machek, Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
Hi,
On 08/26/2014 07:19 PM, Pavel Machek wrote:
> Hi!
>
>>>> Would you elaborate?
>>>>
>>>> If I have a device like a phone, I may want to put one "slot" inside
>>>> phone for basic system, and offer second slot for user expansion
>>>> (initially empty).
>>>
>>> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
>>> It's too inefficient, and affect the whole performance reduction.
>> Sorry, Discard this comment. it means dwmci, not mmcqd.
>
> Well, that's a Linux problem, and for many applications, not even
> problem at all.
>
> Device tree should describe hardware, and hardware can do multiple
> slots per controller, so device tree should describe multiple slots
> per controller.
>
> Now, the configuration may be uncommon, but you are moving from good
> hardware description to bad hardware description.
Well, i don't think it's bad hardware description. And this policy is suggested by other mmc developers and maintainers.
At first time, I had also suggested same opinion with yours.
Refer to below..
https://patchwork.kernel.org/patch/4276481/
Best Regards,
Jaehoon Chung
>
> Pavel
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-27 3:11 ` Jaehoon Chung
0 siblings, 0 replies; 48+ messages in thread
From: Jaehoon Chung @ 2014-08-27 3:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On 08/26/2014 07:19 PM, Pavel Machek wrote:
> Hi!
>
>>>> Would you elaborate?
>>>>
>>>> If I have a device like a phone, I may want to put one "slot" inside
>>>> phone for basic system, and offer second slot for user expansion
>>>> (initially empty).
>>>
>>> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
>>> It's too inefficient, and affect the whole performance reduction.
>> Sorry, Discard this comment. it means dwmci, not mmcqd.
>
> Well, that's a Linux problem, and for many applications, not even
> problem at all.
>
> Device tree should describe hardware, and hardware can do multiple
> slots per controller, so device tree should describe multiple slots
> per controller.
>
> Now, the configuration may be uncommon, but you are moving from good
> hardware description to bad hardware description.
Well, i don't think it's bad hardware description. And this policy is suggested by other mmc developers and maintainers.
At first time, I had also suggested same opinion with yours.
Refer to below..
https://patchwork.kernel.org/patch/4276481/
Best Regards,
Jaehoon Chung
>
> Pavel
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
2014-08-27 3:11 ` Jaehoon Chung
@ 2014-08-27 11:56 ` Pavel Machek
-1 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-27 11:56 UTC (permalink / raw)
To: Jaehoon Chung
Cc: Mark Rutland, devicetree, Ulf Hansson, kgene.kim, heiko,
tgih.jun, linux-mmc, Chris Ball, linux-samsung-soc, dinguyen,
linux-arm-kernel
On Wed 2014-08-27 12:11:55, Jaehoon Chung wrote:
> Hi,
>
> On 08/26/2014 07:19 PM, Pavel Machek wrote:
> > Hi!
> >
> >>>> Would you elaborate?
> >>>>
> >>>> If I have a device like a phone, I may want to put one "slot" inside
> >>>> phone for basic system, and offer second slot for user expansion
> >>>> (initially empty).
> >>>
> >>> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> >>> It's too inefficient, and affect the whole performance reduction.
> >> Sorry, Discard this comment. it means dwmci, not mmcqd.
> >
> > Well, that's a Linux problem, and for many applications, not even
> > problem at all.
> >
> > Device tree should describe hardware, and hardware can do multiple
> > slots per controller, so device tree should describe multiple slots
> > per controller.
> >
> > Now, the configuration may be uncommon, but you are moving from good
> > hardware description to bad hardware description.
>
> Well, i don't think it's bad hardware description. And this policy is suggested by other mmc developers and maintainers.
> At first time, I had also suggested same opinion with yours.
> Refer to below..
Well, I disagree with them. They want to modify device tree because of
linux limitations.
Plus. I guess that sooner or later someone will wire just the slot 1
(not 0) and not match this description.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc.
@ 2014-08-27 11:56 ` Pavel Machek
0 siblings, 0 replies; 48+ messages in thread
From: Pavel Machek @ 2014-08-27 11:56 UTC (permalink / raw)
To: linux-arm-kernel
On Wed 2014-08-27 12:11:55, Jaehoon Chung wrote:
> Hi,
>
> On 08/26/2014 07:19 PM, Pavel Machek wrote:
> > Hi!
> >
> >>>> Would you elaborate?
> >>>>
> >>>> If I have a device like a phone, I may want to put one "slot" inside
> >>>> phone for basic system, and offer second slot for user expansion
> >>>> (initially empty).
> >>>
> >>> if multiple slot is supported, then a mmcqd should be processing for multiple slots.
> >>> It's too inefficient, and affect the whole performance reduction.
> >> Sorry, Discard this comment. it means dwmci, not mmcqd.
> >
> > Well, that's a Linux problem, and for many applications, not even
> > problem at all.
> >
> > Device tree should describe hardware, and hardware can do multiple
> > slots per controller, so device tree should describe multiple slots
> > per controller.
> >
> > Now, the configuration may be uncommon, but you are moving from good
> > hardware description to bad hardware description.
>
> Well, i don't think it's bad hardware description. And this policy is suggested by other mmc developers and maintainers.
> At first time, I had also suggested same opinion with yours.
> Refer to below..
Well, I disagree with them. They want to modify device tree because of
linux limitations.
Plus. I guess that sooner or later someone will wire just the slot 1
(not 0) and not match this description.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2014-08-27 11:56 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-07 7:37 [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc Jaehoon Chung
2014-08-07 7:37 ` Jaehoon Chung
2014-08-07 7:37 ` [PATCHv10 1/5] mmc: dw_mmc: Slot quirk "disable-wp" is deprecated Jaehoon Chung
2014-08-07 7:37 ` Jaehoon Chung
2014-08-11 9:45 ` Ulf Hansson
2014-08-11 9:45 ` Ulf Hansson
2014-08-07 7:37 ` [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Jaehoon Chung
2014-08-07 7:37 ` Jaehoon Chung
2014-08-11 9:46 ` Ulf Hansson
2014-08-11 9:46 ` Ulf Hansson
[not found] ` <1407397082-32495-1-git-send-email-jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2014-08-07 7:38 ` [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc Jaehoon Chung
2014-08-07 7:38 ` Jaehoon Chung
2014-08-18 12:23 ` Jaehoon Chung
2014-08-18 12:23 ` Jaehoon Chung
2014-08-18 14:10 ` Andreas Färber
2014-08-18 14:10 ` Andreas Färber
2014-08-18 16:54 ` Kukjin Kim
2014-08-18 16:54 ` Kukjin Kim
2014-08-18 17:06 ` Andreas Färber
2014-08-18 17:06 ` Andreas Färber
2014-08-18 17:40 ` Kukjin Kim
2014-08-18 17:40 ` Kukjin Kim
2014-08-19 3:52 ` Jaehoon Chung
2014-08-19 3:52 ` Jaehoon Chung
2014-08-07 7:38 ` [PATCHv10 4/5] ARM: dts: socfpga: " Jaehoon Chung
2014-08-07 7:38 ` Jaehoon Chung
2014-08-11 21:03 ` Dinh Nguyen
2014-08-11 21:03 ` Dinh Nguyen
2014-08-07 7:38 ` [PATCHv10 5/5] ARM: dts: rockchip: " Jaehoon Chung
2014-08-07 7:38 ` Jaehoon Chung
2014-08-11 14:38 ` Heiko Stübner
2014-08-11 14:38 ` Heiko Stübner
2014-08-25 11:21 ` [PATCHv10 0/5] ARM: remove the sub-node and deprecate supports-highspeed property for dwmmc Pavel Machek
2014-08-25 11:21 ` Pavel Machek
2014-08-25 11:28 ` Jaehoon Chung
2014-08-25 11:28 ` Jaehoon Chung
2014-08-25 11:37 ` Pavel Machek
2014-08-25 11:37 ` Pavel Machek
2014-08-25 12:09 ` Jaehoon Chung
2014-08-25 12:09 ` Jaehoon Chung
2014-08-25 12:11 ` Jaehoon Chung
2014-08-25 12:11 ` Jaehoon Chung
2014-08-26 10:19 ` Pavel Machek
2014-08-26 10:19 ` Pavel Machek
2014-08-27 3:11 ` Jaehoon Chung
2014-08-27 3:11 ` Jaehoon Chung
2014-08-27 11:56 ` Pavel Machek
2014-08-27 11:56 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.