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

Commit 378bda66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt2' of... 

Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "Second batch of DT changes for 4.2:" from Nicolas Ferre:
- sama5d4: more peripherals: usarts, uarts, spi, pioD access
- sama5d3: phy address for gmac
- change NFC register map
- regulator additions for the sd/mmc

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d4 xplained: add regulators for v(q)mmc1 supplies
  ARM: at91/dt: sama5d3 xplained: add fixed regulator for vmmc0
  ARM: at91/dt: sama5d3 xplained: add mmc0 vqmmc entry
  ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled
  ARM: at91/dt: sama5: reduce the NFC command register map
  ARM: at91/dt: sama5d4: update pinctrl ranges
  ARM: at91/dt: sama5d3 xplained: add phy address for macb0
  ARM: at91/dt: sama5d4 xplained: add spi1 on j14 connector
  ARM: at91/dt: sama5d4: add spi1, spi2 dt nodes
  ARM: at91/dt: sama5d4: add uart0, uart1 dt nodes
  ARM: at91/dt: sama5d4: add usart0, usart1 dt nodes
parents 7dfc6358 8d545f32

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+27 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
		apb {

			mmc0: mmc@f0000000 {

				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;

				vmmc-supply = <&vcc_mmc0_reg>;

				vqmmc-supply = <&vcc_3v3_reg>;

				status = "okay";

				slot@0 {

					reg = <0>;
@@ -43,6 +45,17 @@ 
				};

			};



			mmc1: mmc@f8000000 {

				vmmc-supply = <&vcc_3v3_reg>;

				vqmmc-supply = <&vcc_3v3_reg>;

				status = "disabled";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

					cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;

				};

			};



			spi0: spi@f0004000 {

				cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;

				status = "okay";
@@ -105,7 +118,13 @@ 


			macb0: ethernet@f0028000 {

				phy-mode = "rgmii";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "okay";



				ethernet-phy@7 {

					reg = <0x7>;

				};

			};



			pwm0: pwm@f002c000 {
@@ -278,6 +297,14 @@ 
		};

	};



	vcc_mmc0_reg: fixedregulator@0 {

		compatible = "regulator-fixed";

		gpio = <&pioE 2 GPIO_ACTIVE_LOW>;

		regulator-name = "mmc0-card-supply";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	gpio_keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/at91-sama5d4_xplained.dts

+25 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ 
			mmc1: mmc@fc000000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;

				vmmc-supply = <&vcc_mmc1_reg>;

				vqmmc-supply = <&vcc_3v3_reg>;

				status = "okay";

				slot@0 {

					reg = <0>;
@@ -122,6 +124,11 @@ 
				status = "okay";

			};



			spi1: spi@fc018000 {

				cs-gpios = <&pioB 21 0>;

				status = "okay";

			};



			adc0: adc@fc034000 {

				atmel,adc-vref = <3300>;

				status = "okay";
@@ -238,4 +245,22 @@ 
			linux,default-trigger = "heartbeat";

		};

	};



	vcc_3v3_reg: fixedregulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "VCC 3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	vcc_mmc1_reg: fixedregulator@1 {

		compatible = "regulator-fixed";

		gpio = <&pioE 4 GPIO_ACTIVE_LOW>;

		regulator-name = "VDD MCI1";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_3v3_reg>;

	};

};

arch/arm/boot/dts/sama5d3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ 
				#address-cells = <1>;

				#size-cells = <1>;

				reg = <

					0x70000000 0x10000000	/* NFC Command Registers */

					0x70000000 0x08000000	/* NFC Command Registers */

					0xffffc000 0x00000070	/* NFC HSMC regs */

					0x00200000 0x00100000	/* NFC SRAM banks */

					>;

arch/arm/boot/dts/sama5d4.dtsi

+187 −2
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ 
		serial0 = &usart3;

		serial1 = &usart4;

		serial2 = &usart2;

		serial3 = &usart0;

		serial4 = &usart1;

		serial5 = &uart0;

		serial6 = &uart1;

		gpio0 = &pioA;

		gpio1 = &pioB;

		gpio2 = &pioC;
@@ -299,7 +303,7 @@ 
				#address-cells = <1>;

				#size-cells = <1>;

				reg = <

					0x90000000 0x10000000	/* NFC Command Registers */

					0x90000000 0x08000000	/* NFC Command Registers */

					0xfc05c000 0x00000070	/* NFC HSMC regs */

					0x00100000 0x00100000	/* NFC SRAM banks */

                                         >;
