[PATCH 1/2] am335x-evm: add mmc3 and wlan definitions to dts

[PATCH 1/2] am335x-evm: add mmc3 and wlan definitions to dts

[Eyal Reizer]

This includes the wlan regulator, pinmux, DMA
and wlcore bindings.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Eyal Reizer <eyalr@ti.com>
---
 arch/arm/boot/dts/am335x-evm.dts |   65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 6634251..0f398fa 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "am33xx.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "TI AM335x EVM";
@@ -38,6 +39,20 @@
 		regulator-boot-on;
 	};
 
+	wlan_en_reg: fixedregulator@2 {
+		compatible = "regulator-fixed";
+		regulator-name = "wlan-en-regulator";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+
+		/* WLAN_EN GPIO for this board - Bank1, pin16 */
+		gpio = <&gpio1 16 0>;
+
+		/* WLAN card specific delay */
+		startup-delay-us = <70000>;
+		enable-active-high;
+	};
+
 	matrix_keypad: matrix_keypad@0 {
 		compatible = "gpio-matrix-keypad";
 		debounce-delay-ms = <5>;
@@ -266,6 +281,25 @@
 		>;
 	};
 
+	mmc3_pins: pinmux_mmc3_pins {
+		pinctrl-single,pins = <
+			0x44 (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a1.mmc2_dat0, INPUT_PULLUP | MODE3 */
+			0x48 (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a2.mmc2_dat1, INPUT_PULLUP | MODE3 */
+			0x4C (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a3.mmc2_dat2, INPUT_PULLUP | MODE3 */
+			0x78 (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_ben1.mmc2_dat3, INPUT_PULLUP | MODE3 */
+			0x88 (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_csn3.mmc2_cmd, INPUT_PULLUP | MODE3 */
+			0x8C (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_clk.mmc2_clk, INPUT_PULLUP | MODE3 */
+		>;
+	};
+
+	wlan_pins: pinmux_wlan_pins {
+		pinctrl-single,pins = <
+			0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a0.gpio1_16 */
+			0x19C (PIN_INPUT | MUX_MODE7)		/* mcasp0_ahclkr.gpio3_17 */
+			0x1AC (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* mcasp0_ahclkx.gpio3_21 */
+		>;
+	};
+
 	lcd_pins_s0: lcd_pins_s0 {
 		pinctrl-single,pins = <
 			0x20 (PIN_OUTPUT | MUX_MODE1)		/* gpmc_ad8.lcd_data23 */
@@ -665,6 +699,37 @@
 	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
 };
 
+&mmc3 {
+	/* these are on the crossbar and are outlined in the
+	   xbar-event-map element */
+	dmas = <&edma 12
+		&edma 13>;
+	dma-names = "tx", "rx";
+	status = "okay";
+	vmmc-supply = <&wlan_en_reg>;
+	bus-width = <4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins &wlan_pins>;
+	ti,non-removable;
+	ti,needs-special-hs-handling;
+	cap-power-off-card;
+	keep-power-in-suspend;
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	wlcore: wlcore@0 {
+		compatible = "ti,wl1835";
+		reg = <2>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
+	};
+};
+
+&edma {
+	ti,edma-xbar-event-map = /bits/ 16 <1 12
+					    2 13>;
+};
+
 &sham {
 	status = "okay";
 };
-- 
1.7.9.5

[PATCH 2/2] am335x-evm: add bluetooth support

[Eyal Reizer]

From: Eliad Peller <eliad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>

uart1 is used for shared transport (used for multiplexing
bluetooth and nfc data). add the needed muxes and definitions.

Signed-off-by: Eliad Peller <eliad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
Signed-off-by: Eyal Reizer <eyalr-l0cyMroinI0@public.gmane.org>
---
 arch/arm/boot/dts/am335x-evm.dts |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 0f398fa..5968cde 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -135,6 +135,18 @@
 		};
 	};
 
+	kim {
+		compatible = "kim";
+		nshutdown_gpio = <117>; /* Bank3, pin21 */
+		dev_name = "/dev/ttyS1";
+		flow_cntrl = <1>;
+		baud_rate = <3000000>;
+	};
+
+	btwilink {
+		compatible = "btwilink";
+	};
+
 	sound {
 		compatible = "ti,da830-evm-audio";
 		ti,model = "AM335x-EVM";
@@ -191,6 +203,15 @@
 		>;
 	};
 
+	uart1_pins: pinmux_uart1_pins {
+		pinctrl-single,pins = <
+			0x178 (PIN_INPUT | MUX_MODE0)		/* uart1_ctsn.uart1_ctsn */
+			0x17C (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_rtsn.uart1_rtsn */
+			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
+			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
+		>;
+	};
+
 	clkout2_pin: pinmux_clkout2_pin {
 		pinctrl-single,pins = <
 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
@@ -357,6 +378,13 @@
 	status = "okay";
 };
 
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>;
+
+	status = "okay";
+};
+
 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] am335x-evm: add bluetooth support

[Rob Herring]

On Sun, May 3, 2015 at 7:19 AM, Eyal Reizer <eyalreizer@gmail.com> wrote:
> From: Eliad Peller <eliad@wizery.com>
>
> uart1 is used for shared transport (used for multiplexing
> bluetooth and nfc data). add the needed muxes and definitions.
>
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> Signed-off-by: Eyal Reizer <eyalr@ti.com>
> ---
>  arch/arm/boot/dts/am335x-evm.dts |   28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 0f398fa..5968cde 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -135,6 +135,18 @@
>                 };
>         };
>
> +       kim {
> +               compatible = "kim";

Who is kim?

> +               nshutdown_gpio = <117>; /* Bank3, pin21 */

We have a standard way to specify gpios.

> +               dev_name = "/dev/ttyS1";

Uh, Linux specific. No.

> +               flow_cntrl = <1>;
> +               baud_rate = <3000000>;

I believe there are standard properties for uarts for both of these.

Is any of this documented?

Rob

Re: [PATCH 2/2] am335x-evm: add bluetooth support

[Peter Hurley]

Hi Rob,

On 05/04/2015 06:28 PM, Rob Herring wrote:
> On Sun, May 3, 2015 at 7:19 AM, Eyal Reizer <eyalreizer@gmail.com> wrote:
>> From: Eliad Peller <eliad@wizery.com>
>>
>> uart1 is used for shared transport (used for multiplexing
>> bluetooth and nfc data). add the needed muxes and definitions.
>>
>> Signed-off-by: Eliad Peller <eliad@wizery.com>
>> Signed-off-by: Eyal Reizer <eyalr@ti.com>
>> ---
>>  arch/arm/boot/dts/am335x-evm.dts |   28 ++++++++++++++++++++++++++++
>>  1 file changed, 28 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
>> index 0f398fa..5968cde 100644
>> --- a/arch/arm/boot/dts/am335x-evm.dts
>> +++ b/arch/arm/boot/dts/am335x-evm.dts
>> @@ -135,6 +135,18 @@
>>                 };
>>         };
>>
>> +       kim {
>> +               compatible = "kim";
> 
> Who is kim?

drivers/misc/ti-st/st_kim.c, et.al.

>> +               nshutdown_gpio = <117>; /* Bank3, pin21 */
> 
> We have a standard way to specify gpios.
> 
>> +               dev_name = "/dev/ttyS1";
> 
> Uh, Linux specific. No.
> 
>> +               flow_cntrl = <1>;
>> +               baud_rate = <3000000>;
> 
> I believe there are standard properties for uarts for both of these.
>
> Is any of this documented?

See commit 46d0d333 ("ti-st: add device tree support").

Don't shoot the messenger; I had nothing to do with this.

Regards,
Peter Hurley

RE: [PATCH 2/2] am335x-evm: add bluetooth support

[Reizer, Eyal]

[-- Attachment #1: Type: text/plain, Size: 1905 bytes --]

Hi Rob,

Please ignore this patch. 
I have received pushback on a similar patch for a different platform (am437x-evm) and submitted a v2 (attached) that only initializes the uart without using the shared transport driver.


> -----Original Message-----
> From: Rob Herring [mailto:robherring2@gmail.com]
> Sent: Tuesday, May 05, 2015 1:28 AM
> To: Eyal Reizer
> Cc: Tony Lindgren; Rob Herring; Pawel Moll; Mark Rutland; Ian Campbell;
> Kumar Gala; Russell King - ARM Linux; linux-omap;
> devicetree@vger.kernel.org; Eliad Peller; Reizer, Eyal
> Subject: Re: [PATCH 2/2] am335x-evm: add bluetooth support
> 
> On Sun, May 3, 2015 at 7:19 AM, Eyal Reizer <eyalreizer@gmail.com> wrote:
> > From: Eliad Peller <eliad@wizery.com>
> >
> > uart1 is used for shared transport (used for multiplexing bluetooth
> > and nfc data). add the needed muxes and definitions.
> >
> > Signed-off-by: Eliad Peller <eliad@wizery.com>
> > Signed-off-by: Eyal Reizer <eyalr@ti.com>
> > ---
> >  arch/arm/boot/dts/am335x-evm.dts |   28
> ++++++++++++++++++++++++++++
> >  1 file changed, 28 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/am335x-evm.dts
> > b/arch/arm/boot/dts/am335x-evm.dts
> > index 0f398fa..5968cde 100644
> > --- a/arch/arm/boot/dts/am335x-evm.dts
> > +++ b/arch/arm/boot/dts/am335x-evm.dts
> > @@ -135,6 +135,18 @@
> >                 };
> >         };
> >
> > +       kim {
> > +               compatible = "kim";
> 
> Who is kim?
> 
> > +               nshutdown_gpio = <117>; /* Bank3, pin21 */
> 
> We have a standard way to specify gpios.
> 
> > +               dev_name = "/dev/ttyS1";
> 
> Uh, Linux specific. No.
> 
> > +               flow_cntrl = <1>;
> > +               baud_rate = <3000000>;
> 
> I believe there are standard properties for uarts for both of these.
> 
> Is any of this documented?
> 
> Rob

Best Regards,
Eyal

[-- Attachment #2: Type: message/rfc822, Size: 4829 bytes --]

From: Eyal Reizer <eyalreizer@gmail.com>
To: "bcousson@baylibre.com" <bcousson@baylibre.com>, "tony@atomide.com" <tony@atomide.com>, "robh+dt@kernel.org" <robh+dt@kernel.org>, "pawel.moll@arm.com" <pawel.moll@arm.com>, "mark.rutland@arm.com" <mark.rutland@arm.com>, "ijc+devicetree@hellion.org.uk" <ijc+devicetree@hellion.org.uk>, "galak@codeaurora.org" <galak@codeaurora.org>, "linux@arm.linux.org.uk" <linux@arm.linux.org.uk>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Eliad Peller <eliad@wizery.com>, "Reizer, Eyal" <eyalr@ti.com>
Subject: [PATCHv2] am335x-evm: add bluetooth support
Date: Mon, 4 May 2015 12:41:13 +0000
Message-ID: <1430743273-2518-1-git-send-email-eyalr@ti.com>

From: Eliad Peller <eliad@wizery.com>

uart1 is used for connecting to wilink8 bluetooth subsystem.
add the needed muxes and definitions.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Eyal Reizer <eyalr@ti.com>
---
Changes in v2:
removed ti shared transport bindings

 arch/arm/boot/dts/am335x-evm.dts |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 0f398fa..765be27 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -191,6 +191,15 @@
                >;
        };

+       uart1_pins: pinmux_uart1_pins {
+               pinctrl-single,pins = <
+                       0x178 (PIN_INPUT | MUX_MODE0)           /* uart1_ctsn.uart1_ctsn */
+                       0x17C (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_rtsn.uart1_rtsn */
+                       0x180 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart1_rxd.uart1_rxd */
+                       0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_txd.uart1_txd */
+               >;
+       };
+
        clkout2_pin: pinmux_clkout2_pin {
                pinctrl-single,pins = <
                        0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
@@ -357,6 +366,13 @@
        status = "okay";
 };

+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_pins>;
+
+       status = "okay";
+};
+
 &i2c0 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
--
1.7.9.5

Re: [PATCH 1/2] am335x-evm: add mmc3 and wlan definitions to dts

[Tony Lindgren]

* Eyal Reizer <eyalreizer@gmail.com> [150503 05:20]:
> This includes the wlan regulator, pinmux, DMA
> and wlcore bindings.
> 
> Signed-off-by: Arik Nemtsov <arik@wizery.com>
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> Signed-off-by: Eyal Reizer <eyalr@ti.com>

Applying only 1/2 of this series into omap-for-v4.2/dt thanks.

Regards,

Tony