diff options
author | Sebastian Reichel <sre@kernel.org> | 2014-05-10 12:37:49 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-05-27 14:59:44 -0400 |
commit | 782e25a42b09ae671db4d6057d75aba0e08d235f (patch) | |
tree | ebda3dcdcb759305389c00ad746a828f832b4179 /arch | |
parent | dc94fabfc0bb9222543dd9a034f101b4cd76cd45 (diff) |
ARM: dts: omap3-n900: Add SSI support
Add SSI device tree data for OMAP3 and Nokia N900.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Tested-By: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 24 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 45 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap34xx.dtsi | 11 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap36xx.dtsi | 11 |
4 files changed, 91 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index f9fbb0315808..fe667f8b82fe 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts | |||
@@ -203,6 +203,19 @@ | |||
203 | 0x05a (PIN_INPUT | MUX_MODE4) /* gpio 42 => wl1251 irq */ | 203 | 0x05a (PIN_INPUT | MUX_MODE4) /* gpio 42 => wl1251 irq */ |
204 | >; | 204 | >; |
205 | }; | 205 | }; |
206 | |||
207 | ssi_pins: pinmux_ssi { | ||
208 | pinctrl-single,pins = < | ||
209 | 0x150 (PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */ | ||
210 | 0x14e (PIN_OUTPUT | MUX_MODE1) /* ssi1_flag_tx */ | ||
211 | 0x152 (PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */ | ||
212 | 0x14c (PIN_OUTPUT | MUX_MODE1) /* ssi1_dat_tx */ | ||
213 | 0x154 (PIN_INPUT | MUX_MODE1) /* ssi1_dat_rx */ | ||
214 | 0x156 (PIN_INPUT | MUX_MODE1) /* ssi1_flag_rx */ | ||
215 | 0x158 (PIN_OUTPUT | MUX_MODE1) /* ssi1_rdy_rx */ | ||
216 | 0x15a (PIN_OUTPUT | MUX_MODE1) /* ssi1_wake */ | ||
217 | >; | ||
218 | }; | ||
206 | }; | 219 | }; |
207 | 220 | ||
208 | &i2c1 { | 221 | &i2c1 { |
@@ -720,3 +733,14 @@ | |||
720 | &mcbsp2 { | 733 | &mcbsp2 { |
721 | status = "ok"; | 734 | status = "ok"; |
722 | }; | 735 | }; |
736 | |||
737 | &ssi_port1 { | ||
738 | pinctrl-names = "default"; | ||
739 | pinctrl-0 = <&ssi_pins>; | ||
740 | |||
741 | ti,ssi-cawake-gpio = <&gpio5 23 GPIO_ACTIVE_HIGH>; /* 151 */ | ||
742 | }; | ||
743 | |||
744 | &ssi_port2 { | ||
745 | status = "disabled"; | ||
746 | }; \ No newline at end of file | ||
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index acb9019dc437..b8cd2d78347b 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -757,6 +757,51 @@ | |||
757 | clock-names = "fck"; | 757 | clock-names = "fck"; |
758 | }; | 758 | }; |
759 | }; | 759 | }; |
760 | |||
761 | ssi: ssi-controller@48058000 { | ||
762 | compatible = "ti,omap3-ssi"; | ||
763 | ti,hwmods = "ssi"; | ||
764 | |||
765 | status = "disabled"; | ||
766 | |||
767 | reg = <0x48058000 0x1000>, | ||
768 | <0x48059000 0x1000>; | ||
769 | reg-names = "sys", | ||
770 | "gdd"; | ||
771 | |||
772 | interrupts = <71>; | ||
773 | interrupt-names = "gdd_mpu"; | ||
774 | |||
775 | #address-cells = <1>; | ||
776 | #size-cells = <1>; | ||
777 | ranges; | ||
778 | |||
779 | ssi_port1: ssi-port@4805a000 { | ||
780 | compatible = "ti,omap3-ssi-port"; | ||
781 | |||
782 | reg = <0x4805a000 0x800>, | ||
783 | <0x4805a800 0x800>; | ||
784 | reg-names = "tx", | ||
785 | "rx"; | ||
786 | |||
787 | interrupt-parent = <&intc>; | ||
788 | interrupts = <67>, | ||
789 | <68>; | ||
790 | }; | ||
791 | |||
792 | ssi_port2: ssi-port@4805b000 { | ||
793 | compatible = "ti,omap3-ssi-port"; | ||
794 | |||
795 | reg = <0x4805b000 0x800>, | ||
796 | <0x4805b800 0x800>; | ||
797 | reg-names = "tx", | ||
798 | "rx"; | ||
799 | |||
800 | interrupt-parent = <&intc>; | ||
801 | interrupts = <69>, | ||
802 | <70>; | ||
803 | }; | ||
804 | }; | ||
760 | }; | 805 | }; |
761 | }; | 806 | }; |
762 | 807 | ||
diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi index 2e92360da1f3..3819c1e91591 100644 --- a/arch/arm/boot/dts/omap34xx.dtsi +++ b/arch/arm/boot/dts/omap34xx.dtsi | |||
@@ -40,6 +40,17 @@ | |||
40 | }; | 40 | }; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | &ssi { | ||
44 | status = "ok"; | ||
45 | |||
46 | clocks = <&ssi_ssr_fck>, | ||
47 | <&ssi_sst_fck>, | ||
48 | <&ssi_ick>; | ||
49 | clock-names = "ssi_ssr_fck", | ||
50 | "ssi_sst_fck", | ||
51 | "ssi_ick"; | ||
52 | }; | ||
53 | |||
43 | /include/ "omap34xx-omap36xx-clocks.dtsi" | 54 | /include/ "omap34xx-omap36xx-clocks.dtsi" |
44 | /include/ "omap36xx-omap3430es2plus-clocks.dtsi" | 55 | /include/ "omap36xx-omap3430es2plus-clocks.dtsi" |
45 | /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi" | 56 | /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi" |
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi index 22cf4647087e..541704a59a5a 100644 --- a/arch/arm/boot/dts/omap36xx.dtsi +++ b/arch/arm/boot/dts/omap36xx.dtsi | |||
@@ -78,6 +78,17 @@ | |||
78 | clock-names = "fck", "tv_dac_clk"; | 78 | clock-names = "fck", "tv_dac_clk"; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | &ssi { | ||
82 | status = "ok"; | ||
83 | |||
84 | clocks = <&ssi_ssr_fck>, | ||
85 | <&ssi_sst_fck>, | ||
86 | <&ssi_ick>; | ||
87 | clock-names = "ssi_ssr_fck", | ||
88 | "ssi_sst_fck", | ||
89 | "ssi_ick"; | ||
90 | }; | ||
91 | |||
81 | /include/ "omap34xx-omap36xx-clocks.dtsi" | 92 | /include/ "omap34xx-omap36xx-clocks.dtsi" |
82 | /include/ "omap36xx-omap3430es2plus-clocks.dtsi" | 93 | /include/ "omap36xx-omap3430es2plus-clocks.dtsi" |
83 | /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi" | 94 | /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi" |