Commit 6b6fa98c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'uart' of... 

Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/uart
parents fe5d3e88 cf3c79de

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-omap2/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -76,8 +76,13 @@ config SOC_OMAP3430 
	default y

	select ARCH_OMAP_OTG



config SOC_OMAPTI816X

	bool "TI816X support"

config SOC_OMAPTI81XX

	bool "TI81XX support"

	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y
@@ -314,7 +319,7 @@ config MACH_OMAP_3630SDP 


config MACH_TI8168EVM

	bool "TI8168 Evaluation Module"

	depends on SOC_OMAPTI816X

	depends on SOC_OMAPTI81XX

	default y



config MACH_OMAP_4430SDP