Commit 76df26b5 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

From Nicolas Ferre:
First cleanup series for 3.13
- a little non-urgent fix
- addition of DT files to MAINTAINERS
- more important, the splitting of .dtsi files
  that allows to precisely choose the peripherals
  that are present for a particular SoC.
  It is useful for upcoming move to common cloks.

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  MAINTAINERS: Add patterns for DTS files for AT91
  ARM: at91: remove init_machine() as default is suitable
  ARM: at91/dt: split sama5d3 peripheral definitions
  ARM: at91/dt: split sam9x5 peripheral definitions
  ARM: at91: cam60: fix incorrect placement of __initdata tag
parents b25a51cb 70e389cc

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -763,6 +763,10 @@ W: http://maxim.org.za/at91_26.html 
W:	http://www.linux4sam.org

S:	Supported

F:	arch/arm/mach-at91/

F:	arch/arm/boot/dts/at91*.dts

F:	arch/arm/boot/dts/at91*.dtsi

F:	arch/arm/boot/dts/sama*.dts

F:	arch/arm/boot/dts/sama*.dtsi



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <rob.herring@calxeda.com>

arch/arm/boot/dts/at91sam9g25.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 */



#include "at91sam9x5.dtsi"

#include "at91sam9x5_usart3.dtsi"

#include "at91sam9x5_macb0.dtsi"



/ {

	model = "Atmel AT91SAM9G25 SoC";

arch/arm/boot/dts/at91sam9g35.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include "at91sam9x5.dtsi"

#include "at91sam9x5_macb0.dtsi"



/ {

	model = "Atmel AT91SAM9G35 SoC";

arch/arm/boot/dts/at91sam9x25.dtsi

+3 −21
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
 */



#include "at91sam9x5.dtsi"

#include "at91sam9x5_usart3.dtsi"

#include "at91sam9x5_macb0.dtsi"

#include "at91sam9x5_macb1.dtsi"



/ {

	model = "Atmel AT91SAM9X25 SoC";
@@ -22,27 +25,6 @@ 
				       0x80000000 0xfffd0000 0xb83fffff  /* pioC */

				       0x003fffff 0x003f8000 0x00000000  /* pioD */

				      >;



				macb1 {

					pinctrl_macb1_rmii: macb1_rmii-0 {

						atmel,pins =

							<AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC16 periph B */

							 AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC18 periph B */

							 AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC19 periph B */

							 AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC20 periph B */

							 AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC21 periph B */

							 AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC27 periph B */

							 AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC28 periph B */

							 AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC29 periph B */

							 AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC30 periph B */

							 AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC31 periph B */

					};

				};

			};



			macb1: ethernet@f8030000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb1_rmii>;

			};

		};

	};

arch/arm/boot/dts/at91sam9x35.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include "at91sam9x5.dtsi"

#include "at91sam9x5_macb0.dtsi"



/ {

	model = "Atmel AT91SAM9X35 SoC";

CRA Git | Maintained and supported by SUSTech CRA and CCSE