* [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
@ 2014-02-19 10:41 Imre Kaloz
2014-02-25 9:40 ` Imre Kaloz
2014-02-28 22:54 ` Tony Lindgren
0 siblings, 2 replies; 5+ messages in thread
From: Imre Kaloz @ 2014-02-19 10:41 UTC (permalink / raw)
To: linux-arm-kernel
Enable the WiLink6 connected to mmc2.
Signed-off-by: Imre Kaloz <kaloz at 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@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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
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
2014-02-28 22:54 ` Tony Lindgren
1 sibling, 0 replies; 5+ messages in thread
From: Imre Kaloz @ 2014-02-25 9:40 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
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
@ 2014-02-28 22:54 ` Tony Lindgren
2014-02-28 23:11 ` Tony Lindgren
1 sibling, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2014-02-28 22:54 UTC (permalink / raw)
To: linux-arm-kernel
* Imre Kaloz <kaloz@openwrt.org> [140219 02:44]:
> Enable the WiLink6 connected to mmc2.
>
> Signed-off-by: Imre Kaloz <kaloz@openwrt.org
Thanks applying into omap-for-v3.15/dt.
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
2014-02-28 22:54 ` Tony Lindgren
@ 2014-02-28 23:11 ` Tony Lindgren
2014-03-03 8:46 ` Imre Kaloz
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2014-02-28 23:11 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [140228 14:54]:
> * Imre Kaloz <kaloz@openwrt.org> [140219 02:44]:
> > Enable the WiLink6 connected to mmc2.
> >
> > Signed-off-by: Imre Kaloz <kaloz@openwrt.org
>
> Thanks applying into omap-for-v3.15/dt.
Oops, this breaks the build as WL12XX_REFCLOCK_24 is not defined
and I could not figure out what value it needs to be. Care to
repost this patch with WL12XX_REFCLOCK_24 also defined?
Regards,
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
2014-02-28 23:11 ` Tony Lindgren
@ 2014-03-03 8:46 ` Imre Kaloz
0 siblings, 0 replies; 5+ messages in thread
From: Imre Kaloz @ 2014-03-03 8:46 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 01 Mar 2014 00:11:07 +0100, Tony Lindgren <tony@atomide.com> wrote:
> * Tony Lindgren <tony@atomide.com> [140228 14:54]:
>> * Imre Kaloz <kaloz@openwrt.org> [140219 02:44]:
>> > Enable the WiLink6 connected to mmc2.
>> >
>> > Signed-off-by: Imre Kaloz <kaloz@openwrt.org
>>
>> Thanks applying into omap-for-v3.15/dt.
>
> Oops, this breaks the build as WL12XX_REFCLOCK_24 is not defined
> and I could not figure out what value it needs to be. Care to
> repost this patch with WL12XX_REFCLOCK_24 also defined?
Actually that's a typo :) Posting v2 in a few mins.
Imre
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-03 8:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2014-02-28 22:54 ` Tony Lindgren
2014-02-28 23:11 ` Tony Lindgren
2014-03-03 8:46 ` Imre Kaloz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.