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

Commit 0e358511 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'devel-omap5' of... 

Merge branch 'devel-omap5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/newsoc

From Tony Lindgren <tony@atomide.com>:

This branch contains minimal support for omap5 to boot to a
console without clock framework support. This branch depends
on omap-cleanup-part2-for-v3.6.

* 'devel-omap5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: Kconfig update to support additional GPIOs in OMAP5
  ARM: OMAP5: Add the build support
  arm/dts: OMAP5: Add omap5 dts files
  ARM: OMAP5: board-generic: Add device tree support
  ARM: omap2+: board-generic: clean up the irq data from board file
  ARM: OMAP5: Add SMP support
  ARM: OMAP5: Add the WakeupGen IP updates
  ARM: OMAP5: l3: Add l3 error handler support for omap5
  ARM: OMAP5: gpmc: Update gpmc_init()
  ARM: OMAP5: timer: Add clocksource, clockevent support
  ARM: OMAP5: Add minimal support for OMAP5430 SOC
  ARM: OMAP5: id: Add cpu id for ES versions
  ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme
  ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 229ce6f4 39f47d9f

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -47,3 +47,6 @@ Boards: 


- AM335X EVM : Software Developement Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,7 @@ config ARCH_NR_GPIO 
	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 355 if ARCH_U8500

	default 264 if MACH_H4700

	default 512 if SOC_OMAP5

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/boot/dts/omap5-evm.dts

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

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

/dts-v1/;



/include/ "omap5.dtsi"



/ {

	model = "TI OMAP5 EVM board";

	compatible = "ti,omap5-evm", "ti,omap5";



	memory {

		device_type = "memory";

		reg = <0x80000000 0x40000000>; /* 1 GB */

	};

};

arch/arm/boot/dts/omap5.dtsi

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

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 * Based on "omap4.dtsi"

 */



/*

 * Carveout for multimedia usecases

 * It should be the last 48MB of the first 512MB memory part

 * In theory, it should not even exist. That zone should be reserved

 * dynamically during the .reserve callback.

 */

/memreserve/ 0x9d000000 0x03000000;



/include/ "skeleton.dtsi"



/ {

	compatible = "ti,omap5";

	interrupt-parent = <&gic>;



	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		serial5 = &uart6;

	};



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a15";

		};

		cpu@1 {

			compatible = "arm,cortex-a15";

		};

	};



	/*

	 * The soc node represents the soc top level view. It is uses for IPs

	 * that are not memory mapped in the MPU view or for the MPU itself.

	 */

	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap5-mpu";

			ti,hwmods = "mpu";

		};

	};



	/*

	 * XXX: Use a flat representation of the OMAP3 interconnect.

	 * The real OMAP interconnect network is quite complex.

	 * Since that will not bring real advantage to represent that in DT for

	 * the moment, just use a fake OCP bus entry to represent the whole bus

	 * hierarchy.

	 */

	ocp {

		compatible = "ti,omap4-l3-noc", "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";



		gic: interrupt-controller@48211000 {

			compatible = "arm,cortex-a15-gic";

			interrupt-controller;

			#interrupt-cells = <3>;

			reg = <0x48211000 0x1000>,

			      <0x48212000 0x1000>;

		};



		gpio1: gpio@4ae10000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio1";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio2: gpio@48055000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio2";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio3: gpio@48057000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio3";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio4: gpio@48059000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio4";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio5: gpio@4805b000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio5";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio6: gpio@4805d000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio6";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio7: gpio@48051000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio7";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		gpio8: gpio@48053000 {

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio8";

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		uart1: serial@4806a000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};



		uart2: serial@4806c000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};



		uart3: serial@48020000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};



		uart4: serial@4806e000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};



		uart5: serial@48066000 {

			compatible = "ti,omap5-uart";

			ti,hwmods = "uart5";

			clock-frequency = <48000000>;

		};



		uart6: serial@48068000 {

			compatible = "ti,omap6-uart";

			ti,hwmods = "uart6";

			clock-frequency = <48000000>;

		};

	};

};

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -236,3 +236,4 @@ CONFIG_CRC_T10DIF=y 
CONFIG_CRC_ITU_T=y

CONFIG_CRC7=y

CONFIG_LIBCRC32C=y

CONFIG_SOC_OMAP5=y