Commit 5c1f34c4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of... 

Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
Few more fixes for issues found booting older omaps using device tree.
Also few randconfig build fixes and removal of some dead code for omap4
as it no longer has legacy platform data based booting support.

* tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init
  ARM: OMAP2+: Remove legacy mux code for display.c
  ARM: OMAP2+: Fix undefined reference to set_cntfreq
  gpio: twl4030: Fix passing of pdata in the device tree case
  gpio: twl4030: Fix regression for twl gpio output
  ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain
  ARM: dts: Fix omap2 specific dtsi files by adding the missing entries
  ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x
  i2c: omap: Fix missing device tree flags for omap2
parents 6dd1e357 b2ff4790

Documentation/devicetree/bindings/i2c/i2c-omap.txt

+2 −1
Original line number Diff line number Diff line 
I2C for OMAP platforms



Required properties :

- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"

- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"

  or "ti,omap4-i2c"

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

- #address-cells = <1>;

- #size-cells = <0>;

arch/arm/boot/dts/omap-zoom-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	 * they probably share the same GPIO IRQ

	 * REVISIT: Add timing support from slls644g.pdf

	 */

	8250@3,0 {

	uart@3,0 {

		compatible = "ns16550a";

		reg = <3 0 0x100>;

		bank-width = <2>;

arch/arm/boot/dts/omap2.dtsi

+96 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/pinctrl/omap.h>



#include "skeleton.dtsi"
@@ -21,6 +22,8 @@ 
		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		i2c0 = &i2c1;

		i2c1 = &i2c2;

	};



	cpus {
@@ -53,6 +56,28 @@ 
		ranges;

		ti,hwmods = "l3_main";



		aes: aes@480a6000 {

			compatible = "ti,omap2-aes";

			ti,hwmods = "aes";

			reg = <0x480a6000 0x50>;

			dmas = <&sdma 9 &sdma 10>;

			dma-names = "tx", "rx";

		};



		hdq1w: 1w@480b2000 {

			compatible = "ti,omap2420-1w";

			ti,hwmods = "hdq1w";

			reg = <0x480b2000 0x1000>;

			interrupts = <58>;

		};



		mailbox: mailbox@48094000 {

			compatible = "ti,omap2-mailbox";

			ti,hwmods = "mailbox";

			reg = <0x48094000 0x200>;

			interrupts = <26>;

		};



		intc: interrupt-controller@1 {

			compatible = "ti,omap2-intc";

			interrupt-controller;
@@ -63,6 +88,7 @@ 


		sdma: dma-controller@48056000 {

			compatible = "ti,omap2430-sdma", "ti,omap2420-sdma";

			ti,hwmods = "dma";

			reg = <0x48056000 0x1000>;

			interrupts = <12>,

				     <13>,
@@ -73,21 +99,91 @@ 
			#dma-requests = <64>;

		};



		i2c1: i2c@48070000 {

			compatible = "ti,omap2-i2c";

			ti,hwmods = "i2c1";

			reg = <0x48070000 0x80>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <56>;

			dmas = <&sdma 27 &sdma 28>;

			dma-names = "tx", "rx";

		};



		i2c2: i2c@48072000 {

			compatible = "ti,omap2-i2c";

			ti,hwmods = "i2c2";

			reg = <0x48072000 0x80>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <57>;

			dmas = <&sdma 29 &sdma 30>;

			dma-names = "tx", "rx";

		};



		mcspi1: mcspi@48098000 {

			compatible = "ti,omap2-mcspi";

			ti,hwmods = "mcspi1";

			reg = <0x48098000 0x100>;

			interrupts = <65>;

			dmas = <&sdma 35 &sdma 36 &sdma 37 &sdma 38

				&sdma 39 &sdma 40 &sdma 41 &sdma 42>;

			dma-names = "tx0", "rx0", "tx1", "rx1",

				    "tx2", "rx2", "tx3", "rx3";

		};



		mcspi2: mcspi@4809a000 {

			compatible = "ti,omap2-mcspi";

			ti,hwmods = "mcspi2";

			reg = <0x4809a000 0x100>;

			interrupts = <66>;

			dmas = <&sdma 43 &sdma 44 &sdma 45 &sdma 46>;

			dma-names = "tx0", "rx0", "tx1", "rx1";

		};



		rng: rng@480a0000 {

			compatible = "ti,omap2-rng";

			ti,hwmods = "rng";

			reg = <0x480a0000 0x50>;

			interrupts = <36>;

		};



		sham: sham@480a4000 {

			compatible = "ti,omap2-sham";

			ti,hwmods = "sham";

			reg = <0x480a4000 0x64>;

			interrupts = <51>;

			dmas = <&sdma 13>;

			dma-names = "rx";

		};



		uart1: serial@4806a000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart1";

			reg = <0x4806a000 0x2000>;

			interrupts = <72>;

			dmas = <&sdma 49 &sdma 50>;

			dma-names = "tx", "rx";

			clock-frequency = <48000000>;

		};



		uart2: serial@4806c000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart2";

			reg = <0x4806c000 0x400>;

			interrupts = <73>;

			dmas = <&sdma 51 &sdma 52>;

			dma-names = "tx", "rx";

			clock-frequency = <48000000>;

		};



		uart3: serial@4806e000 {

			compatible = "ti,omap2-uart";

			ti,hwmods = "uart3";

			reg = <0x4806e000 0x400>;

			interrupts = <74>;

			dmas = <&sdma 53 &sdma 54>;

			dma-names = "tx", "rx";

			clock-frequency = <48000000>;

		};

arch/arm/boot/dts/omap2420.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -114,6 +114,15 @@ 
			dma-names = "tx", "rx";

		};



		msdi1: mmc@4809c000 {

			compatible = "ti,omap2420-mmc";

			ti,hwmods = "msdi1";

			reg = <0x4809c000 0x80>;

			interrupts = <83>;

			dmas = <&sdma 61 &sdma 62>;

			dma-names = "tx", "rx";

		};



		timer1: timer@48028000 {

			compatible = "ti,omap2420-timer";

			reg = <0x48028000 0x400>;
@@ -121,5 +130,19 @@ 
			ti,hwmods = "timer1";

			ti,timer-alwon;

		};



		wd_timer2: wdt@48022000 {

			compatible = "ti,omap2-wdt";

			ti,hwmods = "wd_timer2";

			reg = <0x48022000 0x80>;

		};

	};

};



