linaro-dev September 2011

linaro-dev@lists.linaro.org

149 participants
200 discussions

Start a nNew thread

[Matthew Revell] [Private-canonical-launchpad-stakeholders] Launchpad availability may be disrupted 08.30 UTC weekdays

by James Westby

Hi, For your information. Thanks, James

13 years, 4 months

[PATCH] ASoC: omap: convert per-board modules to platform drivers

by Mans Rullgard

This converts the per-board modules to platform drivers for a device created by in main platform setup. These drivers call snd_soc_register_card() directly instead of going via a "soc-audio" device and the corresponding driver in soc-core. Signed-off-by: Mans Rullgard <mans.rullgard(a)linaro.org> --- Tested on Beagleboard. Other boards only compile-tested. --- arch/arm/mach-omap2/devices.c | 6 +++ sound/soc/omap/am3517evm.c | 55 ++++++++++++++++++++----------- sound/soc/omap/igep0020.c | 52 +++++++++++++++++++---------- sound/soc/omap/n810.c | 71 ++++++++++++++++++++++++++--------------- sound/soc/omap/omap3beagle.c | 55 ++++++++++++++++++++----------- sound/soc/omap/omap3evm.c | 56 +++++++++++++++++++++----------- sound/soc/omap/omap3pandora.c | 70 +++++++++++++++++++++++++--------------- sound/soc/omap/overo.c | 56 ++++++++++++++++++++------------ sound/soc/omap/rx51.c | 55 +++++++++++++++++++++---------- sound/soc/omap/sdp3430.c | 65 +++++++++++++++++++++++-------------- sound/soc/omap/sdp4430.c | 60 ++++++++++++++++++++++------------- sound/soc/omap/zoom2.c | 68 ++++++++++++++++++++++++++------------- 12 files changed, 429 insertions(+), 240 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 5b8ca68..7cb93d9 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -299,6 +299,11 @@ static struct platform_device omap_pcm = { .id = -1, }; +static struct platform_device omap_soc_audio = { + .name = "omap-soc-audio", + .id = -1, +}; + /* * OMAP2420 has 2 McBSP ports * OMAP2430 has 5 McBSP ports @@ -323,6 +328,7 @@ static void omap_init_audio(void) platform_device_register(&omap_mcbsp5); platform_device_register(&omap_pcm); + platform_device_register(&omap_soc_audio); } #else diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index 73dde4a..fcd18af 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -151,45 +151,60 @@ static struct snd_soc_card snd_soc_am3517evm = { .num_links = 1, }; -static struct platform_device *am3517evm_snd_device; - -static int __init am3517evm_soc_init(void) +static int __devinit am3517evm_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_am3517evm; int ret; - if (!machine_is_omap3517evm()) - return -ENODEV; pr_info("OMAP3517 / AM3517 EVM SoC init\n"); - am3517evm_snd_device = platform_device_alloc("soc-audio", -1); - if (!am3517evm_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; + card->dev = &pdev->dev; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; } - platform_set_drvdata(am3517evm_snd_device, &snd_soc_am3517evm); + return 0; +} - ret = platform_device_add(am3517evm_snd_device); - if (ret) - goto err1; +static int __devexit am3517evm_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); return 0; +} -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(am3517evm_snd_device); +static struct platform_driver am3517evm_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, - return ret; + .probe = am3517evm_soc_probe, + .remove = __devexit_p(am3517evm_soc_remove), +}; + +static int __init am3517evm_soc_init(void) +{ + if (!machine_is_omap3517evm()) + return -ENODEV; + + return platform_driver_register(&am3517evm_driver); } +module_init(am3517evm_soc_init); static void __exit am3517evm_soc_exit(void) { - platform_device_unregister(am3517evm_snd_device); + platform_driver_unregister(&am3517evm_driver); } - -module_init(am3517evm_soc_init); module_exit(am3517evm_soc_exit); MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM"); MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c index 0ae3470..ce1e58f 100644 --- a/sound/soc/omap/igep0020.c +++ b/sound/soc/omap/igep0020.c @@ -94,44 +94,60 @@ static struct snd_soc_card snd_soc_card_igep2 = { .num_links = 1, }; -static struct platform_device *igep2_snd_device; - -static int __init igep2_soc_init(void) +static int __devinit igep2_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_card_igep2; int ret; - if (!machine_is_igep0020()) - return -ENODEV; printk(KERN_INFO "IGEP v2 SoC init\n"); - igep2_snd_device = platform_device_alloc("soc-audio", -1); - if (!igep2_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; + card->dev = &pdev->dev; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; } - platform_set_drvdata(igep2_snd_device, &snd_soc_card_igep2); + return 0; +} + +static int __devexit igep2_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); - ret = platform_device_add(igep2_snd_device); - if (ret) - goto err1; + snd_soc_unregister_card(card); return 0; +} + +static struct platform_driver igep2_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = igep2_soc_probe, + .remove = __devexit_p(igep2_soc_remove), +}; -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(igep2_snd_device); +static int __init igep2_soc_init(void) +{ + if (!machine_is_igep0020()) + return -ENODEV; - return ret; + return platform_driver_register(&igep2_driver); } module_init(igep2_soc_init); static void __exit igep2_soc_exit(void) { - platform_device_unregister(igep2_snd_device); + platform_driver_unregister(&igep2_driver); } module_exit(igep2_soc_exit); MODULE_AUTHOR("Enric Balletbo i Serra <eballetbo(a)iseebcn.com>"); MODULE_DESCRIPTION("ALSA SoC IGEP v2"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 83d213b..e8b7ef2 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -323,38 +323,32 @@ static struct snd_soc_card snd_soc_n810 = { .num_links = 1, }; -static struct platform_device *n810_snd_device; - -static int __init n810_soc_init(void) +static int __devinit n810_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_n810; + struct device *dev = &pdev->dev; int err; - struct device *dev; - - if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) - return -ENODEV; - n810_snd_device = platform_device_alloc("soc-audio", -1); - if (!n810_snd_device) - return -ENOMEM; + card->dev = &pdev->dev; - platform_set_drvdata(n810_snd_device, &snd_soc_n810); - err = platform_device_add(n810_snd_device); - if (err) - goto err1; - - dev = &n810_snd_device->dev; + err = snd_soc_register_card(card); + if (err) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + err); + return err; + } sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); if (IS_ERR(sys_clkout2_src)) { dev_err(dev, "Could not get sys_clkout2_src clock\n"); err = PTR_ERR(sys_clkout2_src); - goto err2; + goto err1; } sys_clkout2 = clk_get(dev, "sys_clkout2"); if (IS_ERR(sys_clkout2)) { dev_err(dev, "Could not get sys_clkout2\n"); err = PTR_ERR(sys_clkout2); - goto err3; + goto err2; } /* * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use @@ -364,7 +358,7 @@ static int __init n810_soc_init(void) if (IS_ERR(func96m_clk)) { dev_err(dev, "Could not get func 96M clock\n"); err = PTR_ERR(func96m_clk); - goto err4; + goto err3; } clk_set_parent(sys_clkout2_src, func96m_clk); clk_set_rate(sys_clkout2, 12000000); @@ -376,32 +370,57 @@ static int __init n810_soc_init(void) gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); return 0; -err4: - clk_put(sys_clkout2); err3: - clk_put(sys_clkout2_src); + clk_put(sys_clkout2); err2: - platform_device_del(n810_snd_device); + clk_put(sys_clkout2_src); err1: - platform_device_put(n810_snd_device); + snd_soc_unregister_card(card); return err; } -static void __exit n810_soc_exit(void) +static int __devexit n810_soc_remove(struct platform_device *pdev) { + struct snd_soc_card *card = platform_get_drvdata(pdev); + gpio_free(N810_SPEAKER_AMP_GPIO); gpio_free(N810_HEADSET_AMP_GPIO); clk_put(sys_clkout2_src); clk_put(sys_clkout2); clk_put(func96m_clk); - platform_device_unregister(n810_snd_device); + snd_soc_unregister_card(card); + + return 0; } +static struct platform_driver n810_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = n810_soc_probe, + .remove = __devexit_p(n810_soc_remove), +}; + +static int __init n810_soc_init(void) +{ + if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) + return -ENODEV; + + return platform_driver_register(&n810_driver); +} module_init(n810_soc_init); + +static void __exit n810_soc_exit(void) +{ + platform_driver_unregister(&n810_driver); +} module_exit(n810_soc_exit); MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); MODULE_DESCRIPTION("ALSA SoC Nokia N810"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index 40db813..96e6573 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c @@ -105,45 +105,60 @@ static struct snd_soc_card snd_soc_omap3beagle = { .num_links = 1, }; -static struct platform_device *omap3beagle_snd_device; - -static int __init omap3beagle_soc_init(void) +static int __devinit omap3beagle_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_omap3beagle; int ret; - if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) - return -ENODEV; pr_info("OMAP3 Beagle/Devkit8000 SoC init\n"); - omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); - if (!omap3beagle_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; + card->dev = &pdev->dev; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; } - platform_set_drvdata(omap3beagle_snd_device, &snd_soc_omap3beagle); + return 0; +} - ret = platform_device_add(omap3beagle_snd_device); - if (ret) - goto err1; +static int __devexit omap3beagle_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); return 0; +} -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(omap3beagle_snd_device); +static struct platform_driver omap3beagle_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, - return ret; + .probe = omap3beagle_soc_probe, + .remove = __devexit_p(omap3beagle_soc_remove), +}; + +static int __init omap3beagle_soc_init(void) +{ + if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) + return -ENODEV; + + return platform_driver_register(&omap3beagle_driver); } +module_init(omap3beagle_soc_init); static void __exit omap3beagle_soc_exit(void) { - platform_device_unregister(omap3beagle_snd_device); + platform_driver_unregister(&omap3beagle_driver); } - -module_init(omap3beagle_soc_init); module_exit(omap3beagle_soc_exit); MODULE_AUTHOR("Steve Sakoman <steve(a)sakoman.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 0daa044..be8f57a 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -92,44 +92,60 @@ static struct snd_soc_card snd_soc_omap3evm = { .num_links = 1, }; -static struct platform_device *omap3evm_snd_device; - -static int __init omap3evm_soc_init(void) +static int __devinit omap3evm_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_omap3evm; int ret; - if (!machine_is_omap3evm()) - return -ENODEV; pr_info("OMAP3 EVM SoC init\n"); - omap3evm_snd_device = platform_device_alloc("soc-audio", -1); - if (!omap3evm_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; + card->dev = &pdev->dev; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; } - platform_set_drvdata(omap3evm_snd_device, &snd_soc_omap3evm); - ret = platform_device_add(omap3evm_snd_device); - if (ret) - goto err1; + return 0; +} + +static int __devexit omap3evm_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); return 0; +} + +static struct platform_driver omap3evm_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(omap3evm_snd_device); + .probe = omap3evm_soc_probe, + .remove = __devexit_p(omap3evm_soc_remove), +}; - return ret; +static int __init omap3evm_soc_init(void) +{ + if (!machine_is_omap3evm()) + return -ENODEV; + + return platform_driver_register(&omap3evm_driver); } +module_init(omap3evm_soc_init); static void __exit omap3evm_soc_exit(void) { - platform_device_unregister(omap3evm_snd_device); + platform_driver_unregister(&omap3evm_driver); } - -module_init(omap3evm_soc_init); module_exit(omap3evm_soc_exit); MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 8047c52..c592894 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -252,17 +252,15 @@ static struct snd_soc_card snd_soc_card_omap3pandora = { .num_links = ARRAY_SIZE(omap3pandora_dai), }; -static struct platform_device *omap3pandora_snd_device; - -static int __init omap3pandora_soc_init(void) +static int __devinit omap3pandora_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_card_omap3pandora; int ret; - if (!machine_is_omap3_pandora()) - return -ENODEV; - pr_info("OMAP3 Pandora SoC init\n"); + card->dev = &pdev->dev; + ret = gpio_request(OMAP3_PANDORA_DAC_POWER_GPIO, "dac_power"); if (ret) { pr_err(PREFIX "Failed to get DAC power GPIO\n"); @@ -287,53 +285,71 @@ static int __init omap3pandora_soc_init(void) goto fail1; } - omap3pandora_snd_device = platform_device_alloc("soc-audio", -1); - if (omap3pandora_snd_device == NULL) { - pr_err(PREFIX "Platform device allocation failed\n"); - ret = -ENOMEM; - goto fail1; - } - - platform_set_drvdata(omap3pandora_snd_device, &snd_soc_card_omap3pandora); - - ret = platform_device_add(omap3pandora_snd_device); + ret = snd_soc_register_card(card); if (ret) { - pr_err(PREFIX "Unable to add platform device\n"); - goto fail2; + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + goto fail1; } - omap3pandora_dac_reg = regulator_get(&omap3pandora_snd_device->dev, "vcc"); + omap3pandora_dac_reg = regulator_get(card->dev, "vcc"); if (IS_ERR(omap3pandora_dac_reg)) { pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n", - dev_name(&omap3pandora_snd_device->dev), + dev_name(card->dev), PTR_ERR(omap3pandora_dac_reg)); ret = PTR_ERR(omap3pandora_dac_reg); - goto fail3; + goto fail2; } return 0; -fail3: - platform_device_del(omap3pandora_snd_device); fail2: - platform_device_put(omap3pandora_snd_device); + snd_soc_unregister_card(card); fail1: gpio_free(OMAP3_PANDORA_AMP_POWER_GPIO); fail0: gpio_free(OMAP3_PANDORA_DAC_POWER_GPIO); return ret; } -module_init(omap3pandora_soc_init); -static void __exit omap3pandora_soc_exit(void) +static int __devexit omap3pandora_soc_remove(struct platform_device *pdev) { + struct snd_soc_card *card = platform_get_drvdata(pdev); + regulator_put(omap3pandora_dac_reg); - platform_device_unregister(omap3pandora_snd_device); + snd_soc_unregister_card(card); gpio_free(OMAP3_PANDORA_AMP_POWER_GPIO); gpio_free(OMAP3_PANDORA_DAC_POWER_GPIO); + + return 0; +} + +static struct platform_driver omap3pandora_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = omap3pandora_soc_probe, + .remove = __devexit_p(omap3pandora_soc_remove), +}; + +static int __init omap3pandora_soc_init(void) +{ + if (!machine_is_omap3_pandora()) + return -ENODEV; + + return platform_driver_register(&omap3pandora_driver); +} +module_init(omap3pandora_soc_init); + +static void __exit omap3pandora_soc_exit(void) +{ + platform_driver_unregister(&omap3pandora_driver); } module_exit(omap3pandora_soc_exit); MODULE_AUTHOR("Grazvydas Ignotas <notasas(a)gmail.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 Pandora"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index bbcf380..f2fe508 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -94,46 +94,60 @@ static struct snd_soc_card snd_soc_card_overo = { .num_links = 1, }; -static struct platform_device *overo_snd_device; - -static int __init overo_soc_init(void) +static int __devinit overo_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_card_overo; int ret; - if (!(machine_is_overo() || machine_is_cm_t35())) { - pr_debug("Incomatible machine!\n"); - return -ENODEV; - } - printk(KERN_INFO "overo SoC init\n"); + pr_info("overo SoC init\n"); + + card->dev = &pdev->dev; - overo_snd_device = platform_device_alloc("soc-audio", -1); - if (!overo_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; } - platform_set_drvdata(overo_snd_device, &snd_soc_card_overo); + return 0; +} - ret = platform_device_add(overo_snd_device); - if (ret) - goto err1; +static int __devexit overo_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); return 0; +} + +static struct platform_driver overo_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = overo_soc_probe, + .remove = __devexit_p(overo_soc_remove), +}; -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(overo_snd_device); +static int __init overo_soc_init(void) +{ + if (!(machine_is_overo() || machine_is_cm_t35())) + return -ENODEV; - return ret; + return platform_driver_register(&overo_driver); } module_init(overo_soc_init); static void __exit overo_soc_exit(void) { - platform_device_unregister(overo_snd_device); + platform_driver_unregister(&overo_driver); } module_exit(overo_soc_exit); MODULE_AUTHOR("Steve Sakoman <steve(a)sakoman.com>"); MODULE_DESCRIPTION("ALSA SoC overo"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 0aae998..1392b8c 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -408,14 +408,12 @@ static struct snd_soc_card rx51_sound_card = { .num_configs = ARRAY_SIZE(rx51_codec_conf), }; -static struct platform_device *rx51_snd_device; - -static int __init rx51_soc_init(void) +static int __devinit rx51_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &rx51_sound_card; int err; - if (!machine_is_nokia_rx51()) - return -ENODEV; + card->dev = &pdev->dev; err = gpio_request_one(RX51_TVOUT_SEL_GPIO, GPIOF_DIR_OUT | GPIOF_INIT_LOW, "tvout_sel"); @@ -426,21 +424,14 @@ static int __init rx51_soc_init(void) if (err) goto err_gpio_eci_sw; - rx51_snd_device = platform_device_alloc("soc-audio", -1); - if (!rx51_snd_device) { - err = -ENOMEM; + err = snd_soc_register_card(card); + if (err) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + err); goto err1; } - platform_set_drvdata(rx51_snd_device, &rx51_sound_card); - - err = platform_device_add(rx51_snd_device); - if (err) - goto err2; - return 0; -err2: - platform_device_put(rx51_snd_device); err1: gpio_free(RX51_ECI_SW_GPIO); err_gpio_eci_sw: @@ -450,19 +441,47 @@ err_gpio_tvout_sel: return err; } -static void __exit rx51_soc_exit(void) +static int __devexit rx51_soc_remove(struct platform_device *pdev) { + struct snd_soc_card *card = platform_get_drvdata(pdev); + snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios), rx51_av_jack_gpios); - platform_device_unregister(rx51_snd_device); + snd_soc_unregister_card(card); + gpio_free(RX51_ECI_SW_GPIO); gpio_free(RX51_TVOUT_SEL_GPIO); + + return 0; } +static struct platform_driver rx51_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = rx51_soc_probe, + .remove = __devexit_p(rx51_soc_remove), +}; + +static int __init rx51_soc_init(void) +{ + if (!machine_is_nokia_rx51()) + return -ENODEV; + + return platform_driver_register(&rx51_driver); +} module_init(rx51_soc_init); + +static void __exit rx51_soc_exit(void) +{ + platform_driver_unregister(&rx51_driver); +} module_exit(rx51_soc_exit); MODULE_AUTHOR("Nokia Corporation"); MODULE_DESCRIPTION("ALSA SoC Nokia RX-51"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 3f72d17..99364de 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -289,24 +289,15 @@ static struct snd_soc_card snd_soc_sdp3430 = { .num_links = ARRAY_SIZE(sdp3430_dai), }; -static struct platform_device *sdp3430_snd_device; - -static int __init sdp3430_soc_init(void) +static int __devinit sdp3430_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_sdp3430; int ret; u8 pin_mux; - if (!machine_is_omap_3430sdp()) - return -ENODEV; - printk(KERN_INFO "SDP3430 SoC init\n"); + pr_info("SDP3430 SoC init\n"); - sdp3430_snd_device = platform_device_alloc("soc-audio", -1); - if (!sdp3430_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; - } - - platform_set_drvdata(sdp3430_snd_device, &snd_soc_sdp3430); + card->dev = &pdev->dev; /* Set TWL4030 GPIO6 as EXTMUTE signal */ twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux, @@ -316,30 +307,54 @@ static int __init sdp3430_soc_init(void) twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux, TWL4030_INTBR_PMBR1); - ret = platform_device_add(sdp3430_snd_device); - if (ret) - goto err1; + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; + } return 0; +} -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(sdp3430_snd_device); +static int __devexit sdp3430_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); - return ret; + snd_soc_jack_free_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); + + snd_soc_unregister_card(card); + + return 0; +} + +static struct platform_driver sdp3430_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = sdp3430_soc_probe, + .remove = __devexit_p(sdp3430_soc_remove), +}; + +static int __init sdp3430_soc_init(void) +{ + if (!machine_is_omap_3430sdp()) + return -ENODEV; + + return platform_driver_register(&sdp3430_driver); } module_init(sdp3430_soc_init); static void __exit sdp3430_soc_exit(void) { - snd_soc_jack_free_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios), - hs_jack_gpios); - - platform_device_unregister(sdp3430_snd_device); + platform_driver_unregister(&sdp3430_driver); } module_exit(sdp3430_soc_exit); MODULE_AUTHOR("Misael Lopez Cruz <x0052729(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC SDP3430"); MODULE_LICENSE("GPL"); - +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index 189e039..5062759 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -215,47 +215,63 @@ static struct snd_soc_card snd_soc_sdp4430 = { .num_links = 1, }; -static struct platform_device *sdp4430_snd_device; - -static int __init sdp4430_soc_init(void) +static int __devinit sdp4430_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_sdp4430; int ret; - if (!machine_is_omap_4430sdp()) - return -ENODEV; - printk(KERN_INFO "SDP4430 SoC init\n"); + pr_info("SDP4430 SoC init\n"); - sdp4430_snd_device = platform_device_alloc("soc-audio", -1); - if (!sdp4430_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; - } - - platform_set_drvdata(sdp4430_snd_device, &snd_soc_sdp4430); + card->dev = &pdev->dev; - ret = platform_device_add(sdp4430_snd_device); - if (ret) - goto err; + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + return ret; + } /* Codec starts in HP mode */ twl6040_power_mode = 1; return 0; +} -err: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(sdp4430_snd_device); - return ret; +static int __devexit sdp4430_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); + + return 0; +} + +static struct platform_driver sdp4430_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = sdp4430_soc_probe, + .remove = __devexit_p(sdp4430_soc_remove), +}; + +static int __init sdp4430_soc_init(void) +{ + if (!machine_is_omap_4430sdp()) + return -ENODEV; + + return platform_driver_register(&sdp4430_driver); } module_init(sdp4430_soc_init); static void __exit sdp4430_soc_exit(void) { - platform_device_unregister(sdp4430_snd_device); + platform_driver_unregister(&sdp4430_driver); } module_exit(sdp4430_soc_exit); MODULE_AUTHOR("Misael Lopez Cruz <x0052729(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC SDP4430"); MODULE_LICENSE("GPL"); - +MODULE_ALIAS("platform:omap-soc-audio"); diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 0170994..f1bd25a 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -239,26 +239,14 @@ static struct snd_soc_card snd_soc_zoom2 = { .num_links = ARRAY_SIZE(zoom2_dai), }; -static struct platform_device *zoom2_snd_device; - -static int __init zoom2_soc_init(void) +static int __devinit zoom2_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &snd_soc_zoom2; int ret; - if (!machine_is_omap_zoom2()) - return -ENODEV; - printk(KERN_INFO "Zoom2 SoC init\n"); + pr_info("Zoom2 SoC init\n"); - zoom2_snd_device = platform_device_alloc("soc-audio", -1); - if (!zoom2_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; - } - - platform_set_drvdata(zoom2_snd_device, &snd_soc_zoom2); - ret = platform_device_add(zoom2_snd_device); - if (ret) - goto err1; + card->dev = &pdev->dev; BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0); gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0); @@ -266,26 +254,60 @@ static int __init zoom2_soc_init(void) BUG_ON(gpio_request(ZOOM2_HEADSET_EXTMUTE_GPIO, "ext_mute") < 0); gpio_direction_output(ZOOM2_HEADSET_EXTMUTE_GPIO, 0); + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + goto err; + } + return 0; -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(zoom2_snd_device); +err: + gpio_free(ZOOM2_HEADSET_MUX_GPIO); + gpio_free(ZOOM2_HEADSET_EXTMUTE_GPIO); return ret; } -module_init(zoom2_soc_init); -static void __exit zoom2_soc_exit(void) +static int __devexit zoom2_soc_remove(struct platform_device *pdev) { + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); + gpio_free(ZOOM2_HEADSET_MUX_GPIO); gpio_free(ZOOM2_HEADSET_EXTMUTE_GPIO); - platform_device_unregister(zoom2_snd_device); + return 0; +} + +static struct platform_driver zoom2_driver = { + .driver = { + .name = "omap-soc-audio", + .owner = THIS_MODULE, + }, + + .probe = zoom2_soc_probe, + .remove = __devexit_p(zoom2_soc_remove), +}; + +static int __init zoom2_soc_init(void) +{ + if (!machine_is_omap_zoom2()) + return -ENODEV; + + return platform_driver_register(&zoom2_driver); +} +module_init(zoom2_soc_init); + +static void __exit zoom2_soc_exit(void) +{ + platform_driver_unregister(&zoom2_driver); } module_exit(zoom2_soc_exit); MODULE_AUTHOR("Misael Lopez Cruz <x0052729(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC Zoom2"); MODULE_LICENSE("GPL"); - +MODULE_ALIAS("platform:omap-soc-audio"); -- 1.7.6.1

