summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/logicpd-torpedo-som.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/logicpd-torpedo-som.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/logicpd-torpedo-som.dtsi')
-rw-r--r--arch/arm/boot/dts/logicpd-torpedo-som.dtsi35
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 00805322367e..02e161d119fb 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -110,6 +110,11 @@
&i2c3 {
clock-frequency = <400000>;
+ at24@50 {
+ compatible = "at24,24c02";
+ readonly;
+ reg = <0x50>;
+ };
};
/*
@@ -167,6 +172,31 @@
OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4) /* GPIO_162,BT_EN */
>;
};
+ mcspi1_pins: pinmux_mcspi1_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0) /* mcspi1_clk.mcspi1_clk */
+ OMAP3_CORE1_IOPAD(0x21ca, PIN_OUTPUT | MUX_MODE0) /* mcspi1_simo.mcspi1_simo */
+ OMAP3_CORE1_IOPAD(0x21cc, PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi1_somi.mcspi1_somi */
+ OMAP3_CORE1_IOPAD(0x21ce, PIN_OUTPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */
+ >;
+ };
+ hsusb_otg_pins: pinmux_hsusb_otg_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21a2, PIN_INPUT | MUX_MODE0) /* hsusb0_clk.hsusb0_clk */
+ OMAP3_CORE1_IOPAD(0x21a4, PIN_OUTPUT | MUX_MODE0) /* hsusb0_stp.hsusb0_stp */
+ OMAP3_CORE1_IOPAD(0x21a6, PIN_INPUT | MUX_MODE0) /* hsusb0_dir.hsusb0_dir */
+ OMAP3_CORE1_IOPAD(0x21a8, PIN_INPUT | MUX_MODE0) /* hsusb0_nxt.hsusb0_nxt */
+
+ OMAP3_CORE1_IOPAD(0x21aa, PIN_INPUT | MUX_MODE0) /* hsusb0_data0.hsusb0_data0 */
+ OMAP3_CORE1_IOPAD(0x21ac, PIN_INPUT | MUX_MODE0) /* hsusb0_data1.hsusb0_data1 */
+ OMAP3_CORE1_IOPAD(0x21ae, PIN_INPUT | MUX_MODE0) /* hsusb0_data2.hsusb0_data2 */
+ OMAP3_CORE1_IOPAD(0x21b0, PIN_INPUT | MUX_MODE0) /* hsusb0_data3.hsusb0_data3 */
+ OMAP3_CORE1_IOPAD(0x21b2, PIN_INPUT | MUX_MODE0) /* hsusb0_data4.hsusb0_data4 */
+ OMAP3_CORE1_IOPAD(0x21b4, PIN_INPUT | MUX_MODE0) /* hsusb0_data5.hsusb0_data5 */
+ OMAP3_CORE1_IOPAD(0x21b6, PIN_INPUT | MUX_MODE0) /* hsusb0_data6.hsusb0_data6 */
+ OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */
+ >;
+ };
};
&uart2 {
@@ -175,6 +205,11 @@
pinctrl-0 = <&uart2_pins>;
};
+&mcspi1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcspi1_pins>;
+};
+
&omap3_pmx_core2 {
mmc3_core2_pins: pinmux_mmc3_core2_pins {
pinctrl-single,pins = <