&i2c1 {

	compatible = "ti,omap2420-i2c";

};



&i2c2 {

	compatible = "ti,omap2420-i2c";

};

arch/arm/boot/dts/omap2430.dtsi

+49 −0
Original line number Diff line number Diff line
@@ -175,6 +175,25 @@ 
			dma-names = "tx", "rx";

		};



		mmc1: mmc@4809c000 {

			compatible = "ti,omap2-hsmmc";

			reg = <0x4809c000 0x200>;

			interrupts = <83>;

			ti,hwmods = "mmc1";

			ti,dual-volt;

			dmas = <&sdma 61>, <&sdma 62>;

			dma-names = "tx", "rx";

		};



		mmc2: mmc@480b4000 {

			compatible = "ti,omap2-hsmmc";

			reg = <0x480b4000 0x200>;

			interrupts = <86>;

			ti,hwmods = "mmc2";

			dmas = <&sdma 47>, <&sdma 48>;

			dma-names = "tx", "rx";

		};



		timer1: timer@49018000 {

			compatible = "ti,omap2420-timer";

			reg = <0x49018000 0x400>;
@@ -182,5 +201,35 @@ 
			ti,hwmods = "timer1";

			ti,timer-alwon;

		};



		mcspi3: mcspi@480b8000 {

			compatible = "ti,omap2-mcspi";

			ti,hwmods = "mcspi3";

			reg = <0x480b8000 0x100>;

			interrupts = <91>;

			dmas = <&sdma 15 &sdma 16 &sdma 23 &sdma 24>;

			dma-names = "tx0", "rx0", "tx1", "rx1";

		};



		usb_otg_hs: usb_otg_hs@480ac000 {

			compatible = "ti,omap2-musb";

			ti,hwmods = "usb_otg_hs";

			reg = <0x480ac000 0x1000>;

			interrupts = <93>;

		};



		wd_timer2: wdt@49016000 {

			compatible = "ti,omap2-wdt";

			ti,hwmods = "wd_timer2";

			reg = <0x49016000 0x80>;

		};

	};

};



&i2c1 {

	compatible = "ti,omap2430-i2c";

};



&i2c2 {

	compatible = "ti,omap2430-i2c";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE