 046e7d685b
			
		
	
	
	046e7d685b
	
	
	
		
			
			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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyYh9AAoJEGwxgFQ9KSmk95UP+wcVXRynWulCVwEnVjjWv/UM
 2fIsD0RkWO4WoqEVCNCHzW27pvFC36uqLx5vtas4CoJ2CX8ufQsPqWTx6K3MY/DQ
 /VJT8CI2EKPQY1Q0PySVo2nBqwcUXWWoZE47t1ZowR6cxtmgrS8lLxYJvkbfEOHF
 PS8WItACqH5F5VPxGFkhPwR2OTLfaYt7ilKx82vgxSzdMAel8q/I9uS/MUv8KV+1
 1s5yBvlW5eyDXKpQbP/KiMJLJ/zk1MRAKK2HftAk8pNt+Xy160NvXhbILDWKC4uT
 QBRPqyIe8BmL3VlXpw3mn7nbeU7rSfc/Rbrnm2+Yb54/Wtj4PnV6Z6bg7HO610im
 e/tBNHoaL7qn1iNYSC3heW11rToksd03/LK0GREvkX3Bl21T+Naaun/DY/PGIfMQ
 nOXy7uVo6sVdZnN2MTWof9qeMYBSlrwQVsMde6kbYadNcXnuqUqCOx41kiAdE8t5
 jfZy5QR+uDjdJgDv8/CuiCYxSjjTUfO1tdSV/VjsTK17Gfw3DWTJpeznVnoIALbZ
 81HXYxb+uGZ8xDr0WXGkydlnPvB6bnWu2vvfrLBkioA/p60EDNCtgKo1y3NzQGh8
 P2qILNhXIRrS2EoAScQOb6F1RPsvbDN9PbihnkShX3r7DXyeynr9jgPy3L2vf0bR
 xyu0jtQiqYb34ss7qqdz
 =IIsz
 -----END PGP SIGNATURE-----
Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/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
  ...
		
	
			
		
			
				
	
	
		
			202 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			202 lines
		
	
	
	
		
			3.4 KiB
			
		
	
	
	
		
			Text
		
	
	
	
	
	
| /*
 | |
|  * at91sam9g20ek_common.dtsi - Device Tree file for Atmel at91sam9g20ek board
 | |
|  *
 | |
|  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 | |
|  *
 | |
|  * Licensed under GPLv2.
 | |
|  */
 | |
| /include/ "at91sam9g20.dtsi"
 | |
| 
 | |