@@ -847,6 +851,24 @@ 
				clock-names = "mci_clk";

			};



			uart0: serial@f8004000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8004000 0x100>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(22))>,

				       <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(23))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart0>;

				clocks = <&uart0_clk>;

				clock-names = "usart";

				status = "disabled";

			};



			ssc0: ssc@f8008000 {

				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xf8008000 0x4000>;
@@ -977,6 +999,42 @@ 
				reg = <0xf8028000 0x60>;

			};



			usart0: serial@f802c000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf802c000 0x100>;

				interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(36))>,

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(37))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0 &pinctrl_usart0_rts &pinctrl_usart0_cts>;

				clocks = <&usart0_clk>;

				clock-names = "usart";

				status = "disabled";

			};



			usart1: serial@f8030000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8030000 0x100>;

				interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(38))>,

				       <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(39))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts &pinctrl_usart1_cts>;

				clocks = <&usart1_clk>;

				clock-names = "usart";

				status = "disabled";

			};



			mmc1: mmc@fc000000 {

				compatible = "atmel,hsmci";

				reg = <0xfc000000 0x600>;
@@ -994,6 +1052,24 @@ 
				clock-names = "mci_clk";

			};



			uart1: serial@fc004000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xfc004000 0x100>;

				interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;

				dmas = <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(24))>,

				       <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(25))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart1>;

				clocks = <&uart1_clk>;

				clock-names = "usart";

				status = "disabled";

			};



			usart2: serial@fc008000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xfc008000 0x100>;
@@ -1066,6 +1142,46 @@ 
				status = "disabled";

			};



			spi1: spi@fc018000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91rm9200-spi";

				reg = <0xfc018000 0x100>;

				interrupts = <38 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(12))>,

				       <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(13))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi1>;

				clocks = <&spi1_clk>;

				clock-names = "spi_clk";

				status = "disabled";

			};



			spi2: spi@fc01c000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91rm9200-spi";

				reg = <0xfc01c000 0x100>;

				interrupts = <39 IRQ_TYPE_LEVEL_HIGH 3>;

				dmas = <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(14))>,

				       <&dma1

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(15))>;

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

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi2>;

				clocks = <&spi2_clk>;

				clock-names = "spi_clk";

				status = "disabled";

			};



			tcb1: timer@fc020000 {

				compatible = "atmel,at91sam9x5-tcb";

				reg = <0xfc020000 0x100>;
@@ -1232,7 +1348,8 @@ 
				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfc06a000 0xfc06a000 0x4000>;

				ranges = <0xfc068000 0xfc068000 0x100

					  0xfc06a000 0xfc06a000 0x4000>;

				/* WARNING: revisit as pin spec has changed */

				atmel,mux-mask = <

					/*   A          B          C  */
@@ -1623,6 +1740,74 @@ 
					};

				};



				spi1 {

					pinctrl_spi1: spi1-0 {

						atmel,pins =

							<AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE	/* SPI1_MISO */

							 AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE	/* SPI1_MOSI */

							 AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE	/* SPI1_SPCK */

							>;

					};

				};



				spi2 {

					pinctrl_spi2: spi2-0 {

						atmel,pins =

							<AT91_PIOD 11 AT91_PERIPH_B AT91_PINCTRL_NONE	/* SPI2_MISO conflicts with RTS0 */

							 AT91_PIOD 13 AT91_PERIPH_B AT91_PINCTRL_NONE	/* SPI2_MOSI conflicts with TXD0 */

							 AT91_PIOD 15 AT91_PERIPH_B AT91_PINCTRL_NONE	/* SPI2_SPCK conflicts with RTS1 */

							>;

					};

				};



				uart0 {

					pinctrl_uart0: uart0-0 {

						atmel,pins =

							<AT91_PIOE 29 AT91_PERIPH_B AT91_PINCTRL_NONE		/* RXD */

							 AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP	/* TXD */

							>;

					};

				};



				uart1 {

					pinctrl_uart1: uart1-0 {

						atmel,pins =

							<AT91_PIOC 25 AT91_PERIPH_C AT91_PINCTRL_NONE		/* RXD */

							 AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP	/* TXD */

							>;

					};

				};



				usart0 {

					pinctrl_usart0: usart0-0 {

						atmel,pins =

							<AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE		/* RXD */

							 AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP	/* TXD */

							>;

					};

					pinctrl_usart0_rts: usart0_rts-0 {

						atmel,pins = <AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

					pinctrl_usart0_cts: usart0_cts-0 {

						atmel,pins = <AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

				};



				usart1 {

					pinctrl_usart1: usart1-0 {

						atmel,pins =

							<AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE		/* RXD */

							 AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP	/* TXD */

							>;

					};

					pinctrl_usart1_rts: usart1_rts-0 {

						atmel,pins = <AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

					pinctrl_usart1_cts: usart1_cts-0 {

						atmel,pins = <AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

				};



				usart2 {

					pinctrl_usart2: usart2-0 {

						atmel,pins =