ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Subsystems (4)
PATCH 1/1 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Enable the WiLink6 connected to mmc2.
--- arch/arm/boot/dts/am335x-evmsk.dts | 40 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/pdata-quirks.c | 10 +++++++++ 2 files changed, 50 insertions(+)
arch/arm/boot/dts/am335x-evmsk.dts +40 -0
@@ -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>;
arch/arm/mach-omap2/pdata-quirks.c +10 -0
@@ -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
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Quoted 88 lines · Imre Kaloz
Enable the WiLink6 connected to mmc2.
Signed-off-by Imre Kaloz <[email protected]--- arch/arm/boot/dts/am335x-evmsk.dts | 40 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/pdata-quirks.c | 10 +++++++++ 2 files changed, 50 insertions(+)arch/arm/boot/dts/am335x-evmsk.dts +40
-0@@ -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>;arch/arm/mach-omap2/pdata-quirks.c +7
-0@@ -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 ) {
arch/arm/mach-omap2/pdata-quirks.c static struct pdata_init pdata_quirks[] __initdata = { · line 286
Quoted 9 lines
arch/arm/mach-omap2/pdata-quirks.c +3
-0@@ -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
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
In reply to Imre KalozQuoted 3 lines · Imre Kaloz
Enable the WiLink6 connected to mmc2.
Signed-off-by Imre Kaloz <[email protected]
Thanks applying into omap-for-v3.15/dt.
Tony
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Quoted 6 lines · Tony Lindgren
Quoted 3 lines · Imre Kaloz
Enable the WiLink6 connected to mmc2.
Signed-off-by Imre Kaloz <[email protected]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
PATCH 1/1 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Quoted 11 lines · Tony Lindgren
Quoted 6 lines · Tony Lindgren
Quoted 3 lines · Imre Kaloz
Enable the WiLink6 connected to mmc2.
Signed-off-by Imre Kaloz <[email protected]Thanks applying into omap-for-v3.15/dt.
Oops, this breaks the build as
WL12XX_REFCLOCK_24is not defined and I could not figure out what value it needs to be. Care to repost this patch withWL12XX_REFCLOCK_24also defined?
Actually that's a typo :) Posting v2 in a few mins.
Imre