Skip to contentSkip to conversation

arm: samsung: support the second capability for hsmmc

PATCH Superseded Jaehoon Chung 2 participants 2 messages Oct 31, 2011 – Nov 2, 2011

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos MMC, SD and SDIO

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jaehoon Chung

author
#0 lore raw

PATCH 1/2 arm: samsung: support the second capability for hsmmc

Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/plat-samsung/dev-hsmmc.c          |    2 ++
 arch/arm/plat-samsung/dev-hsmmc1.c         |    2 ++
 arch/arm/plat-samsung/dev-hsmmc2.c         |    2 ++
 arch/arm/plat-samsung/dev-hsmmc3.c         |    2 ++
 arch/arm/plat-samsung/include/plat/sdhci.h |    1 +
 5 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/plat-samsung/dev-hsmmc.c +2 -0
index db7a65c..e6b0c58 100644
@@ -74,6 +74,8 @@ void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd)
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
arch/arm/plat-samsung/dev-hsmmc1.c +2 -0
index 2497321..79a5ff2 100644
@@ -74,6 +74,8 @@ void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd)
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
arch/arm/plat-samsung/dev-hsmmc2.c +2 -0
index f60aedb..a590d72 100644
@@ -75,6 +75,8 @@ void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd)
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
arch/arm/plat-samsung/dev-hsmmc3.c +2 -0
index ede776f..afa37c8 100644
@@ -78,6 +78,8 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd)
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
arch/arm/plat-samsung/include/plat/sdhci.h +1 -0
index 058e096..7b48828 100644
@@ -67,6 +67,7 @@ enum clk_types {
 struct s3c_sdhci_platdata {
 	unsigned int	max_width;
 	unsigned int	host_caps;
+	unsigned int	host_caps2;
 	enum cd_types	cd_type;
 	enum clk_types	clk_type;
#1 lore raw
Quoted 2 lines · Jaehoon Chung

Well...
Firstly, you need to add description here why this change is needed. Secondly, you need to check latest maintainer's tree, in this case, the dev-xxx.c are merged into plat-samsung/devs.c ago.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Review

Quoted 11 lines
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/plat-samsung/dev-hsmmc.c          |    2 ++
 arch/arm/plat-samsung/dev-hsmmc1.c         |    2 ++
 arch/arm/plat-samsung/dev-hsmmc2.c         |    2 ++
 arch/arm/plat-samsung/dev-hsmmc3.c         |    2 ++
 arch/arm/plat-samsung/include/plat/sdhci.h |    1 +
 5 files changed, 9 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/arch/arm/plat-samsung/dev-

arch/arm/plat-samsung/dev-hsmmc.c void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata

Quoted 5 lines

hsmmc.c
index db7a65c..e6b0c58 100644

arch/arm/plat-samsung/dev-hsmmc.c +0 -0
@@ -74,6 +74,8 @@ void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata

*pd)

Review

Quoted 9 lines
arch/arm/plat-samsung/dev-hsmmc.c +2 -0
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
(quoted diff) +0 -0

b/arch/arm/plat-samsung/dev-

arch/arm/plat-samsung/dev-hsmmc1.c void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata

Quoted 5 lines

hsmmc1.c
index 2497321..79a5ff2 100644

arch/arm/plat-samsung/dev-hsmmc1.c +0 -0
@@ -74,6 +74,8 @@ void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata

*pd)

Review

Quoted 9 lines
arch/arm/plat-samsung/dev-hsmmc1.c +2 -0
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
(quoted diff) +0 -0

b/arch/arm/plat-samsung/dev-

arch/arm/plat-samsung/dev-hsmmc2.c void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata

Quoted 5 lines

hsmmc2.c
index f60aedb..a590d72 100644

arch/arm/plat-samsung/dev-hsmmc2.c +0 -0
@@ -75,6 +75,8 @@ void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata

*pd)

Review

Quoted 9 lines
arch/arm/plat-samsung/dev-hsmmc2.c +2 -0
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
(quoted diff) +0 -0

b/arch/arm/plat-samsung/dev-

arch/arm/plat-samsung/dev-hsmmc3.c void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata

Quoted 5 lines

hsmmc3.c
index ede776f..afa37c8 100644

arch/arm/plat-samsung/dev-hsmmc3.c +0 -0
@@ -78,6 +78,8 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata

*pd)

Quoted 21 lines
arch/arm/plat-samsung/dev-hsmmc3.c +2 -0
 		set->cfg_card = pd->cfg_card;
 	if (pd->host_caps)
 		set->host_caps |= pd->host_caps;
+	if (pd->host_caps2)
+		set->host_caps2 |= pd->host_caps2;
 	if (pd->clk_type)
 		set->clk_type = pd->clk_type;
 }
arch/arm/plat- renamed from arch/arm/plat-samsung/include/plat/sdhci.h +0 -0

samsung/include/plat/sdhci.h
index 058e096..7b48828 100644

arch/arm/plat-samsung/include/plat/sdhci.h +1 -0
@@ -67,6 +67,7 @@ enum clk_types {
 struct s3c_sdhci_platdata {
 	unsigned int	max_width;
 	unsigned int	host_caps;
+	unsigned int	host_caps2;
 	enum cd_types	cd_type;
 	enum clk_types	clk_type;