13 years, 4 months

Memory Management Documentation effort

by Benjamin Gaignard

Hello, I'm writing documentation about CMA ( https://wiki.linaro.org/OfficeofCTO/MemoryManagement?action=AttachFile&do=v… ) and DMA_Buf ( https://wiki.linaro.org/OfficeofCTO/MemoryManagement?action=AttachFile&do=v… ) The goal is to explain outside the Linaro community how CMA and DMA_Buf works. I have tried to summarize my understanding in few slides and now I need you to review and comment this first draft. Additionnal info about who is doing what and when it will be delivered are welcome. Regards, Benjamin -- Benjamin Gaignard Multimedia Working Group Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs ** Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter<http://twitter.com/#!/linaroorg> | Blog <http://www.linaro.org/linaro-blog/>

13 years, 4 months

Non-FOSS license acceptance by robots

by Tony Mansson

Hello, This is a question about the debian installation mechanism. Linaro is all about Open Source, but must be able to manage closed source binaries from member companies. Typically h/w packs. Some legal depts. requires a conscious action as proof of acceptance of the license. This produces various technical problems in automation, e.g. update management or creation of images because the software scripts that updates or create images are not conscious :) The Snowball s/w design team decided to use the debian mechanism for license acceptance of h/w-pack binaries, so there are pop-ups when you run Linaro-Media-Create. Here's the problem: When Validation creates new images all the time, the conscious action "click through" must be replaced by the conscious action "I am the maintainer of this Validation farm, I hereby accept the license once and for all and from now on l-m-c will not pop up the licenses in any of *these* packages that are automatically installed in my lab". How can this be done *technically*? Doesn't automated installation of Ubuntu systems containing non-free packages encounter the same problem? BR, Tony

13 years, 4 months

[ACTIVITY] Android Platform Team 2011-08-29 to 2011-09-04

by Tony Mansson

Key Points for wider discussion =============================== * libjpeg-turbo 1.1.90 integrated into Android * 11.09 BPs finalized and in execution phaze Team Highlights =============================== * Good Progress on Panda Bluetooth enablement * Good Progress on Panda WLAN enablement * Progress on the Multimedia Test app * Progres on ADB for all boards * Progress on stabilizing Powertop on Android * Progress on Gerrit -> LAVA integration Miscellaneous =============================== * Imminent activities in management and administration: * 11.08 review page (Post Mortem) to be completed. https://wiki.linaro.org/Cycles/1108/Release/Review#Developer_Platform * 11.09 Release page to be completed. https://wiki.linaro.org/Cycles/1109/Release/Blueprints * Abhishek Paliwal (Bangalore) has started. Will work with Android Validation. * fgiff will be on vacation 2011-09-26 to 2011-10-07.

13 years, 4 months

Re: Linaro 11.08 released

by Dave Martin

Hi there A few questions-- a) Is the omission of the "Developers and Community Builds" links from http://www.linaro.org/downloads/ intentional? This is a concern, because these links contain the _only_ deliverables for certain platform and filesystem combinations. The wiki release page itself is not easily findable without going to the wiki. b) The release page on the wiki contains important information like the list of known issues. Shouldn't this page be linked from http://www.linaro.org/downloads/ or some other prominent location? I don't see how to get to it at present. A visitor won't know that they have to go to the wiki for this information. c) The known issues list on the wiki release page doesn't seem include all the issues reported during testing. Will these get propagated, or is it the responsibility of testers to add the relevant information to the known issues list themselves? d) For vexpress specifically, there is no link from the release pages or downloads to the specific installation instructions applicable to this board. Even I find these difficult to find without bookmarking. Because that information is very board-specific, I don't think it needs to be included on https://wiki.linaro.org/Platform/DevPlatform/Ubuntu/ImageInstallation -- but can we at least have a link on there pointing to the appropriate page? Cheers ---Dave On Fri, Aug 26, 2011 at 3:04 AM, Fathi Boudra <fathi.boudra(a)linaro.org> wrote: > Hi, > > The Linaro Team is pleased to announce the release of Linaro 11.08. > > 11.08 is the Linaro’s third release delivered on the new monthly cadence. > Once again, this release includes components delivered by all Working Groups, > Landing Teams and Platform Teams, bringing the best of Linaro Technology > integrated on top of Android and Ubuntu based images. > > In total this makes an impressive thirty components and two platform builds > from all Linaro engineering teams in one shot. And again, most of this comes > nicely integrated into Android and Ubuntu platform builds. This release made > it again hard to select a handful of highlights from a list of roughly > 80 deliverables that went into this release. > > However, if we had to choose we would like to emphasize the update of > linux-linaro to the 3.0.3 stable kernel including the merge of 3.1-rc1 core ARM > updates, Linaro GCC 4.6 2011.08 release based on latest upstream version, and > Linaro Cross Toolchain 2011.07 builds. In addition, the Android Team delivers > the enablement of all of our primary boards, compiled with the Linaro 11.08 > toolchain release based on GCC 4.6 and running Android 2.3.5. > > We encourage everybody to use the 11.08 release. The download links for all > images and components are available on our release page: > > http://wiki.linaro.org/Cycles/1108/Release > > See the detailed highlights of this release to get a better overview of what > was done by the individual teams. The release details are linked from > the "Details" column for each release artifact on the release information: > > http://wiki.linaro.org/Cycles/1108/Release#Release_Information > > Using the Android-based images > ============================== > > The Android-based images come in three parts: system, userdata and boot. > These need to be combined to form a complete Android install. For an > explanation of how to do this please see: > > http://wiki.linaro.org/Platform/Android/ImageInstallation > > If you are interested in getting the source and building these images > yourself please see the following pages: > > http://wiki.linaro.org/Platform/Android/GetSource > http://wiki.linaro.org/Platform/Android/BuildSource > > Using the Ubuntu-based images > ============================= > > The Ubuntu-based images consist of two parts. The first part is a hardware > pack, which can be found under the hwpacks directory and contains hardware > specific packages (such as the kernel and bootloader). The second part is > the rootfs, which is combined with the hardware pack to create a complete > image. For more information on how to create an image please see: > > http://wiki.linaro.org/Platform/DevPlatform/Ubuntu/ImageInstallation > > Getting involved > ================ > > More information on Linaro can be found on our websites: > > * Homepage: http://www.linaro.org > * Wiki: http://wiki.linaro.org > > Also subscribe to the important Linaro mailing lists and join our IRC > channels to stay on top of Linaro developments: > > * Announcements: > http://lists.linaro.org/mailman/listinfo/linaro-announce > * Development: > http://lists.linaro.org/mailman/listinfo/linaro-dev > * IRC: > #linaro on irc.linaro.org or irc.freenode.net > #linaro-android irc.linaro.org or irc.freenode.net > > Known issues with this release > ============================== > > For any errata issues, please see: > > http://wiki.linaro.org/Cycles/1108/Release#Known_Issues > > Bug reports for this release should be filed in Launchpad against the > individual packages that are affected. If a suitable package cannot be > identified, feel free to assign them to: > > http://www.launchpad.net/linaro > > Cheers, > > -- > Fathi Boudra, on behalf of the Release Team > Linaro Release Manager | Platform Project Manager > Linaro.org | Open source software for ARM SoCs > > _______________________________________________ > linaro-announce mailing list > linaro-announce(a)lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-announce > -- Dave Martin <dave.martin(a)linaro.org> Linaro Kernel Working Group -- http://www.linaro.org/ -- Open source software for ARM SoCs http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg http://www.linaro.org/linaro-blog/

13 years, 4 months

[PATCH v2] ASoC: omap: add MODULE_ALIAS to mcbsp and pcm drivers

by Mans Rullgard

This adds MODULE_ALIAS directives to the omap-mcbsp-dai and omap-pcm-audio drivers so they can be auto-loaded when platform devices are scanned. Signed-off-by: Mans Rullgard <mans.rullgard(a)linaro.org> --- sound/soc/omap/omap-mcbsp.c | 1 + sound/soc/omap/omap-pcm.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 07b7723..5ddfadd 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -783,3 +783,4 @@ module_exit(snd_omap_mcbsp_exit); MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); MODULE_DESCRIPTION("OMAP I2S SoC Interface"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-mcbsp-dai"); diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index e6a6b99..f19ccc1 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -437,3 +437,4 @@ module_exit(snd_omap_pcm_exit); MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); MODULE_DESCRIPTION("OMAP PCM DMA module"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:omap-pcm-audio"); -- 1.7.6.1

13 years, 4 months

[PATCH] ARM: EXYNOS4: Add HDMI support for Origen

by Sachin Kamat

This patch adds HDMI (TVout) support for Origen board. This patch is based on for-next branch of Kukjin Kim's tree: http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=summary This patch is tested using Hatim's patch: http://www.spinics.net/lists/linux-samsung-soc/msg06367.html Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- arch/arm/mach-exynos4/Kconfig | 2 ++ arch/arm/mach-exynos4/mach-origen.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 181fb04..4f908f7 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -225,6 +225,8 @@ config MACH_ORIGEN select S3C_DEV_WDT select S3C_DEV_HSMMC2 select EXYNOS4_SETUP_SDHCI + select S5P_DEV_I2C_HDMIPHY + select S5P_DEV_TV help Machine support for ORIGEN based on Samsung EXYNOS4210 diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86..6ec68ee 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -81,8 +81,11 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, + &s5p_device_i2c_hdmiphy, &s3c_device_rtc, &s3c_device_wdt, + &s5p_device_hdmi, + &s5p_device_mixer, }; static void __init origen_map_io(void) @@ -95,6 +98,7 @@ static void __init origen_map_io(void) static void __init origen_machine_init(void) { s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); + s5p_i2c_hdmiphy_set_platdata(NULL); platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); } -- 1.7.4.1

13 years, 4 months

[RESEND PATCH] ARM: EXYNOS4: Add machine support for 7" LCD on ORIGEN

by Tushar Behera

ORIGEN board is fitted with 7" LCD panel HV070WSA. The pixel resolution of the LCD panel is 1024x600. Signed-off-by: Tushar Behera <tushar.behera(a)linaro.org> --- The original patch-mail bounced back from linux-samsung-soc(a)vger.kernel.org, hence resending the patch again. The patch is rebased on [1]. For proper working of LCD on ORIGEN, following patches are needed. These patches are already submitted to the mailing list. a. ARM: EXYNOS4: Add PWM backlight support on Origen Author: Giridhar Maruthy b. ARM: EXYNOS4: Configure MAX8997 PMIC for Origen Author: Inderpal Singh [1] git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git arch/arm/mach-exynos4/Kconfig | 2 + arch/arm/mach-exynos4/mach-origen.c | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 48f18f7..8656f49 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -222,6 +222,8 @@ config MACH_ORIGEN select S3C_DEV_RTC select S3C_DEV_WDT select S3C_DEV_HSMMC2 + select S5P_DEV_FIMD0 + select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_SDHCI help Machine support for ORIGEN based on Samsung EXYNOS4210 diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86..f2cea78 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -14,16 +14,21 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/input.h> +#include <linux/lcd.h> + +#include <video/platform_lcd.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <plat/regs-serial.h> +#include <plat/regs-fb-v4.h> #include <plat/exynos4.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/sdhci.h> #include <plat/iic.h> +#include <plat/fb.h> #include <mach/map.h> @@ -79,10 +84,54 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, }; +static void lcd_hv070wsa_set_power(struct plat_lcd_data *pd, unsigned int power) +{ + int gpio = EXYNOS4_GPE3(4); + + gpio_request(gpio, "GPE3_4"); + gpio_direction_output(gpio, power); + gpio_free(gpio); +} + +static struct plat_lcd_data origen_lcd_hv070wsa_data = { + .set_power = lcd_hv070wsa_set_power, +}; + +static struct platform_device origen_lcd_hv070wsa = { + .name = "platform-lcd", + .dev.parent = &s5p_device_fimd0.dev, + .dev.platform_data = &origen_lcd_hv070wsa_data, +}; + +static struct s3c_fb_pd_win origen_fb_win0 = { + .win_mode = { + .left_margin = 64, + .right_margin = 16, + .upper_margin = 64, + .lower_margin = 16, + .hsync_len = 48, + .vsync_len = 3, + .xres = 1024, + .yres = 600, + .refresh = 60, + }, + .max_bpp = 32, + .default_bpp = 24, +}; + +static struct s3c_fb_platdata origen_lcd_pdata __initdata = { + .win[0] = &origen_fb_win0, + .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, + .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, + .setup_gpio = exynos4_fimd0_gpio_setup_24bpp, +}; + static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, &s3c_device_rtc, &s3c_device_wdt, + &s5p_device_fimd0, + &origen_lcd_hv070wsa, }; static void __init origen_map_io(void) @@ -95,6 +144,7 @@ static void __init origen_map_io(void) static void __init origen_machine_init(void) { s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); + s5p_fimd0_set_platdata(&origen_lcd_pdata); platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); } -- 1.7.4.1

