Commit d7d1d45c authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Nicolas Ferre
Browse files

ARM: at91/dt: split sama5d3 peripheral definitions 



This patch splits the sama5d3 SoCs definition:
- a common base for all sama5d3 SoCs (sama5d3.dtsi)
- several optional peripheral definitions which will be included by sama5d3
  specific SoCs (sama5d3_'periph name'.dtsi)
- sama5d3 specific SoC definitions (sama5d3x.dtsi)

This provides a better representation of the real hardware (drop unneed
dt nodes) and avoids peripheral id conflict (which is not the case for
current sama5d3 SoCs, but could be if other SoCs of this family are
released).

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
[nicolas.ferre@atmel.com: add more "sama5d3?" compatibility strings]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent d195608a

arch/arm/boot/dts/sama5d3.dtsi

+0 −203
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
		gpio3 = &pioD;

		gpio4 = &pioE;

		tcb0 = &tcb0;

		tcb1 = &tcb1;

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;
@@ -105,15 +104,6 @@ 
				status = "disabled";

			};



			can0: can@f000c000 {

				compatible = "atmel,at91sam9x5-can";

				reg = <0xf000c000 0x300>;

				interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_can0_rx_tx>;

				status = "disabled";

			};



			tcb0: timer@f0010000 {

				compatible = "atmel,at91sam9x5-tcb";

				reg = <0xf0010000 0x100>;
@@ -166,15 +156,6 @@ 
				status = "disabled";

			};



			macb0: ethernet@f0028000 {

				compatible = "cdns,pc302-gem", "cdns,gem";

				reg = <0xf0028000 0x100>;

				interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>;

				status = "disabled";

			};



			isi: isi@f0034000 {

				compatible = "atmel,at91sam9g45-isi";

				reg = <0xf0034000 0x4000>;
@@ -195,19 +176,6 @@ 
				#size-cells = <0>;

			};



			mmc2: mmc@f8004000 {

				compatible = "atmel,hsmci";

				reg = <0xf8004000 0x600>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>;

				dma-names = "rxtx";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;

				status = "disabled";

				#address-cells = <1>;

				#size-cells = <0>;

			};



			spi1: spi@f8008000 {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -231,20 +199,6 @@ 
				status = "disabled";

			};



			can1: can@f8010000 {

				compatible = "atmel,at91sam9x5-can";

				reg = <0xf8010000 0x300>;

				interrupts = <41 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_can1_rx_tx>;

			};



			tcb1: timer@f8014000 {

				compatible = "atmel,at91sam9x5-tcb";

				reg = <0xf8014000 0x100>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;

			};



			adc0: adc@f8018000 {

				compatible = "atmel,at91sam9260-adc";

				reg = <0xf8018000 0x100>;
@@ -341,15 +295,6 @@ 
				status = "disabled";

			};



			macb1: ethernet@f802c000 {

				compatible = "cdns,at32ap7000-macb", "cdns,macb";

				reg = <0xf802c000 0x100>;

				interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb1_rmii>;

				status = "disabled";

			};



			sha@f8034000 {

				compatible = "atmel,sam9g46-sha";

				reg = <0xf8034000 0x100>;
@@ -474,22 +419,6 @@ 
					};

				};



				can0 {

					pinctrl_can0_rx_tx: can0_rx_tx {

						atmel,pins =

							<AT91_PIOD 14 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1 */

							 AT91_PIOD 15 AT91_PERIPH_C AT91_PINCTRL_NONE>;	/* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS2 */

					};

				};



				can1 {

					pinctrl_can1_rx_tx: can1_rx_tx {

						atmel,pins =

							<AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB14 periph B RX, conflicts with GCRS */

							 AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB15 periph B TX, conflicts with GCOL */

					};

				};



				dbgu {

					pinctrl_dbgu: dbgu-0 {

						atmel,pins =
@@ -537,107 +466,6 @@ 
					};

				};



				lcd {

					pinctrl_lcd: lcd-0 {

						atmel,pins =

							<AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA24 periph A LCDPWM */

							 AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA26 periph A LCDVSYNC */

							 AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA27 periph A LCDHSYNC */

							 AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA25 periph A LCDDISP */

							 AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA29 periph A LCDDEN */

							 AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA28 periph A LCDPCK */

							 AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA0 periph A LCDD0 pin */

							 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA1 periph A LCDD1 pin */

							 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA2 periph A LCDD2 pin */

							 AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA3 periph A LCDD3 pin */

							 AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA4 periph A LCDD4 pin */

							 AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA5 periph A LCDD5 pin */

							 AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA6 periph A LCDD6 pin */

							 AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA7 periph A LCDD7 pin */

							 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA8 periph A LCDD8 pin */

							 AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA9 periph A LCDD9 pin */

							 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA10 periph A LCDD10 pin */

							 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA11 periph A LCDD11 pin */

							 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA12 periph A LCDD12 pin */

							 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA13 periph A LCDD13 pin */

							 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA14 periph A LCDD14 pin */

							 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA15 periph A LCDD15 pin */

							 AT91_PIOC 14 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC14 periph C LCDD16 pin */

							 AT91_PIOC 13 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC13 periph C LCDD17 pin */

							 AT91_PIOC 12 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC12 periph C LCDD18 pin */

							 AT91_PIOC 11 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC11 periph C LCDD19 pin */

							 AT91_PIOC 10 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC10 periph C LCDD20 pin */

							 AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PC15 periph C LCDD21 pin */

							 AT91_PIOE 27 AT91_PERIPH_C AT91_PINCTRL_NONE	/* PE27 periph C LCDD22 pin */

							 AT91_PIOE 28 AT91_PERIPH_C AT91_PINCTRL_NONE>;	/* PE28 periph C LCDD23 pin */

					};

				};



				macb0 {

					pinctrl_macb0_data_rgmii: macb0_data_rgmii {

						atmel,pins =

							<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB0 periph A GTX0, conflicts with PWMH0 */

							 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB1 periph A GTX1, conflicts with PWML0 */

							 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB2 periph A GTX2, conflicts with TK1 */

							 AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB3 periph A GTX3, conflicts with TF1 */

							 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB4 periph A GRX0, conflicts with PWMH1 */

							 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB5 periph A GRX1, conflicts with PWML1 */

							 AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB6 periph A GRX2, conflicts with TD1 */

							 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PB7 periph A GRX3, conflicts with RK1 */

					};

					pinctrl_macb0_data_gmii: macb0_data_gmii {

						atmel,pins =

							<AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB19 periph B GTX4, conflicts with MCI1_CDA */

							 AT91_PIOB 20 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB20 periph B GTX5, conflicts with MCI1_DA0 */

							 AT91_PIOB 21 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB21 periph B GTX6, conflicts with MCI1_DA1 */

							 AT91_PIOB 22 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB22 periph B GTX7, conflicts with MCI1_DA2 */

							 AT91_PIOB 23 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB23 periph B GRX4, conflicts with MCI1_DA3 */

							 AT91_PIOB 24 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB24 periph B GRX5, conflicts with MCI1_CK */

							 AT91_PIOB 25 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PB25 periph B GRX6, conflicts with SCK1 */

							 AT91_PIOB 26 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB26 periph B GRX7, conflicts with CTS1 */

					};

					pinctrl_macb0_signal_rgmii: macb0_signal_rgmii {

						atmel,pins =

							<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB8 periph A GTXCK, conflicts with PWMH2 */

							 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB9 periph A GTXEN, conflicts with PWML2 */

							 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB11 periph A GRXCK, conflicts with RD1 */

							 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB13 periph A GRXER, conflicts with PWML3 */

							 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB16 periph A GMDC */

							 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB17 periph A GMDIO */

							 AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PB18 periph A G125CK */

					};

					pinctrl_macb0_signal_gmii: macb0_signal_gmii {

						atmel,pins =

							<AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB9 periph A GTXEN, conflicts with PWML2 */

							 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB10 periph A GTXER, conflicts with RF1 */

							 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB11 periph A GRXCK, conflicts with RD1 */

							 AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB12 periph A GRXDV, conflicts with PWMH3 */

							 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB13 periph A GRXER, conflicts with PWML3 */

							 AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB14 periph A GCRS, conflicts with CANRX1 */

							 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB15 periph A GCOL, conflicts with CANTX1 */

							 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB16 periph A GMDC */

							 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB17 periph A GMDIO */

							 AT91_PIOB 27 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB27 periph B G125CKO */

					};



				};



				macb1 {

					pinctrl_macb1_rmii: macb1_rmii-0 {

						atmel,pins =

							<AT91_PIOC 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC0 periph A ETX0, conflicts with TIOA3 */

							 AT91_PIOC 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC1 periph A ETX1, conflicts with TIOB3 */

							 AT91_PIOC 2 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC2 periph A ERX0, conflicts with TCLK3 */

							 AT91_PIOC 3 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC3 periph A ERX1, conflicts with TIOA4 */

							 AT91_PIOC 4 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC4 periph A ETXEN, conflicts with TIOB4 */

							 AT91_PIOC 5 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC5 periph A ECRSDV,conflicts with TCLK4 */

							 AT91_PIOC 6 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC6 periph A ERXER, conflicts with TIOA5 */

							 AT91_PIOC 7 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC7 periph A EREFCK, conflicts with TIOB5 */

							 AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC8 periph A EMDC, conflicts with TCLK5 */

							 AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PC9 periph A EMDIO  */

					};

				};



				mmc0 {

					pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {

						atmel,pins =
@@ -675,21 +503,6 @@ 
					};

				};



				mmc2 {

					pinctrl_mmc2_clk_cmd_dat0: mmc2_clk_cmd_dat0 {

						atmel,pins =

							<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC15 periph A MCI2_CK, conflicts with PCK2 */

							 AT91_PIOC 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP	/* PC10 periph A MCI2_CDA with pullup */

							 AT91_PIOC 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;	/* PC11 periph A MCI2_DA0 with pullup */

					};

					pinctrl_mmc2_dat1_3: mmc2_dat1_3 {

						atmel,pins =

							<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */

							 AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */

							 AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */

					};

				};



				nand0 {

					pinctrl_nand0_ale_cle: nand0_ale_cle-0 {

						atmel,pins =
@@ -748,22 +561,6 @@ 
					};

				};



				uart0 {

					pinctrl_uart0: uart0-0 {

						atmel,pins =

							<AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC29 periph A, conflicts with PWMFI2, ISI_D8 */

							 AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;	/* PC30 periph A with pullup, conflicts with ISI_PCK */

					};

				};



				uart1 {

					pinctrl_uart1: uart1-0 {

						atmel,pins =

							<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PA30 periph B, conflicts with TWD0, ISI_VSYNC */

							 AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;	/* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */

					};

				};



				usart0 {

					pinctrl_usart0: usart0-0 {

						atmel,pins =

arch/arm/boot/dts/sama5d31.dtsi

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

 * sama5d31.dtsi - Device Tree Include file for SAMA5D31 SoC

 *

 *  Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>

 *

 * Licensed under GPLv2 or later.

 */

#include "sama5d3.dtsi"

#include "sama5d3_lcd.dtsi"

#include "sama5d3_emac.dtsi"

#include "sama5d3_mci2.dtsi"

#include "sama5d3_uart.dtsi"



/ {

	compatible = "atmel,samad31", "atmel,sama5d3", "atmel,sama5";

};

arch/arm/boot/dts/sama5d31ek.dts

+2 −1
Original line number Diff line number Diff line
@@ -7,12 +7,13 @@ 
 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "sama5d31.dtsi"

#include "sama5d3xmb.dtsi"

#include "sama5d3xdm.dtsi"



/ {

	model = "Atmel SAMA5D31-EK";

	compatible = "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";

	compatible = "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";



	ahb {

		apb {

arch/arm/boot/dts/sama5d33.dtsi

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

 * sama5d33.dtsi - Device Tree Include file for SAMA5D33 SoC

 *

 *  Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>

 *

 * Licensed under GPLv2 or later.

 */

#include "sama5d3.dtsi"

#include "sama5d3_lcd.dtsi"

#include "sama5d3_gmac.dtsi"



/ {

	compatible = "atmel,samad33", "atmel,sama5d3", "atmel,sama5";

};

arch/arm/boot/dts/sama5d33ek.dts

+2 −1
Original line number Diff line number Diff line
@@ -7,12 +7,13 @@ 
 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "sama5d33.dtsi"

#include "sama5d3xmb.dtsi"

#include "sama5d3xdm.dtsi"



/ {

	model = "Atmel SAMA5D33-EK";

	compatible = "atmel,sama5d33ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";

	compatible = "atmel,sama5d33ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d33", "atmel,sama5d3", "atmel,sama5";



	ahb {

		apb {

CRA Git | Maintained and supported by SUSTech CRA and CCSE