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

Commit 926f638c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Introduction of new Atmel Cortex-A5: SAMA5D3 family.
- Modify AT91 Kconfig to plit ARMv4/5 and ARMv7 arch
- Modify PMC driver (clocks)
- Core SAMA5 support
- Board file, DT files and defconfig

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

:
  ARM: at91: add defconfig for SAMA5
  ARM: at91: dt: add device tree files for SAMA5D3 family
  ARM: at91: introduce SAMA5 support
  ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
  ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
  ARM: at91: change name template in AT91_SOC_START macro
  ARM: at91: renamme rm9200 dt file
  ARM: at91: rename board-dt to more specific name board-dt-sam9
  ARM: at91: move non DT Kconfig to Kconfig.non_dt

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5cc25d80 471c9e78

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb 
dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb

# sama5d3

dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb



dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb

arch/arm/boot/dts/sama5d3.dtsi

0 → 100644
+1031 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/sama5d31ek.dts

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

 * sama5d31ek.dts - Device Tree file for SAMA5D31-EK board

 *

 *  Copyright (C) 2013 Atmel,

 *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "sama5d3xmb.dtsi"

/include/ "sama5d3xdm.dtsi"



/ {

	model = "Atmel SAMA5D31-EK";

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



	ahb {

		apb {

			spi0: spi@f0004000 {

				status = "okay";

			};



			ssc0: ssc@f0008000 {

				status = "okay";

			};



			i2c0: i2c@f0014000 {

				status = "okay";

			};



			i2c1: i2c@f0018000 {

				status = "okay";

			};



			macb1: ethernet@f802c000 {

				status = "okay";

			};

		};

	};



	leds {

		d3 {

			label = "d3";

			gpios = <&pioE 24 0>;

		};

	};



	sound {

		status = "okay";

	};

};

arch/arm/boot/dts/sama5d33ek.dts

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

 * sama5d33ek.dts - Device Tree file for SAMA5D33-EK board

 *

 *  Copyright (C) 2013 Atmel,

 *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "sama5d3xmb.dtsi"

/include/ "sama5d3xdm.dtsi"



/ {

	model = "Atmel SAMA5D33-EK";

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



	ahb {

		apb {

			spi0: spi@f0004000 {

				status = "okay";

			};



			ssc0: ssc@f0008000 {

				status = "okay";

			};



			i2c0: i2c@f0014000 {

				status = "okay";

			};



			i2c1: i2c@f0018000 {

				status = "okay";

			};



			macb0: ethernet@f0028000 {

				status = "okay";

			};

		};

	};



	sound {

		status = "okay";

	};

};

arch/arm/boot/dts/sama5d34ek.dts

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

 * sama5d34ek.dts - Device Tree file for SAMA5D34-EK board

 *

 *  Copyright (C) 2013 Atmel,

 *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "sama5d3xmb.dtsi"

/include/ "sama5d3xdm.dtsi"



/ {

	model = "Atmel SAMA5D34-EK";

	compatible = "atmel,sama5d34ek", "atmel,sama5ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";



	ahb {

		apb {

			spi0: spi@f0004000 {

				status = "okay";

			};



			ssc0: ssc@f0008000 {

				status = "okay";

			};



			can0: can@f000c000 {

				status = "okay";

			};



			i2c0: i2c@f0014000 {

				status = "okay";

			};



			i2c1: i2c@f0018000 {

				status = "okay";



				24c256@50 {

					compatible = "24c256";

					reg = <0x50>;

					pagesize = <64>;

				};

			};



			macb0: ethernet@f0028000 {

				status = "okay";

			};

		};

	};



	leds {

		d3 {

			label = "d3";

			gpios = <&pioE 24 0>;

		};

	};



	sound {

		status = "okay";

	};

};