Commit af43ef67 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt 

From Nicolas Ferre:
First DT series for 3.13
- addition of sound for at91sam9n12
- a little fix for MMC vs. SPI on at91sam9g20ek

* tag 'at91-dt' of git://github.com/at91linux/linux-at91

:
  ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
  ARM: at91: add sound support on at91sam9n12ek board
  ARM: at91: enable ssc on at91sam9n12ek board
  ARM: at91: enable wm8904 on at91sam9n12ek board
  ARM: at91: add ssc dma parameter for at91sam9n12
  ARM: at91: add at91sam9n12 ssc clock in look up table

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents ec902c62 e483341c

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
			};



			spi0: spi@fffc8000 {

				status = "okay";

				cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;

				mtd_dataflash@0 {

					compatible = "atmel,at45", "atmel,dataflash";

arch/arm/boot/dts/at91sam9n12.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ 
				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xf0010000 0x4000>;

				interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma 0 AT91_DMA_CFG_PER_ID(21)>,

				       <&dma 0 AT91_DMA_CFG_PER_ID(22)>;

				dma-names = "tx", "rx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;

				status = "disabled";

arch/arm/boot/dts/at91sam9n12ek.dts

+34 −0
Original line number Diff line number Diff line
@@ -38,9 +38,18 @@ 
				status = "okay";

			};



			ssc0: ssc@f0010000 {

				status = "okay";

			};



			i2c0: i2c@f8010000 {

				status = "okay";



				wm8904: codec@1a {

					compatible = "wm8904";

					reg = <0x1a>;

				};



				qt1070: keyboard@1b {

					compatible = "qt1070";

					reg = <0x1b>;
@@ -82,6 +91,13 @@ 
							<AT91_PIOA 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

				};



				sound {

					pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {

						atmel,pins =

							<AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;

					};

				};

			};



			spi0: spi@f0000000 {
@@ -142,4 +158,22 @@ 
			gpio-key,wakeup;

		};

	};



	sound {

		compatible = "atmel,asoc-wm8904";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;



		atmel,model = "wm8904 @ AT91SAM9N12";

		atmel,audio-routing =

			"Headphone Jack", "HPOUTL",

			"Headphone Jack", "HPOUTR",

			"IN2L", "Line In Jack",

			"IN2R", "Line In Jack",

			"Mic", "MICBIAS",

			"IN1L", "Mic";



		atmel,ssc-controller = <&ssc0>;

		atmel,audio-codec = <&wm8904>;

	};

};

arch/arm/mach-at91/at91sam9n12.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc_clk),

	CLKDEV_CON_DEV_ID(NULL, "f0010000.ssc", &ssc_clk),

	CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),

CRA Git | Maintained and supported by SUSTech CRA and CCSE