| Message ID | 1354270137-31538-2-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2012/11/30 Javier Martinez Canillas <javier.martinez@collabora.co.uk>: > Add a generic .dtsi device tree source file for the > common characteristics across IGEP Technology devices. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > arch/arm/boot/dts/omap3-igep.dtsi | 93 +++++++++++++++++++++++++++++++++++++ > 1 files changed, 93 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi > > diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi > new file mode 100644 > index 0000000..a093bff > --- /dev/null > +++ b/arch/arm/boot/dts/omap3-igep.dtsi > @@ -0,0 +1,93 @@ > +/* > + * Device Tree Source for IGEP Technology devices > + * > + * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk> > + * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com> > + * > + * 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/ "omap3.dtsi" > + > +/ { > + memory { > + device_type = "memory"; > + reg = <0x80000000 0x20000000>; /* 512 MB */ > + }; > + > + sound { > + compatible = "ti,omap-twl4030"; > + ti,model = "igep2"; > + ti,mcbsp = <&mcbsp2>; > + ti,codec = <&twl_audio>; > + }; > +}; > + > +&omap3_pmx_core { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &mcbsp2_pins > + >; > + > + uart3_pins: pinmux_uart3_pins { > + pinctrl-single,pins = < > + 0x16e 0x100 /* uart3_rx.uart3_rx INPUT | MODE0 */ > + 0x170 0 /* uart3_tx.uart3_tx OUTPUT | MODE0 */ > + >; > + }; > + > + mcbsp2_pins: pinmux_mcbsp2_pins { > + pinctrl-single,pins = < > + 0x1a2 0x0104 /* mcspi1_cs2.gpio_176 INPUT | MODE4 */ > + >; > + }; > +}; > + > +&i2c1 { > + clock-frequency = <2600000>; > + > + twl: twl@48 { > + reg = <0x48>; > + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ > + interrupt-parent = <&intc>; > + > + vsim: regulator@10 { > + compatible = "ti,twl4030-vsim"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3000000>; > + }; > + > + twl_audio: audio { > + compatible = "ti,twl4030-audio"; > + codec { > + }; > + }; > + }; > +}; > + > +/include/ "twl4030.dtsi" > + > +&i2c2 { > + clock-frequency = <400000>; > +}; > + > +&mmc1 { > + vmmc-supply = <&vmmc1>; > + vmmc_aux-supply = <&vsim>; > + bus-width = <8>; > +}; > + > +&mmc2 { > + status = "disabled"; > +}; > + > +&mmc3 { > + status = "disabled"; > +}; > + > +&twl_gpio { > + ti,use-leds; > +}; > -- > 1.7.7.6 > Tested-by: Enric Balletbo i Serra <eballetbo@gmail.com> -- 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
On 11/30/2012 11:08 AM, Javier Martinez Canillas wrote: > Add a generic .dtsi device tree source file for the > common characteristics across IGEP Technology devices. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > arch/arm/boot/dts/omap3-igep.dtsi | 93 +++++++++++++++++++++++++++++++++++++ > 1 files changed, 93 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi > > diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi > new file mode 100644 > index 0000000..a093bff > --- /dev/null > +++ b/arch/arm/boot/dts/omap3-igep.dtsi > @@ -0,0 +1,93 @@ > +/* > + * Device Tree Source for IGEP Technology devices > + * > + * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk> > + * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com> > + * > + * 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/ "omap3.dtsi" > + > +/ { > + memory { > + device_type = "memory"; > + reg = <0x80000000 0x20000000>; /* 512 MB */ > + }; > + > + sound { > + compatible = "ti,omap-twl4030"; > + ti,model = "igep2"; > + ti,mcbsp = <&mcbsp2>; > + ti,codec = <&twl_audio>; > + }; > +}; > + > +&omap3_pmx_core { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &mcbsp2_pins > + >; Tony made a comment to avoid associating these data inside the pmx_core and instead do that in the dedicated device part. > + > + uart3_pins: pinmux_uart3_pins { > + pinctrl-single,pins = < > + 0x16e 0x100 /* uart3_rx.uart3_rx INPUT | MODE0 */ > + 0x170 0 /* uart3_tx.uart3_tx OUTPUT | MODE0 */ > + >; > + }; > + > + mcbsp2_pins: pinmux_mcbsp2_pins { > + pinctrl-single,pins = < > + 0x1a2 0x0104 /* mcspi1_cs2.gpio_176 INPUT | MODE4 */ > + >; > + }; BTW, in this case, the UART3 does not seems to have any connection with the pins settings. Sine your don't have it in the pmx_core you should have it in side the UART3 node. &uart3 { pinctrl-names = "default"; pinctrl-0 = <&uart3_pins>; }; The rational is that, the mux will be done only if the driver is probed and not unconditionally during pmx_core probe like it will be the case otherwise. Regards, Benoit > +}; > + > +&i2c1 { > + clock-frequency = <2600000>; > + > + twl: twl@48 { > + reg = <0x48>; > + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ > + interrupt-parent = <&intc>; > + > + vsim: regulator@10 { > + compatible = "ti,twl4030-vsim"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3000000>; > + }; > + > + twl_audio: audio { > + compatible = "ti,twl4030-audio"; > + codec { > + }; > + }; > + }; > +}; > + > +/include/ "twl4030.dtsi" > + > +&i2c2 { > + clock-frequency = <400000>; > +}; > + > +&mmc1 { > + vmmc-supply = <&vmmc1>; > + vmmc_aux-supply = <&vsim>; > + bus-width = <8>; > +}; > + > +&mmc2 { > + status = "disabled"; > +}; > + > +&mmc3 { > + status = "disabled"; > +}; > + > +&twl_gpio { > + ti,use-leds; > +}; > -- 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
On 12/03/2012 12:01 PM, Benoit Cousson wrote: > On 11/30/2012 11:08 AM, Javier Martinez Canillas wrote: >> Add a generic .dtsi device tree source file for the >> common characteristics across IGEP Technology devices. >> >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> >> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> >> --- >> arch/arm/boot/dts/omap3-igep.dtsi | 93 +++++++++++++++++++++++++++++++++++++ >> 1 files changed, 93 insertions(+), 0 deletions(-) >> create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi >> >> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi >> new file mode 100644 >> index 0000000..a093bff >> --- /dev/null >> +++ b/arch/arm/boot/dts/omap3-igep.dtsi >> @@ -0,0 +1,93 @@ >> +/* >> + * Device Tree Source for IGEP Technology devices >> + * >> + * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk> >> + * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com> >> + * >> + * 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/ "omap3.dtsi" >> + >> +/ { >> + memory { >> + device_type = "memory"; >> + reg = <0x80000000 0x20000000>; /* 512 MB */ >> + }; >> + >> + sound { >> + compatible = "ti,omap-twl4030"; >> + ti,model = "igep2"; >> + ti,mcbsp = <&mcbsp2>; >> + ti,codec = <&twl_audio>; >> + }; >> +}; >> + >> +&omap3_pmx_core { >> + pinctrl-names = "default"; >> + pinctrl-0 = < >> + &mcbsp2_pins >> + >; > > Tony made a comment to avoid associating these data inside the pmx_core > and instead do that in the dedicated device part. > Hi Benoit, Thanks a lot for your feedback. I didn't know about this convention, the OMAP mcspi1_cs2 pin is configured in gpio_176 mode (OMAP_MUX_MODE4) because this GPIO line is used as the SMSC9221 LAN Ethernet controller IRQ. But since the ethernet chip is connected to the OMAP3 processor thourgh its GPMC and the DT support for GPMC is still not merged in mainline, DT support this this pheripheral is still missing on this initial DT. So, I'll just removes mcbsp2_pins for now and this can be added again on the ethernet device part once support for this pheripheral is added. >> + >> + uart3_pins: pinmux_uart3_pins { >> + pinctrl-single,pins = < >> + 0x16e 0x100 /* uart3_rx.uart3_rx INPUT | MODE0 */ >> + 0x170 0 /* uart3_tx.uart3_tx OUTPUT | MODE0 */ >> + >; >> + }; >> + >> + mcbsp2_pins: pinmux_mcbsp2_pins { >> + pinctrl-single,pins = < >> + 0x1a2 0x0104 /* mcspi1_cs2.gpio_176 INPUT | MODE4 */ >> + >; >> + }; > > BTW, in this case, the UART3 does not seems to have any connection with > the pins settings. Sine your don't have it in the pmx_core you should > have it in side the UART3 node. > > &uart3 { > pinctrl-names = "default"; > pinctrl-0 = <&uart3_pins>; > }; > Yes, I missed that. Thanks for pointing this out. > The rational is that, the mux will be done only if the driver is probed > and not unconditionally during pmx_core probe like it will be the case > otherwise. > > Regards, > Benoit > > I'll post a v3 with your suggestions. Thanks a lot and best regards, Javier -- 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/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi new file mode 100644 index 0000000..a093bff --- /dev/null +++ b/arch/arm/boot/dts/omap3-igep.dtsi @@ -0,0 +1,93 @@ +/* + * Device Tree Source for IGEP Technology devices + * + * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk> + * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com> + * + * 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/ "omap3.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; /* 512 MB */ + }; + + sound { + compatible = "ti,omap-twl4030"; + ti,model = "igep2"; + ti,mcbsp = <&mcbsp2>; + ti,codec = <&twl_audio>; + }; +}; + +&omap3_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &mcbsp2_pins + >; + + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x16e 0x100 /* uart3_rx.uart3_rx INPUT | MODE0 */ + 0x170 0 /* uart3_tx.uart3_tx OUTPUT | MODE0 */ + >; + }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + 0x1a2 0x0104 /* mcspi1_cs2.gpio_176 INPUT | MODE4 */ + >; + }; +}; + +&i2c1 { + clock-frequency = <2600000>; + + twl: twl@48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; + + vsim: regulator@10 { + compatible = "ti,twl4030-vsim"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + }; + + twl_audio: audio { + compatible = "ti,twl4030-audio"; + codec { + }; + }; + }; +}; + +/include/ "twl4030.dtsi" + +&i2c2 { + clock-frequency = <400000>; +}; + +&mmc1 { + vmmc-supply = <&vmmc1>; + vmmc_aux-supply = <&vsim>; + bus-width = <8>; +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + +&twl_gpio { + ti,use-leds; +};