| Message ID | 1430655569-27849-2-git-send-email-eyalr@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>;