Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6229f0fc authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Nicolas Ferre:
AT91 DT changes for 3.12, take 2
- addition of the Nand Flash Controller (NFC) in DT
  for sama5d3 SoC. This NFC will enhance the traditional
  Nand Flash handling (SMC + PMECC).

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: sama5d3xek: reduce the ROM code mapping for pmecc lookup table
  ARM: at91/dt: sama5d3xek: Enable NFC support in dts
  ARM: at91/dt: sama5d3xek: remove the useless NFC dt parameters
  ARM: at91/dt: sam9x5ek: add sound configuration
  ARM: at91/dt: sam9x5ek: enable SSC
  ARM: at91/dt: sam9x5ek: add WM8731 codec
  ARM: at91/dt: sam9x5: add SSC DMA parameters
  ARM: at91/dt: add at91rm9200 PQFP package version
  ARM: at91: at91rm9200: set default mmc0 pinctrl-names
  ARM: at91: at91sam9n12: correct pin number of gpio-key
  ARM: at91: at91sam9n12: add qt1070 support
  ARM: at91: at91sam9n12: add pinctrl of TWI
  ARM: at91: Add PMU support for sama5d3
  ARM: at91: at91sam9260: add missing pinctrl-names on mmc
parents d6a99de7 afa6a2a7

arch/arm/boot/dts/at91rm9200.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;

				#address-cells = <1>;

				#size-cells = <0>;

				pinctrl-names = "default";

				status = "disabled";

			};

arch/arm/boot/dts/at91rm9200_pqfp.dtsi

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * at91rm9200_pqfp.dtsi - Device Tree Include file for AT91RM9200 PQFP family SoC

 *

 * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

 *

 * Licensed under GPLv2 or later.

 */



#include "at91rm9200.dtsi"



/ {

	compatible = "atmel,at91rm9200-pqfp", "atmel,at91rm9200";

};



&pioD {

	status = "disabled";

};

arch/arm/boot/dts/at91sam9260.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ 
				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;

				#address-cells = <1>;

				#size-cells = <0>;

				pinctrl-names = "default";

				status = "disabled";

			};

arch/arm/boot/dts/at91sam9n12.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -291,6 +291,22 @@ 
					};

				};



				i2c0 {

					pinctrl_i2c0: i2c0-0 {

						atmel,pins =

							<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE

							 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

				};



				i2c1 {

					pinctrl_i2c1: i2c1-0 {

						atmel,pins =

							<AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE

							 AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>;

					};

				};



				tcb0 {

					pinctrl_tcb0_tclk0: tcb0_tclk0-0 {

						atmel,pins = <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE>;
@@ -471,6 +487,8 @@ 
				dma-names = "tx", "rx";

				#address-cells = <1>;

				#size-cells = <0>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2c0>;

				status = "disabled";

			};
@@ -483,6 +501,8 @@ 
				dma-names = "tx", "rx";

				#address-cells = <1>;

				#size-cells = <0>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2c1>;

				status = "disabled";

			};

arch/arm/boot/dts/at91sam9n12ek.dts

+17 −1
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ 


			i2c0: i2c@f8010000 {

				status = "okay";



				qt1070: keyboard@1b {

					compatible = "qt1070";

					reg = <0x1b>;

					interrupt-parent = <&pioA>;

					interrupts = <2 IRQ_TYPE_EDGE_FALLING>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_qt1070_irq>;

				};

			};



			i2c1: i2c@f8014000 {
@@ -66,6 +75,13 @@ 
							<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* PA7 gpio CD pin pull up and deglitch */

					};

				};



				qt1070 {

					pinctrl_qt1070_irq: qt1070_irq {

						atmel,pins =

							<AT91_PIOA 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

				};

			};



			spi0: spi@f0000000 {
@@ -121,7 +137,7 @@ 


		enter {

			label = "Enter";

			gpios = <&pioB 4 GPIO_ACTIVE_LOW>;

			gpios = <&pioB 3 GPIO_ACTIVE_LOW>;

			linux,code = <28>;

			gpio-key,wakeup;

		};