From 55f0f0e93854cfd64e7b5499e190e1231cb0c39a Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Thu, 22 Jan 2015 21:38:07 +0100 Subject: [PATCH 01/17] ARM: dts: omap3-gta04: Fix backup-battery charging in devicetree file. Fix attribute names. Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index ee62d00bcbe6..63c5cffbba5a 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -377,8 +377,8 @@ }; &charger { - bb_uvolt = <3200000>; - bb_uamp = <150>; + ti,bb-uvolt = <3200000>; + ti,bb-uamp = <150>; }; /* spare */ From 2a88a0b3cf65299afebb5eed0c06e7880d72307a Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Thu, 22 Jan 2015 21:38:08 +0100 Subject: [PATCH 02/17] ARM: dts: omap3-gta04: Fix audio node malformatting Audio should be child of twl node. Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 63c5cffbba5a..ce283f5f6ad9 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -237,11 +237,11 @@ reg = <0x48>; interrupts = <7>; /* SYS_NIRQ cascaded to intc */ interrupt-parent = <&intc>; - }; - twl_audio: audio { - compatible = "ti,twl4030-audio"; - codec { + twl_audio: audio { + compatible = "ti,twl4030-audio"; + codec { + }; }; }; }; From 98fd396ff7e9db29b408efb779d7d50fa2032249 Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Thu, 22 Jan 2015 21:38:09 +0100 Subject: [PATCH 03/17] ARM: dts: omap3-gta04: Enable mcbps2 necessary for audio mcbsp2 is used in gta04 soundcard config and by default is disabled so enable it for gta04. Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index ce283f5f6ad9..12b20a3e6daf 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -498,3 +498,7 @@ }; }; }; + +&mcbsp2 { + status = "okay"; +}; From 85f534e6ceecd38108b1d11c7fe63ef910f973c6 Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Thu, 22 Jan 2015 21:38:10 +0100 Subject: [PATCH 04/17] ARM: dts: omap3-gta04: Enable twl audio vibra support Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 12b20a3e6daf..63f4f48fe3e3 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -240,6 +240,7 @@ twl_audio: audio { compatible = "ti,twl4030-audio"; + ti,enable-vibra = <1>; codec { }; }; From 75fb2c150dd9177950b4f383889f880f3106074e Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Thu, 22 Jan 2015 21:38:11 +0100 Subject: [PATCH 05/17] ARM: dts: omap3-gta04: Fix a GPIO line for bma180 node GPIO_115 used as irq is in &gpio4, not &gpio3. Signed-off-by: Marek Belisko Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 63f4f48fe3e3..80409c47a4f4 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -265,7 +265,7 @@ bma180@41 { compatible = "bosch,bma180"; reg = <0x41>; - interrupt-parent = <&gpio3>; + interrupt-parent = <&gpio4>; interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; }; From 23c0ff5b3097daf8763b883b81f807cc8133c699 Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Thu, 22 Jan 2015 21:38:12 +0100 Subject: [PATCH 06/17] ARM: dts: omap3-gta04: Enable power-off using twl4030 Enabled poweroff through PMIC on GTA04. Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 80409c47a4f4..2ad194cf6296 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -244,6 +244,11 @@ codec { }; }; + + twl_power: power { + compatible = "ti,twl4030-power"; + ti,use_poweroff; + }; }; }; From 2a2130c0046bbfbec4bde0efdeb5f9c608207e63 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Thu, 22 Jan 2015 21:38:13 +0100 Subject: [PATCH 07/17] ARM: dts: omap3-gta04: Add ramp value for twl4030 audio Signed-off-by: Marek Belisko Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 2ad194cf6296..752a4e926045 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -242,6 +242,7 @@ compatible = "ti,twl4030-audio"; ti,enable-vibra = <1>; codec { + ti,ramp_delay_value = <3>; }; }; From ce9edf5b4f7a58da6d41f408faf3eaeaaf8d8674 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Jan 2015 21:38:14 +0100 Subject: [PATCH 08/17] ARM: dts: omap3-gta04: add comments about gpios Add comments to state which GPIO is used for some interrupts. Signed-off-by: NeilBrown Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 752a4e926045..b675cce4c980 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -264,7 +264,7 @@ compatible = "bosch,bmp085"; reg = <0x77>; interrupt-parent = <&gpio4>; - interrupts = <17 IRQ_TYPE_EDGE_RISING>; + interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* GPIO_113 */ }; /* accelerometer */ @@ -272,7 +272,7 @@ compatible = "bosch,bma180"; reg = <0x41>; interrupt-parent = <&gpio4>; - interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */ }; /* leds */ @@ -323,7 +323,7 @@ compatible = "ti,tsc2007"; reg = <0x48>; interrupt-parent = <&gpio6>; - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; + interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */ gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; ti,x-plate-ohms = <600>; }; From e45eebfab64a66cc292084056309f5aa385dbcc7 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Jan 2015 21:38:15 +0100 Subject: [PATCH 09/17] ARM: dts: omap3-gta04: enable power-off for wifi card. Signed-off-by: NeilBrown Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index b675cce4c980..3302b5b4b7a4 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -362,6 +362,7 @@ vmmc-supply = <&vaux4>; bus-width = <4>; ti,non-removable; + cap-power-off-card; }; &mmc3 { From c4aa13f84f160d96f24dd52f18e63896ad1af782 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Jan 2015 21:38:16 +0100 Subject: [PATCH 10/17] ARM: dts: omap3-gta04: add gyroscope Signed-off-by: NeilBrown Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index 3302b5b4b7a4..d6579d08e631 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -275,6 +275,14 @@ interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */ }; + /* gyroscope */ + itg3200@68 { + compatible = "invensense,itg3200"; + reg = <0x68>; + interrupt-parent = <&gpio2>; + interrupts = <24 0>; /* GPIO_56 */ + }; + /* leds */ tca6507@45 { compatible = "ti,tca6507"; From 01ca6d57ec2c28572e972b9a006f0e5a35355be0 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Jan 2015 21:38:17 +0100 Subject: [PATCH 11/17] ARM: dts: omap3-gta04: only power DSS when necessary. i.e. configure vpll2 as a supply for the dss rather than being always-on. Signed-off-by: NeilBrown Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index d6579d08e631..eed0208f0db2 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -428,16 +428,12 @@ regulator-max-microvolt = <3150000>; }; -/* Needed to power the DPI pins */ -&vpll2 { - regulator-always-on; -}; - &dss { pinctrl-names = "default"; pinctrl-0 = < &dss_dpi_pins >; status = "okay"; + vdds_dsi-supply = <&vpll2>; port { dpi_out: endpoint { From 1e1e8cb3fa819ba94e1e505572dd8fff646f4294 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 22 Jan 2015 21:38:19 +0100 Subject: [PATCH 12/17] ARM: dts: omap3-gta04: Disable keypad The twl4030 keypad is not wired up in the gta04, so mark it disabled to avoid pointless initialization. Signed-off-by: NeilBrown Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi index eed0208f0db2..fb3a69604ed5 100644 --- a/arch/arm/boot/dts/omap3-gta04.dtsi +++ b/arch/arm/boot/dts/omap3-gta04.dtsi @@ -377,6 +377,10 @@ status = "disabled"; }; +&twl_keypad { + status = "disabled"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&uart1_pins>; From 72d032266b630e29ef97fc01a6cb1e15d7a20d4c Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 21 Jan 2015 16:21:52 -0800 Subject: [PATCH 13/17] ARM: dts: Fix dm816x pinctrl and syscon so they are children of SCM Looks like I only got half done with moving pinctrl and syscon to be children of the SCM. I've set up the FAPLL clocks that way already, but did not complete the job as I copied the syscon values from am33xx.dtsi. To make sure the syscon mapping works, I've verfified that we can set up davinci_emac mac address the same way as cpsw already does with the syscon mapping. So let's add that too. Cc: Brian Hutchinson Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/dm816x.dtsi | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi index 7adac097a71c..d98d0f7de380 100644 --- a/arch/arm/boot/dts/dm816x.dtsi +++ b/arch/arm/boot/dts/dm816x.dtsi @@ -50,15 +50,6 @@ }; }; - dm816x_pinmux: pinmux@44e10800 { - compatible = "pinctrl-single"; - reg = <0x48140800 0x50a>; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-single,register-width = <16>; - pinctrl-single,function-mask = <0xf>; - }; - /* * XXX: Use a flat representation of the dm816x interconnect. * The real dm816x interconnect network is quite complex. Since @@ -89,12 +80,29 @@ }; scrm: scrm@48140000 { - compatible = "ti,dm816-scrm"; + compatible = "ti,dm816-scrm", "simple-bus"; reg = <0x48140000 0x21000>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x48140000 0x21000>; + dm816x_pinmux: pinmux@800 { + compatible = "pinctrl-single"; + reg = <0x800 0x50a>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,register-width = <16>; + pinctrl-single,function-mask = <0xf>; + }; + + /* Device Configuration Registers */ + scm_conf: syscon@600 { + compatible = "syscon"; + reg = <0x600 0x110>; + #address-cells = <1>; + #size-cells = <1>; + }; + scrm_clocks: clocks { #address-cells = <1>; #size-cells = <0>; @@ -104,11 +112,6 @@ }; }; - cm: syscon@44e10000 { - compatible = "ti,am33xx-controlmodule", "syscon"; - reg = <0x44e10000 0x800>; - }; - edma: edma@49000000 { compatible = "ti,edma3"; ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2", "tptc3"; @@ -213,6 +216,7 @@ reg = <0x4a100000 0x800 0x4a100900 0x3700>; clocks = <&sysclk24_ck>; + syscon = <&scm_conf>; ti,davinci-ctrl-reg-offset = <0>; ti,davinci-ctrl-mod-reg-offset = <0x900>; ti,davinci-ctrl-ram-offset = <0x2000>; @@ -226,6 +230,7 @@ ti,hwmods = "emac1"; reg = <0x4a120000 0x4000>; clocks = <&sysclk24_ck>; + syscon = <&scm_conf>; ti,davinci-ctrl-reg-offset = <0>; ti,davinci-ctrl-mod-reg-offset = <0x900>; ti,davinci-ctrl-ram-offset = <0x2000>; From 87517d26d888014c1bc93f4a7df623c4f413ccfb Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 26 Jan 2015 14:15:28 +0200 Subject: [PATCH 14/17] ARM: dts: dra7-evm: Add extcon nodes for USB On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros Reviewed-by: Felipe Balbi Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/dra7-evm.dts | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 10b725c7bfc0..c1d0ac7bd002 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -26,6 +26,16 @@ regulator-max-microvolt = <3300000>; }; + extcon_usb1: extcon_usb1 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>; + }; + + extcon_usb2: extcon_usb2 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>; + }; + vtt_fixed: fixedregulator-vtt { compatible = "regulator-fixed"; regulator-name = "vtt_fixed"; @@ -391,6 +401,19 @@ }; }; }; + + pcf_gpio_21: gpio@21 { + compatible = "ti,pcf8575"; + reg = <0x21>; + lines-initial-states = <0x1408>; + gpio-controller; + #gpio-cells = <2>; + interrupt-parent = <&gpio6>; + interrupts = <11 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; &i2c2 { @@ -520,6 +543,14 @@ }; }; +&omap_dwc3_1 { + extcon = <&extcon_usb1>; +}; + +&omap_dwc3_2 { + extcon = <&extcon_usb2>; +}; + &usb1 { dr_mode = "peripheral"; pinctrl-names = "default"; From f56de327b4c41aa8dece7f32ab76571fac4bf586 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 26 Jan 2015 14:15:29 +0200 Subject: [PATCH 15/17] ARM: dts: dra72-evm: Add extcon nodes for USB On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros Reviewed-by: Felipe Balbi Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/dra72-evm.dts | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index cacddd74c516..4d8711713610 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "dra72x.dtsi" +#include / { model = "TI DRA722"; @@ -24,6 +25,16 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + + extcon_usb1: extcon_usb1 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>; + }; + + extcon_usb2: extcon_usb2 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>; + }; }; &dra7_pmx_core { @@ -255,6 +266,18 @@ ti,palmas-long-press-seconds = <6>; }; }; + + pcf_gpio_21: gpio@21 { + compatible = "ti,pcf8575"; + reg = <0x21>; + lines-initial-states = <0x1408>; + gpio-controller; + #gpio-cells = <2>; + interrupt-parent = <&gpio6>; + interrupts = <11 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + }; }; &uart1 { @@ -357,6 +380,14 @@ phy-supply = <&ldo4_reg>; }; +&omap_dwc3_1 { + extcon = <&extcon_usb1>; +}; + +&omap_dwc3_2 { + extcon = <&extcon_usb2>; +}; + &usb1 { dr_mode = "peripheral"; pinctrl-names = "default"; From f60db98eaa67e02915f01e11933501127bc004b0 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 26 Jan 2015 14:15:30 +0200 Subject: [PATCH 16/17] ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). NOTE: the ports on this board cannot switch roles. They are configured either host or peripheral by hardwiring the respective ID pins. Signed-off-by: Roger Quadros Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am57xx-beagle-x15.dts | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts index c5d4ceabdd80..0e889eb62a59 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts @@ -88,6 +88,20 @@ gpio-fan,speed-map = <0 0>, <13000 1>; }; + + extcon_usb1: extcon_usb1 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&extcon_usb1_pins>; + }; + + extcon_usb2: extcon_usb2 { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&extcon_usb2_pins>; + }; }; &dra7_pmx_core { @@ -252,6 +266,17 @@ >; }; + extcon_usb1_pins: extcon_usb1_pins { + pinctrl-single,pins = < + 0x3ec (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_rtsn.gpio7_25 */ + >; + }; + + extcon_usb2_pins: extcon_usb2_pins { + pinctrl-single,pins = < + 0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */ + >; + }; }; &i2c1 { @@ -523,3 +548,11 @@ pinctrl-names = "default"; pinctrl-0 = <&usb1_pins>; }; + +&omap_dwc3_1 { + extcon = <&extcon_usb1>; +}; + +&omap_dwc3_2 { + extcon = <&extcon_usb2>; +}; From 726806ad9ba10f8ba8d26ba8154d98a7c9b89a12 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 26 Jan 2015 14:15:31 +0200 Subject: [PATCH 17/17] ARM: dts: am57xx-beagle-x15: Fix USB2 mode On this board USB2 is meant to be used as peripheral only. The ID pin for USB2 is hardwired HIGH. Signed-off-by: Roger Quadros Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am57xx-beagle-x15.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts index 0e889eb62a59..03750af3b49a 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts @@ -556,3 +556,7 @@ &omap_dwc3_2 { extcon = <&extcon_usb2>; }; + +&usb2 { + dr_mode = "peripheral"; +};