From: kaloz@openwrt.org (Imre Kaloz)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Date: Tue, 25 Feb 2014 10:40:00 +0100 [thread overview]
Message-ID: <op.xbtzsyeh2s3iss@ecaz> (raw)
In-Reply-To: <1392806495-4874-1-git-send-email-kaloz@openwrt.org>
On Wed, 19 Feb 2014 11:41:35 +0100, Imre Kaloz <kaloz@openwrt.org> wrote:
> Enable the WiLink6 connected to mmc2.
>
> Signed-off-by: Imre Kaloz <kaloz@openwrt.org
> ---
> arch/arm/boot/dts/am335x-evmsk.dts | 40 ++++++++++++++++++++++++++++++++++++
> arch/arm/mach-omap2/pdata-quirks.c | 10 +++++++++
> 2 files changed, 50 insertions(+)
>
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index 4718ec4..a544fc4 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -45,6 +45,18 @@
> regulator-boot-on;
> };
>+ wl12xx_vmmc: fixedregulator at 2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&wl12xx_gpio>;
> + compatible = "regulator-fixed";
> + regulator-name = "vwl1271";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + gpio = <&gpio1 29 0>;
> + startup-delay-us = <70000>;
> + enable-active-high;
> + };
> +
> leds {
> pinctrl-names = "default";
> pinctrl-0 = <&user_leds_s0>;
> @@ -264,6 +276,24 @@
> 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
> >;
> };
> +
> + mmc2_pins: pinmux_mmc2_pins {
> + pinctrl-single,pins = <
> + 0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
> + 0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
> + 0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
> + 0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
> + 0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
> + 0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
> + 0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
> + >;
> + };
> +
> + wl12xx_gpio: pinmux_wl12xx_gpio {
> + pinctrl-single,pins = <
> + 0x7c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_csn0.gpio1_29 */
> + >;
> + };
> };
> &uart0 {
> @@ -470,6 +500,16 @@
> ti,no-reset-on-init;
> };
>+&mmc2 {
> + status = "okay";
> + vmmc-supply = <&wl12xx_vmmc>;
> + ti,non-removable;
> + bus-width = <4>;
> + cap-power-off-card;
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc2_pins>;
> +};
> +
> &mcasp1 {
> pinctrl-names = "default";
> pinctrl-0 = <&mcasp1_pins>;
> diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
> index 3d5b24d..a92acdb 100644
> --- a/arch/arm/mach-omap2/pdata-quirks.c
> +++ b/arch/arm/mach-omap2/pdata-quirks.c
> @@ -187,6 +187,13 @@ static void __init omap4_panda_legacy_init(void)
> }
> #endif
>+#ifdef CONFIG_SOC_AM33XX
> +static void __init am335x_evmsk_legacy_init(void)
> +{
> + legacy_init_wl12xx(WL12XX_REFCLOCK_24, 0, 31);
> +}
> +#endif
> +
> #ifdef CONFIG_SOC_OMAP5
> static void __init omap5_uevm_legacy_init(void)
> {
> @@ -271,6 +278,9 @@ static struct pdata_init pdata_quirks[] __initdata = {
> { "ti,omap4-sdp", omap4_sdp_legacy_init, },
> { "ti,omap4-panda", omap4_panda_legacy_init, },
> #endif
> +#ifdef CONFIG_SOC_AM33XX
> + { "ti,am335x-evmsk", am335x_evmsk_legacy_init, },
> +#endif
> #ifdef CONFIG_SOC_OMAP5
> { "ti,omap5-uevm", omap5_uevm_legacy_init, },
> #endif
ping?
Imre
next prev parent reply other threads:[~2014-02-25 9:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 10:41 [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK Imre Kaloz
2014-02-25 9:40 ` Imre Kaloz [this message]
2014-02-28 22:54 ` Tony Lindgren
2014-02-28 23:11 ` Tony Lindgren
2014-03-03 8:46 ` Imre Kaloz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=op.xbtzsyeh2s3iss@ecaz \
--to=kaloz@openwrt.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox