From: Linus Torvalds Date: Thu, 13 Dec 2012 19:51:23 +0000 (-0800) Subject: Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound X-Git-Tag: firefly_0821_release~3680^2~1474 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=046e7d685bc370fd4c879ab6635ad3f69e6673d1;p=firefly-linux-kernel-4.4.55.git Merge tag 'sound-3.8' of git://git./linux/kernel/git/tiwai/sound Pull sound updates from Takashi Iwai: "This update contains a fairly wide range of changes all over in sound subdirectory, mainly because of UAPI header moves by David and __dev* annotation removals by Bill. Other highlights are: - Introduced the support for wallclock timestamps in ALSA PCM core - Add the poll loop implementation for HD-audio jack detection - Yet more VGA-switcheroo fixes for HD-audio - New VIA HD-audio codec support - More fixes on resource management in USB audio and MIDI drivers - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite, Roland VG-99, etc - Add support for FastTrack C400 usb-audio - Clean ups in many drivers regarding firmware loading - Add PSC724 Ultiimate Edge support to ice1712 - A few hdspm driver updates - New Stanton SCS.1d/1m FireWire driver - Standardisation of the logging in ASoC codes - DT and dmaengine support for ASoC Atmel - Support for Wolfson ADSP cores - New drivers for Freescale/iVeia P1022 and Maxim MAX98090 - Lots of other ASoC driver fixes and developments" Fix up trivial conflicts. And go out on a limb and assume the dts file 'status' field of one of the conflicting things was supposed to be "disabled", not "disable" like in pretty much all other cases. * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits) ALSA: hda - Move runtime PM check to runtime_idle callback ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522 ALSA: hda - Avoid doubly suspend after vga switcheroo ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3 ALSA: hda - Check validity of CORB/RIRB WP reads ALSA: hda - use usleep_range in link reset and change timeout check ALSA: HDA: VIA: Add support for codec VT1808. ALSA: HDA: VIA Add support for codec VT1705CF. ASoC: codecs: remove __dev* attributes ASoC: utils: remove __dev* attributes ASoC: ux500: remove __dev* attributes ASoC: txx9: remove __dev* attributes ASoC: tegra: remove __dev* attributes ASoC: spear: remove __dev* attributes ASoC: sh: remove __dev* attributes ASoC: s6000: remove __dev* attributes ASoC: OMAP: remove __dev* attributes ASoC: nuc900: remove __dev* attributes ASoC: mxs: remove __dev* attributes ASoC: kirkwood: remove __dev* attributes ... --- 046e7d685bc370fd4c879ab6635ad3f69e6673d1 diff --cc arch/arm/boot/dts/at91sam9260.dtsi index c528b4b429b9,aaa42d8d4f88..68bccf41a2c6 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@@ -436,15 -213,13 +437,22 @@@ status = "disabled"; }; + mmc0: mmc@fffa8000 { + compatible = "atmel,hsmci"; + reg = <0xfffa8000 0x600>; + interrupts = <9 4 0>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + ssc0: ssc@fffbc000 { + compatible = "atmel,at91rm9200-ssc"; + reg = <0xfffbc000 0x4000>; + interrupts = <14 4 5>; - status = "disable"; ++ status = "disabled"; + }; + adc0: adc@fffe0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffe0000 0x100>; diff --cc arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 32a500a0e481,2dcec8de759f..da15e83e7f17 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@@ -59,28 -62,10 +69,33 @@@ status = "okay"; }; + mmc0: mmc@fffa8000 { + pinctrl-0 = < + &pinctrl_board_mmc0_slot1 + &pinctrl_mmc0_clk + &pinctrl_mmc0_slot1_cmd_dat0 + &pinctrl_mmc0_slot1_dat1_3>; + status = "okay"; + slot@1 { + reg = <1>; + bus-width = <4>; + cd-gpios = <&pioC 9 0>; + }; + }; + + pinctrl@fffff400 { + mmc0_slot1 { + pinctrl_board_mmc0_slot1: mmc0_slot1-board { + atmel,pins = + <2 9 0x0 0x5>; /* PC9 gpio CD pin pull up and deglitch */ + }; + }; + }; ++ + ssc0: ssc@fffbc000 { + status = "okay"; + pinctrl-0 = <&pinctrl_ssc0_tx>; + }; }; nand0: nand@40000000 { diff --cc arch/arm/mach-at91/at91sam9x5.c index dfb2c0c13fb5,18fbbb27f97f..44a9a62dcc13 --- a/arch/arm/mach-at91/at91sam9x5.c +++ b/arch/arm/mach-at91/at91sam9x5.c @@@ -229,10 -229,9 +229,11 @@@ static struct clk_lookup periph_clocks_ CLKDEV_CON_DEV_ID("usart", "f8028000.serial", &usart3_clk), CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb0_clk), CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk), + CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc0_clk), + CLKDEV_CON_DEV_ID("mci_clk", "f000c000.mmc", &mmc1_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk), + CLKDEV_CON_DEV_ID("pclk", "f0010000.ssc", &ssc_clk), CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk), CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk), diff --cc arch/arm/plat-samsung/include/plat/devs.h index f53beba2b63d,c45f70cbbfb7..87d501ff3328 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@@ -132,7 -133,8 +132,6 @@@ extern struct platform_device exynos4_d extern struct platform_device exynos4_device_pcm2; extern struct platform_device exynos4_device_spdif; - extern struct platform_device samsung_asoc_dma; -extern struct platform_device exynos_device_drm; - extern struct platform_device samsung_asoc_idma; extern struct platform_device samsung_device_keypad; diff --cc drivers/mfd/wm8994-core.c index c7f62ac544ad,45a20c573aa3..bcb226ff9d2b --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@@ -399,9 -399,9 +399,9 @@@ static const struct reg_default wm1811_ /* * Instantiate the generic non-control parts of the device. */ -static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) +static int wm8994_device_init(struct wm8994 *wm8994, int irq) { - struct wm8994_pdata *pdata = wm8994->dev->platform_data; + struct wm8994_pdata *pdata; struct regmap_config *regmap_config; const struct reg_default *regmap_patch = NULL; const char *devname; diff --cc drivers/misc/atmel-ssc.c index c58f9abcb356,d07a9eda7fff..158da5a81a66 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c @@@ -125,19 -186,10 +186,10 @@@ static int ssc_probe(struct platform_de dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n", ssc->regs, ssc->irq); - goto out; - - out_unmap: - iounmap(ssc->regs); - out_clk: - clk_put(ssc->clk); - out_free: - kfree(ssc); - out: - return retval; + return 0; } -static int __devexit ssc_remove(struct platform_device *pdev) +static int ssc_remove(struct platform_device *pdev) { struct ssc_device *ssc = platform_get_drvdata(pdev); @@@ -155,21 -204,13 +204,13 @@@ static struct platform_driver ssc_drive .driver = { .name = "ssc", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(atmel_ssc_dt_ids), }, + .id_table = atmel_ssc_devtypes, + .probe = ssc_probe, - .remove = __devexit_p(ssc_remove), ++ .remove = ssc_remove, }; - - static int __init ssc_init(void) - { - return platform_driver_probe(&ssc_driver, ssc_probe); - } - module_init(ssc_init); - - static void __exit ssc_exit(void) - { - platform_driver_unregister(&ssc_driver); - } - module_exit(ssc_exit); + module_platform_driver(ssc_driver); MODULE_AUTHOR("Hans-Christian Egtvedt "); MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");