13 years, 4 months

Fwd: Would you send me your hard float experiment results you presented in Budapest?

by Zach Pfeffer

Steve, I'd like you to meet Jim who did the initial hardfloat work. This email contains the results that Jim produced. I believe that the conclusion was that skia and webkit may benefit, but that such benefits would impose an undue burden on Android's distribution model which tries to create libs that can run on as many architectures as possible. -Zach ---------- Forwarded message ---------- From: Jim Huang <jserv(a)0xlab.org> Date: 7 August 2011 18:01 Subject: Re: Would you send me your hard float experiment results you presented in Budapest? To: Zach Pfeffer <zach.pfeffer(a)linaro.org> 2011/8/7 Zach Pfeffer <zach.pfeffer(a)linaro.org>: > Jim, > > Thanks. Would it be possible to post them by the end of the day? skia -> Switch from VFP back to fixed scalar based calculation Previous configuration enabled ARM VFP for scalar float, but VFP on ARM11 is not as powerful as VFPv3 or NEON. Reference benchmark: Item Fixed based VFP-based ------------ ----------- --------- Draw Canvas 58.37 fps 58.40 fps Draw Circle 37.48 fps 22.93 fps Draw Circle2 17.14 fps 18.31 fps Draw Rect 17.62 fps 20.69 fps Draw Arc 24.79 fps 27.45 fps Draw Image 19.08 fps 18.73 fps Draw Text 29.22 fps 25.79 fps > > Also, have you sync'd up with Mike? He wants to negotiate on your contract. I sent mail to Mike already. I don't know how to proceed. Thanks, -jserv

13 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev September 2011