summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap3-n950-n9.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-02-27 00:33:52 +0300
committerArnd Bergmann <arnd@arndb.de>2016-02-27 00:33:52 +0300
commit0314df7752735149f92c40db14036c844e2c5ce4 (patch)
treed1177d1b4b0081abc4699094d8208d6804b41f14 /arch/arm/boot/dts/omap3-n950-n9.dtsi
parent1df1e5bf872825fe4db8ea37b2d1acf45eaed234 (diff)
parentb9d3ec1d98c658226606e66e55c940491447e617 (diff)
downloadlinux-0314df7752735149f92c40db14036c844e2c5ce4.tar.xz
Merge tag 'omap-for-v4.6/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Device tree changes for omaps for v4.6 merge window. Mostly just adding board specific devices and few new boards: - N900 improvments for adp1653 and gpio keys - Add missing bandgap data for omap3 - Add more devices for compulab cm-t335 - Add n950 WLAN support, enable modem, add pinctrl for SSI - Correct dm814x and dra62x auxclk rate, add support for GPMC and NAND - Add syscon node for PHY's on dra7 - Add support more devices on logicpd torpedo - Add USB host support for igep and specify boot console - Fix audio clock for am335x-sl50 and specify boot console - Remove deprecated tx-fifo-resize for dwc3 that was only used on omap5 es1.0 - Add dra7 thermal data - Update am43x-epos-evm compatible string to am438 - Add support for logicpd dm3730 som-lv * tag 'omap-for-v4.6/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (38 commits) ARM: dts: am57xx-beagle-x15: Add eeprom information ARM: dts: Add HSUSB2 EHCI Support to Logic PD DM37xx SOM-LV ARM: dts: n900: Use linux input defines instead hardcoded constants ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV ARM: dts: omap3logic: Add PWM-Backlight ARM: dts: omap3-n900: Allow gpio keys to be disabled ARM: dts: am43x-epos-evm: Add the am438 compatible string ARM: dts: DRA7: Add missing IVA and DSPEVE thermal domain data ARM: dts: DRA7: Add IVA thermal data ARM: dts: DRA7: Add DSPEVE thermal data ARM: dts: remove deprecated property dwc3 ARM: dts: OMAP3-N950-N9: Add ssi idle pinctrl state ARM: dts: am335x-sl50: Fix audio codec setup. ARM: dts: am335x-sl50: Specify the device to be used for boot console output. ARM: dts: omap3-igep0030-common: Add USB Host support ARM: dts: igep00x0: Specify the device to be used for boot console output. ARM: dts: LogicPD Torpedo: Set HSUSB0 Pin Mux ARM: dts: OMAP3-N950-N9: Enable modem ARM: dts: OMAP3-N950-N9: Enable SSI module ARM: dts: LogicPD Torpedo: Add SPI EEPROM ...
Diffstat (limited to 'arch/arm/boot/dts/omap3-n950-n9.dtsi')
-rw-r--r--arch/arm/boot/dts/omap3-n950-n9.dtsi93
1 files changed, 93 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index a2c2b8d8dd2c..858a25048102 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -31,6 +31,14 @@
startup-delay-us = <150>;
enable-active-high;
};
+
+ vwlan_fixed: fixedregulator@2 {
+ compatible = "regulator-fixed";
+ regulator-name = "VWLAN";
+ gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
+ enable-active-high;
+ regulator-boot-off;
+ };
};
&omap3_pmx_core {
@@ -44,6 +52,55 @@
OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3 */
>;
};
+
+ wlan_pins: pinmux_wlan_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE4) /* gpio 35 - wlan enable */
+ OMAP3_CORE1_IOPAD(0x208a, PIN_INPUT | MUX_MODE4) /* gpio 42 - wlan irq */
+ >;
+ };
+
+ ssi_pins: pinmux_ssi_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1) /* ssi1_dat_tx */
+ OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1) /* ssi1_flag_tx */
+ OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1) /* ssi1_rdy_tx */
+ OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+ OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1) /* ssi1_dat_rx */
+ OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1) /* ssi1_flag_rx */
+ OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE1) /* ssi1_rdy_rx */
+ OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | MUX_MODE1) /* ssi1_wake */
+ >;
+ };
+
+ ssi_pins_idle: pinmux_ssi_pins_idle {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE7) /* ssi1_dat_tx */
+ OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE7) /* ssi1_flag_tx */
+ OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLDOWN | MUX_MODE7) /* ssi1_rdy_tx */
+ OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+ OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE7) /* ssi1_dat_rx */
+ OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE7) /* ssi1_flag_rx */
+ OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE4) /* ssi1_rdy_rx */
+ OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | MUX_MODE7) /* ssi1_wake */
+ >;
+ };
+
+ modem_pins1: pinmux_modem_core1_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
+ OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE4) /* gpio_88 (cmt_rst_rq) */
+ OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE4) /* gpio_93 (cmt_apeslpx) */
+ >;
+ };
+};
+
+&omap3_pmx_core2 {
+ modem_pins2: pinmux_modem_core2_pins {
+ pinctrl-single,pins = <
+ OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4) /* gpio_23 (cmt_en) */
+ >;
+ };
};
&i2c1 {
@@ -191,3 +248,39 @@
};
};
};
+
+&ssi_port1 {
+ pinctrl-names = "default", "idle";
+ pinctrl-0 = <&ssi_pins>;
+ pinctrl-1 = <&ssi_pins_idle>;
+
+ ti,ssi-cawake-gpio = <&gpio5 23 GPIO_ACTIVE_HIGH>; /* 151 */
+
+ modem: hsi-client {
+ pinctrl-names = "default";
+ pinctrl-0 = <&modem_pins1 &modem_pins2>;
+
+ hsi-channel-ids = <0>, <1>, <2>, <3>;
+ hsi-channel-names = "mcsaab-control",
+ "speech-control",
+ "speech-data",
+ "mcsaab-data";
+ hsi-speed-kbps = <96000>;
+ hsi-mode = "frame";
+ hsi-flow = "synchronized";
+ hsi-arb-mode = "round-robin";
+
+ interrupts-extended = <&gpio2 2 IRQ_TYPE_EDGE_RISING>; /* gpio 34 */
+
+ gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>, /* gpio 93 */
+ <&gpio3 24 GPIO_ACTIVE_HIGH>, /* gpio 88 */
+ <&gpio1 23 GPIO_ACTIVE_HIGH>; /* gpio 23 */
+ gpio-names = "cmt_apeslpx",
+ "cmt_rst_rq",
+ "cmt_en";
+ };
+};
+
+&ssi_port2 {
+ status = "disabled";
+};