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

Commit 0081b77d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.17/soc-new' of... 

Merge tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge "SoC related changes for omaps for v3.17 merge window"
from Tony Lindgren:

- Add device tree and hwmod data for various devices
  for new SoCs

- Remove legacy mailbox hwmod data that's no longer
  needed for SoCs that are DT only. Note that this may
  cause a minor merge conflict in mach-omap2/devices.c
  with omap_init_mbox() and omap_init_hdmi_audio(), both
  are legacy code that is getting removed

* tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: DRA7: hwmod: Add data for RTC
  arm: dra7xx: Add hwmod data for MDIO and CPSW
  arm: dra7xx: Add hwmod data for pcie1 and pcie2 subsystems
  arm: dra7xx: Add hwmod data for pcie1 phy and pcie2 phy
  ARM: DRA7: hwmod: Add OCP2SCP3 module
  ARM: DRA7: hwmod: remove interrupts for DMA
  ARM: OMAP2+: DMA: remove requirement of irq for platform-dma driver
  ARM: AM33xx: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP4: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP2: hwmod_data: Remove legacy mailbox data and addrs
  ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
  ARM: DRA7: hwmod_data: Add mailbox hwmod data
  ARM: dts: DRA7: Add mailbox nodes
  ARM: dts: AM4372: Correct mailbox node data
  ARM: dts: AM33xx: Add mailbox node
  ARM: dts: OMAP4: Add mailbox node
  ARM: dts: OMAP2+: Add mailbox fifo and user information
  ARM: AM43xx: hwmod: add DSS hwmod data

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ba66d7f0 3965f5ba

arch/arm/boot/dts/am33xx.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -347,6 +347,15 @@ 
			status = "disabled";

		};



		mailbox: mailbox@480C8000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x480C8000 0x200>;

			interrupts = <77>;

			ti,hwmods = "mailbox";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

		};



		timer1: timer@44e31000 {

			compatible = "ti,am335x-timer-1ms";

			reg = <0x44e31000 0x400>;

arch/arm/boot/dts/am4372.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -168,9 +168,6 @@ 
			ti,hwmods = "mailbox";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

			ti,mbox-names = "wkup_m3";

			ti,mbox-data = <0 0 0 0>;

			status = "disabled";

		};



		timer1: timer@44e31000 {

arch/arm/boot/dts/dra7.dtsi

+117 −0
Original line number Diff line number Diff line
@@ -338,6 +338,123 @@ 
			status = "disabled";

		};



		mailbox1: mailbox@4a0f4000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x4a0f4000 0x200>;

			ti,hwmods = "mailbox1";

			ti,mbox-num-users = <3>;

			ti,mbox-num-fifos = <8>;

			status = "disabled";

		};



		mailbox2: mailbox@4883a000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x4883a000 0x200>;

			ti,hwmods = "mailbox2";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox3: mailbox@4883c000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x4883c000 0x200>;

			ti,hwmods = "mailbox3";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox4: mailbox@4883e000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x4883e000 0x200>;

			ti,hwmods = "mailbox4";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox5: mailbox@48840000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48840000 0x200>;

			ti,hwmods = "mailbox5";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox6: mailbox@48842000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48842000 0x200>;

			ti,hwmods = "mailbox6";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox7: mailbox@48844000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48844000 0x200>;

			ti,hwmods = "mailbox7";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox8: mailbox@48846000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48846000 0x200>;

			ti,hwmods = "mailbox8";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox9: mailbox@4885e000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x4885e000 0x200>;

			ti,hwmods = "mailbox9";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox10: mailbox@48860000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48860000 0x200>;

			ti,hwmods = "mailbox10";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox11: mailbox@48862000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48862000 0x200>;

			ti,hwmods = "mailbox11";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox12: mailbox@48864000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48864000 0x200>;

			ti,hwmods = "mailbox12";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		mailbox13: mailbox@48802000 {

			compatible = "ti,omap4-mailbox";

			reg = <0x48802000 0x200>;

			ti,hwmods = "mailbox13";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			status = "disabled";

		};



		timer1: timer@4ae18000 {

			compatible = "ti,omap5430-timer";

			reg = <0x4ae18000 0x80>;

arch/arm/boot/dts/omap2420.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ 
			interrupts = <26>, <34>;

			interrupt-names = "dsp", "iva";

			ti,hwmods = "mailbox";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <6>;

		};



		timer1: timer@48028000 {

arch/arm/boot/dts/omap2430.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -247,6 +247,8 @@ 
			reg = <0x48094000 0x200>;

			interrupts = <26>;

			ti,hwmods = "mailbox";

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <6>;

		};



		timer1: timer@49018000 {