Commit 273c2279 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

From Nicolas Ferre:
Second cleanup pull-request for 3.14:
- a tiny fix for the recent AT91 CCF implementation
- the switch of one platform to DT with board file removal

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

:
  ARM: at91: switch Calao QIL-A9260 board to DT
  clk: at91: fix pmc_clk_ids data type attriubte

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 26d5f92a e91a5555

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb 
dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb

# sam9260

dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb

dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb

dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb

dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb

dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb

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

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

 * at91-qil_a9260.dts - Device Tree file for Calao QIL A9260 board

 *

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

 *

 * Licensed under GPLv2.

 */

/dts-v1/;

#include "at91sam9260.dtsi"

/ {

	model = "Calao QIL A9260";

	compatible = "calao,qil-a9260", "atmel,at91sam9260", "atmel,at91sam9";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x20000000 0x4000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			usb1: gadget@fffa4000 {

				atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};



			mmc0: mmc@fffa8000 {

				pinctrl-0 = <

					&pinctrl_mmc0_clk

					&pinctrl_mmc0_slot0_cmd_dat0

					&pinctrl_mmc0_slot0_dat1_3>;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

				};

			};



			usart0: serial@fffb0000 {

				pinctrl-0 =

					<&pinctrl_usart0

					 &pinctrl_usart0_rts

					 &pinctrl_usart0_cts

					 &pinctrl_usart0_dtr_dsr

					 &pinctrl_usart0_dcd

					 &pinctrl_usart0_ri>;

				status = "okay";

			};



			usart1: serial@fffb4000 {

				pinctrl-0 =

					<&pinctrl_usart1

					 &pinctrl_usart1_rts

					 &pinctrl_usart1_cts>;

				status = "okay";

			};



			usart2: serial@fffb8000 {

				pinctrl-0 =

					<&pinctrl_usart2

					 &pinctrl_usart2_rts

					 &pinctrl_usart2_cts>;

				status = "okay";

			};



			macb0: ethernet@fffc4000 {

				phy-mode = "rmii";

				status = "okay";

			};



			spi0: spi@fffc8000 {

				status = "okay";

				cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>;



				m41t94@0 {

					compatible = "st,m41t94";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};



			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			shdwc@fffffd10 {

				atmel,wakeup-counter = <10>;

				atmel,wakeup-rtt-timer;

			};

		};



		usb0: ohci@00500000 {

			num-ports = <2>;

			status = "okay";

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			status = "okay";



			at91bootstrap@0 {

				label = "at91bootstrap";

				reg = <0x0 0x20000>;

			};



			barebox@20000 {

				label = "barebox";

				reg = <0x20000 0x40000>;

			};



			bareboxenv@60000 {

				label = "bareboxenv";

				reg = <0x60000 0x20000>;

			};



			bareboxenv2@80000 {

				label = "bareboxenv2";

				reg = <0x80000 0x20000>;

			};



			oftree@a0000 {

				label = "oftree";

				reg = <0xa0000 0x20000>;

			};



			kernel@c0000 {

				label = "kernel";

				reg = <0xc0000 0x400000>;

			};



			rootfs@4c0000 {

				label = "rootfs";

				reg = <0x4c0000 0x7800000>;

			};



			data@7cc0000 {

				label = "data";

				reg = <0x7cc0000 0x8340000>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		user_led {

			label = "user_led";

			gpios = <&pioB 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		user_pb {

			label = "user_pb";

			gpios = <&pioB 10 GPIO_ACTIVE_LOW>;

			linux,code = <28>;

			gpio-key,wakeup;

		};

	};



	i2c@0 {

		status = "okay";

	};

};

arch/arm/configs/at91sam9260_9g20_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y 
CONFIG_MACH_CAM60=y

CONFIG_MACH_SAM9_L9260=y

CONFIG_MACH_AFEB9260=y

CONFIG_MACH_QIL_A9260=y

CONFIG_MACH_CPU9260=y

CONFIG_MACH_FLEXIBITY=y

CONFIG_MACH_AT91SAM9G20EK=y

arch/arm/mach-at91/Kconfig.non_dt

+0 −6
Original line number Diff line number Diff line
@@ -182,12 +182,6 @@ config MACH_AFEB9260 
	  <svn://194.85.238.22/home/users/george/svn/arm9eb>

	  <http://groups.google.com/group/arm9fpga-evolution-board>



config MACH_QIL_A9260

	bool "CALAO QIL-A9260 board"

	help

	  Select this if you are using a Calao Systems QIL-A9260 Board.

	  <http://www.calao-systems.com>



config MACH_CPU9260

	bool "Eukrea CPU9260 board"

	help

arch/arm/mach-at91/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o 
obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o

obj-$(CONFIG_MACH_CAM60)	+= board-cam60.o

obj-$(CONFIG_MACH_SAM9_L9260)	+= board-sam9-l9260.o

obj-$(CONFIG_MACH_QIL_A9260)	+= board-qil-a9260.o

obj-$(CONFIG_MACH_AFEB9260)	+= board-afeb-9260v1.o

obj-$(CONFIG_MACH_CPU9260)	+= board-cpu9krea.o

obj-$(CONFIG_MACH_FLEXIBITY)	+= board-flexibity.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE