| Message ID | 1448373733-5839-2-git-send-email-uri.mashiach@compulab.co.il (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 24, 2015 at 04:02:08PM +0200, Uri Mashiach wrote: > From: Ilya Ledvich <ilya@compulab.co.il> > > Add basic support for CompuLab cm-t335 module based on AM335X SoC. > > CM-T335 is a tiny computer-on-module (CoM) / system-on-module (SoM) > The module is built around the Texas Instruments Sitara AM3352/4 > system-on-chip. > > The CPU is supplemented with up-to 512MB DDR3 and up-to 1GB of on-board > NAND storage, WiFi connected to SPI, Bluetooth, Analog audio, Gigabit > Ethernet, CAN bus. > > Current patch adds support: > UART0 and GPIO LED > > Detailed description can be found at the module site: > http://www.compulab.co.il/products/computer-on-modules/cm-t335/ > > Signed-off-by: Ilya Ledvich <ilya@compulab.co.il> > [uri.mashiach@compulab.co.il: the default RAM amount reduced to > 128MB to support also the minimal module configuration] > Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> > Acked-by: Igor Grinberg <grinberg@compulab.co.il> > --- > v1 -> v2: integrate AM33XX_IOPAD macro in pinmux definitions This macro is exactly the kind we should not be doing in DT files which are ones that expand to multiple cells. But not really much point in doing 1 board differently from the rest, so: Acked-by: Rob Herring <robh@kernel.org> Rob > > .../devicetree/bindings/arm/omap/omap.txt | 3 ++ > arch/arm/boot/dts/Makefile | 7 +-- > arch/arm/boot/dts/am335x-cm-t335.dts | 63 ++++++++++++++++++++++ > 3 files changed, 70 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/boot/dts/am335x-cm-t335.dts > > diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt > index 9f4e513..2154f97 100644 > --- a/Documentation/devicetree/bindings/arm/omap/omap.txt > +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt > @@ -138,6 +138,9 @@ Boards: > - AM335X phyBOARD-WEGA: Single Board Computer dev kit > compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx" > > +- AM335X CM-T335 : System On Module, built around the Sitara AM3352/4 > + compatible = "compulab,cm-t335", "ti,am33xx" > + > - OMAP5 EVM : Evaluation Module > compatible = "ti,omap5-evm", "ti,omap5" > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index bb8fa02..0e011dc 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -446,13 +446,14 @@ dtb-$(CONFIG_SOC_AM33XX) += \ > am335x-base0033.dtb \ > am335x-bone.dtb \ > am335x-boneblack.dtb \ > - am335x-sl50.dtb \ > + am335x-chiliboard.dtb \ > + am335x-cm-t335.dtb \ > am335x-evm.dtb \ > am335x-evmsk.dtb \ > + am335x-lxm.dtb \ > am335x-nano.dtb \ > am335x-pepper.dtb \ > - am335x-lxm.dtb \ > - am335x-chiliboard.dtb \ > + am335x-sl50.dtb \ > am335x-wega-rdk.dtb > dtb-$(CONFIG_ARCH_OMAP4) += \ > omap4-duovero-parlor.dtb \ > diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts > new file mode 100644 > index 0000000..719658e > --- /dev/null > +++ b/arch/arm/boot/dts/am335x-cm-t335.dts > @@ -0,0 +1,63 @@ > +/* > + * am335x-cm-t335.dts - Device Tree file for Compulab CM-T335 > + * > + * Copyright (C) 2014 - 2015 CompuLab Ltd. - http://www.compulab.co.il/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +/dts-v1/; > + > +#include "am33xx.dtsi" > + > +/ { > + model = "CompuLab CM-T335"; > + compatible = "compulab,cm-t335", "ti,am33xx"; > + > + memory { > + device_type = "memory"; > + reg = <0x80000000 0x8000000>; /* 128 MB */ > + }; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&gpio_led_pins>; > + led@0 { > + label = "cm_t335:green"; > + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* gpio2_0 */ > + linux,default-trigger = "heartbeat"; > + }; > + }; > +}; > + > +&am33xx_pinmux { > + pinctrl-names = "default"; > + pinctrl-0 = <>; > + > + gpio_led_pins: pinmux_gpio_led_pins { > + pinctrl-single,pins = < > + /* gpmc_csn3.gpio2_0 */ > + AM33XX_IOPAD(0x888, PIN_OUTPUT | MUX_MODE7) > + >; > + }; > + > + uart0_pins: pinmux_uart0_pins { > + pinctrl-single,pins = < > + /* uart0_rxd.uart0_rxd */ > + AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) > + /* uart0_txd.uart0_txd */ > + AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) > + >; > + }; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins>; > + > + status = "okay"; > +}; > + > -- > 2.5.0 >
* Uri Mashiach <uri.mashiach@compulab.co.il> [151124 06:03]: > --- /dev/null > +++ b/arch/arm/boot/dts/am335x-cm-t335.dts ... > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins>; > + > + status = "okay"; > +}; > + FYI, the extra line break at the end of the file causes whitespace warnings when applying. And fixing that causes extra hassles with applying the other patches in the series as the patches won't apply.. So for the next time, you may want to check that ;) Also, the subject line should be "ARM: dts: ..." for the dts changes so the git log loooks unified for all the ARM SoCs. Anyways, I've fixed up those locally and applying into omap-for-v4.5/dt. Regards, Tony
Hi Tony, On 11/30/2015 09:51 PM, Tony Lindgren wrote: > * Uri Mashiach <uri.mashiach@compulab.co.il> [151124 06:03]: >> --- /dev/null >> +++ b/arch/arm/boot/dts/am335x-cm-t335.dts > ... > >> +&uart0 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&uart0_pins>; >> + >> + status = "okay"; >> +}; >> + > > FYI, the extra line break at the end of the file causes whitespace > warnings when applying. And fixing that causes extra hassles with > applying the other patches in the series as the patches won't apply.. > So for the next time, you may want to check that ;) Yes, I will definitely do that. > > Also, the subject line should be "ARM: dts: ..." for the dts changes > so the git log loooks unified for all the ARM SoCs. Got it. Thanks! > > Anyways, I've fixed up those locally and applying into omap-for-v4.5/dt. > Thank you Tony!
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index 9f4e513..2154f97 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -138,6 +138,9 @@ Boards: - AM335X phyBOARD-WEGA: Single Board Computer dev kit compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx" +- AM335X CM-T335 : System On Module, built around the Sitara AM3352/4 + compatible = "compulab,cm-t335", "ti,am33xx" + - OMAP5 EVM : Evaluation Module compatible = "ti,omap5-evm", "ti,omap5" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index bb8fa02..0e011dc 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -446,13 +446,14 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-base0033.dtb \ am335x-bone.dtb \ am335x-boneblack.dtb \ - am335x-sl50.dtb \ + am335x-chiliboard.dtb \ + am335x-cm-t335.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ + am335x-lxm.dtb \ am335x-nano.dtb \ am335x-pepper.dtb \ - am335x-lxm.dtb \ - am335x-chiliboard.dtb \ + am335x-sl50.dtb \ am335x-wega-rdk.dtb dtb-$(CONFIG_ARCH_OMAP4) += \ omap4-duovero-parlor.dtb \ diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts new file mode 100644 index 0000000..719658e --- /dev/null +++ b/arch/arm/boot/dts/am335x-cm-t335.dts @@ -0,0 +1,63 @@ +/* + * am335x-cm-t335.dts - Device Tree file for Compulab CM-T335 + * + * Copyright (C) 2014 - 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "am33xx.dtsi" + +/ { + model = "CompuLab CM-T335"; + compatible = "compulab,cm-t335", "ti,am33xx"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x8000000>; /* 128 MB */ + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&gpio_led_pins>; + led@0 { + label = "cm_t335:green"; + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* gpio2_0 */ + linux,default-trigger = "heartbeat"; + }; + }; +}; + +&am33xx_pinmux { + pinctrl-names = "default"; + pinctrl-0 = <>; + + gpio_led_pins: pinmux_gpio_led_pins { + pinctrl-single,pins = < + /* gpmc_csn3.gpio2_0 */ + AM33XX_IOPAD(0x888, PIN_OUTPUT | MUX_MODE7) + >; + }; + + uart0_pins: pinmux_uart0_pins { + pinctrl-single,pins = < + /* uart0_rxd.uart0_rxd */ + AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) + /* uart0_txd.uart0_txd */ + AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) + >; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + + status = "okay"; +}; +