| Date: | 2013-04-25 21:02:09 (10 years 5 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 5ce73c6d30ef218ad3b829f9385a37565018003b |
| Message: | mmc: jz4740: Add devicetree support Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Files: |
drivers/mmc/host/jz4740_mmc.c (3 diffs) |
Change Details
| drivers/mmc/host/jz4740_mmc.c | ||
|---|---|---|
| 824 | 824 | goto err_cpufreq_unreg; |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | ret = jz4740_mmc_request_gpios(mmc, pdev); | |
| 828 | if (ret) | |
| 829 | goto err_gpio_bulk_free; | |
| 827 | if (pdata) { | |
| 828 | ret = jz4740_mmc_request_gpios(mmc, pdev); | |
| 829 | if (ret) | |
| 830 | goto err_gpio_bulk_free; | |
| 831 | } else { | |
| 832 | mmc_of_parse(mmc); | |
| 833 | } | |
| 830 | 834 | |
| 831 | 835 | ret = mmc_regulator_get_supply(mmc); |
| 832 | 836 | if (ret) |
| ... | ... | |
| 938 | 942 | #define JZ4740_MMC_PM_OPS NULL |
| 939 | 943 | #endif |
| 940 | 944 | |
| 945 | static const struct of_device_id jz4740_mmc_of_match[] = { | |
| 946 | { .compatible = "ingenic,jz4740-msc" }, | |
| 947 | {}, | |
| 948 | }; | |
| 949 | MODULE_DEVICE_TABLE(of, jz4740_mmc_of_match); | |
| 950 | ||
| 941 | 951 | static struct platform_driver jz4740_mmc_driver = { |
| 942 | 952 | .probe = jz4740_mmc_probe, |
| 943 | 953 | .remove = jz4740_mmc_remove, |
| ... | ... | |
| 945 | 955 | .name = "jz4740-mmc", |
| 946 | 956 | .owner = THIS_MODULE, |
| 947 | 957 | .pm = JZ4740_MMC_PM_OPS, |
| 958 | .of_match_table = jz4740_mmc_of_match, | |
| 948 | 959 | }, |
| 949 | 960 | }; |
| 950 | 961 | |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
