mmc: tegra: use bus-width property instead of support-8bit
Subsystems (4)
PATCH 1/2 mmc: tegra: use bus-width property instead of support-8bit
From: Stephen Warren <[email protected]>
Update the driver to parse the new unified bus-width property introduced in commit 7f21779 "mmc: dt: Consolidate DT bindings", instead of the legacy support-8bit property.
---
Chris, It's probably easiest conflict-wise if I take this through the Tegra tree. (Note: When I posted this series before, I said there shouldn't be any conflicts if you take them through the MMC tree. That's probably still true, but unforseen future conflicts seem more likely in the .dts files in the second patch than sdhci-tegra.c in this patch, so the Tegra tree may make more sense). Since the second patch depends on the first, it's easiest if these go in through the same tree. Does this sound OK?
drivers/mmc/host/sdhci-tegra.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/mmc/host/sdhci-tegra.c +4 -1
@@ -223,6 +223,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata( {struct tegra_sdhci_platform_data *plat;struct device_node *np = pdev->dev.of_node; +u32 bus_width;if (!np)return NULL ;
@@ -236,7 +237,9 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata( plat->cd_gpio =of_get_named_gpio (np,"cd-gpios" ,0 ); plat->wp_gpio =of_get_named_gpio (np,"wp-gpios" ,0 ); plat->power_gpio =of_get_named_gpio (np,"power-gpios" ,0 ); -if (of_find_property (np,"support-8bit" ,NULL )) + +if (of_property_read_u32 (np,"bus-width" , &bus_width) ==0 && + bus_width ==8 ) plat->is_8bit =1 ;return plat;
Signature · 1 line
1.7.0.4
PATCH 2/2 ARM: dt: tegra: remove legacy support-8bit property
From: Stephen Warren <[email protected]>
The driver supports the new bus-width property, so remove the legacy support-8bit property.
--- arch/arm/boot/dts/tegra-cardhu.dts | 1 - arch/arm/boot/dts/tegra-harmony.dts | 1 - arch/arm/boot/dts/tegra-paz00.dts | 1 - arch/arm/boot/dts/tegra-seaboard.dts | 1 - arch/arm/boot/dts/tegra-ventana.dts | 1 - arch/arm/boot/dts/tegra-whistler.dts | 2 -- 6 files changed, 0 insertions(+), 7 deletions(-)
arch/arm/boot/dts/tegra-cardhu.dts +0 -1
@@ -144,7 +144,6 @@ sdhci at 78000600 { status = "okay"; - support-8bit; bus-width = <8>; };
arch/arm/boot/dts/tegra-harmony.dts +0 -1
@@ -307,7 +307,6 @@ cd-gpios = <&gpio 58 0>; /* gpio PH2 */ wp-gpios = <&gpio 59 0>; /* gpio PH3 */ power-gpios = <&gpio 70 0>; /* gpio PI6 */ - support-8bit; bus-width = <8>; };
arch/arm/boot/dts/tegra-paz00.dts +0 -1
@@ -301,7 +301,6 @@ sdhci at c8000600 { status = "okay"; - support-8bit; bus-width = <8>; };
arch/arm/boot/dts/tegra-seaboard.dts +0 -1
@@ -397,7 +397,6 @@ sdhci at c8000600 { status = "okay"; - support-8bit; bus-width = <8>; };
arch/arm/boot/dts/tegra-ventana.dts +0 -1
@@ -314,7 +314,6 @@ sdhci at c8000600 { status = "okay"; - support-8bit; bus-width = <8>; };
arch/arm/boot/dts/tegra-whistler.dts +0 -2
@@ -276,13 +276,11 @@ sdhci at c8000400 { status = "okay"; wp-gpios = <&gpio 173 0>; /* gpio PV5 */ - support-8bit; bus-width = <8>; }; sdhci at c8000600 { status = "okay"; - support-8bit; bus-width = <8>; };
Signature · 1 line
1.7.0.4
PATCH 1/2 mmc: tegra: use bus-width property instead of support-8bit
In reply to Stephen WarrenQuoted 7 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Update the driver to parse the new unified bus-width property introduced in commit 7f21779 "mmc: dt: Consolidate DT bindings", instead of the legacy support-8bit property.
Signed-off-by Stephen Warren <[email protected]>
Quoted 8 lines
---
Chris, It's probably easiest conflict-wise if I take this through the Tegra tree. (Note: When I posted this series before, I said there shouldn't be any conflicts if you take them through the MMC tree. That's probably still true, but unforseen future conflicts seem more likely in the .dts files in the second patch thansdhci-tegra.cin this patch, so the Tegra tree may make more sense). Since the second patch depends on the first, it's easiest if these go in through the same tree. Does this sound OK?
Yes, makes sense -- taking this via the Tegra tree is fine:
Thanks!
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH 1/2 mmc: tegra: use bus-width property instead of support-8bit
Quoted 17 lines · Chris Ball
Quoted 7 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Update the driver to parse the new unified bus-width property introduced in commit 7f21779 "mmc: dt: Consolidate DT bindings", instead of the legacy support-8bit property.
Signed-off-by Stephen Warren <[email protected]>Quoted 8 lines
---
Chris, It's probably easiest conflict-wise if I take this through the Tegra tree. (Note: When I posted this series before, I said there shouldn't be any conflicts if you take them through the MMC tree. That's probably still true, but unforseen future conflicts seem more likely in the .dts files in the second patch thansdhci-tegra.cin this patch, so the Tegra tree may make more sense). Since the second patch depends on the first, it's easiest if these go in through the same tree. Does this sound OK?
Quoted 3 lines
Yes, makes sense -- taking this via the Tegra tree is fine:
Acked-by Chris Ball <[email protected]>
Thanks. I have applied the series.