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

Commit b3c37522 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

power management changes for omap and imx

A significant part of the changes for these two platforms went into
power management, so they are split out into a separate branch.

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)
  ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
  ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
  ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
  ARM: imx6q: build pm code only when CONFIG_PM selected
  ARM: mx5: use generic irq chip pm interface for pm functions on
  ARM: omap: pass minimal SoC/board data for UART from dt
  arm/dts: Add minimal device tree support for omap2420 and omap2430
  omap-serial: Add minimal device tree support
  omap-serial: Use default clock speed (48Mhz) if not specified
  omap-serial: Get rid of all pdev->id usage
  ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init
  ARM: OMAP4: PRM: use PRCM interrupt handler
  ARM: OMAP3: pm: use prcm chain handler
  ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad
  ARM: OMAP2+: mux: add support for PAD wakeup interrupts
  ARM: OMAP: PRCM: add suspend prepare / finish support
  ARM: OMAP: PRCM: add support for chain interrupt handler
  ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier
  ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup
  ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list
  ...
parents 2ac9d7aa 6d0a5636

Documentation/devicetree/bindings/serial/omap_serial.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
OMAP UART controller



Required properties:

- compatible : should be "ti,omap2-uart" for OMAP2 controllers

- compatible : should be "ti,omap3-uart" for OMAP3 controllers

- compatible : should be "ti,omap4-uart" for OMAP4 controllers

- ti,hwmods : Must be "uart<n>", n being the instance number (1-based)



Optional properties:

- clock-frequency : frequency of the clock input to the UART

arch/arm/boot/dts/omap2.dtsi

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

 * Device Tree Source for OMAP2 SoC

 *

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

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";



	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

	};



	cpus {

		cpu@0 {

			compatible = "arm,arm1136jf-s";

		};

	};



	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap2-mpu";

			ti,hwmods = "mpu";

		};

	};



	ocp {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main";



		intc: interrupt-controller@1 {

			compatible = "ti,omap2-intc";

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		uart1: serial@4806a000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};



		uart2: serial@4806c000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};



		uart3: serial@4806e000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};

	};

};

arch/arm/boot/dts/omap3.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ 
/ {

	compatible = "ti,omap3430", "ti,omap3";



	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

	};



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a8";
@@ -59,5 +66,29 @@ 
			interrupt-controller;

			#interrupt-cells = <1>;

		};



		uart1: serial@0x4806a000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};



		uart2: serial@0x4806c000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};



		uart3: serial@0x49020000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};



		uart4: serial@0x49042000 {

			compatible = "ti,omap3-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};

	};

};

arch/arm/boot/dts/omap4.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
	interrupt-parent = <&gic>;



	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

	};



	cpus {
@@ -99,5 +103,29 @@ 
			reg = <0x48241000 0x1000>,

			      <0x48240100 0x0100>;

		};



		uart1: serial@0x4806a000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};



		uart2: serial@0x4806c000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};



		uart3: serial@0x48020000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};



		uart4: serial@0x4806e000 {

			compatible = "ti,omap4-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};

	};

};

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ comment "i.MX6 family:" 


config SOC_IMX6Q

	bool "i.MX6 Quad support"

	select ARM_CPU_SUSPEND if PM

	select ARM_GIC

	select CPU_V7

	select HAVE_ARM_SCU