| / {
 | |
| 
 | |
| 	chosen {
 | |
| 		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
 | |
| 	};
 | |
| 
 | |
| 	memory {
 | |
| 		reg = <0x20000000 0x4000000>;
 | |
| 	};
 | |
| 
 | |
| 	clocks {
 | |
| 		#address-cells = <1>;
 | |
| 		#size-cells = <1>;
 | |
| 		ranges;
 | |
| 
 | |
| 		main_clock: clock@0 {
 | |
| 			compatible = "atmel,osc", "fixed-clock";
 | |
| 			clock-frequency = <18432000>;
 | |
| 		};
 | |
| 	};
 | |
| 
 | |
| 	ahb {
 | |
| 		apb {
 | |
| 			pinctrl@fffff400 {
 | |
| 				board {
 | |
| 					pinctrl_pck0_as_mck: pck0_as_mck {
 | |
| 						atmel,pins =
 | |
| 							<2 1 0x2 0x0>;	/* PC1 periph B */
 | |
| 					};
 | |
| 
 | |
| 				};
 | |
| 			};
 | |
| 
 | |
| 			dbgu: serial@fffff200 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			usart0: serial@fffb0000 {
 | |
| 				pinctrl-0 =
 | |
| 					<&pinctrl_usart0
 | |
| 					 &pinctrl_usart0_rts
 | |
| 					 &pinctrl_usart0_cts
 | |
| 					 &pinctrl_usart0_dtr_dsr
 | |
| 					 &pinctrl_usart0_dcd
 | |
| 					 &pinctrl_usart0_ri>;
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			usart1: serial@fffb4000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			macb0: ethernet@fffc4000 {
 | |
| 				phy-mode = "rmii";
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			usb1: gadget@fffa4000 {
 | |
| 				atmel,vbus-gpio = <&pioC 5 0>;
 | |
| 				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 {
 | |
| 			nand-bus-width = <8>;
 | |
| 			nand-ecc-mode = "soft";
 | |
| 			nand-on-flash-bbt;
 | |
| 			status = "okay";
 | |
| 
 | |
| 			at91bootstrap@0 {
 | |
| 				label = "at91bootstrap";
 | |
| 				reg = <0x0 0x20000>;
 | |
| 			};
 | |
| 
 | |
| 			barebox@20000 {
 | |
| 				label = "barebox";
 | |
| 				reg = <0x20000 0x40000>;
 | |
| 			};
 | |
| 
 | |
| 			bareboxenv@60000 {
 | |
| 				label = "bareboxenv";
 | |
| 				reg = <0x60000 0x20000>;
 | |
| 			};
 | |
| 
 | |
| 			bareboxenv2@80000 {
 | |
| 				label = "bareboxenv2";
 | |
| 				reg = <0x80000 0x20000>;
 | |
| 			};
 | |
| 
 | |
| 			oftree@80000 {
 | |
| 				label = "oftree";
 | |
| 				reg = <0xa0000 0x20000>;
 | |
| 			};
 | |
| 
 | |
| 			kernel@a0000 {
 | |
| 				label = "kernel";
 | |
| 				reg = <0xc0000 0x400000>;
 | |
| 			};
 | |
| 
 | |
| 			rootfs@4a0000 {
 | |
| 				label = "rootfs";
 | |
| 				reg = <0x4c0000 0x7800000>;
 | |
| 			};
 | |
| 
 | |
| 			data@7ca0000 {
 | |
| 				label = "data";
 | |
| 				reg = <0x7cc0000 0x8340000>;
 | |
| 			};
 | |
| 		};
 | |
| 
 | |
| 		usb0: ohci@00500000 {
 | |
| 			num-ports = <2>;
 | |
| 			status = "okay";
 | |
| 		};
 | |
| 	};
 | |
| 
 | |
| 	i2c@0 {
 | |
| 		status = "okay";
 | |
| 
 | |
| 		24c512@50 {
 | |
| 			compatible = "24c512";
 | |
| 			reg = <0x50>;
 | |
| 		};
 | |
| 
 | |
| 		wm8731: wm8731@1b {
 | |
| 			compatible = "wm8731";
 | |
| 			reg = <0x1b>;
 | |
| 		};
 | |
| 	};
 | |
| 
 | |
| 	gpio_keys {
 | |
| 		compatible = "gpio-keys";
 | |
| 		#address-cells = <1>;
 | |
| 		#size-cells = <0>;
 | |
| 
 | |
| 		btn3 {
 | |
| 			label = "Button 3";
 | |
| 			gpios = <&pioA 30 1>;
 | |
| 			linux,code = <0x103>;
 | |
| 			gpio-key,wakeup;
 | |
| 		};
 | |
| 
 | |
| 		btn4 {
 | |
| 			label = "Button 4";
 | |
| 			gpios = <&pioA 31 1>;
 | |
| 			linux,code = <0x104>;
 | |
| 			gpio-key,wakeup;
 | |
| 		};
 | |
| 	};
 | |
| 
 | |
| 	sound {
 | |
| 		compatible = "atmel,at91sam9g20ek-wm8731-audio";
 | |
| 		pinctrl-names = "default";
 | |
| 		pinctrl-0 = <&pinctrl_pck0_as_mck>;
 | |
| 
 | |
| 		atmel,model = "wm8731 @ AT91SAMG20EK";
 | |
| 
 | |
| 		atmel,audio-routing =
 | |
| 			"Ext Spk", "LHPOUT",
 | |
| 			"Int Mic", "MICIN";
 | |
| 
 | |
| 		atmel,ssc-controller = <&ssc0>;
 | |
| 		atmel,audio-codec = <&wm8731>;
 | |
| 	};
 | |
| };
 |