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

Commit 3965f5ba authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.17/mailbox' into omap-for-v3.17/soc

parents ecf4c793 cbf14f3a

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 {