| Message ID | 1399046249-19472-16-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 02, 2014 at 05:57:29PM +0200, Hans de Goede wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The WiFi > part is a BCM43362 IC connected to MMC3 in the A20 SoC via SDIO. > The IC also takes a power enable signal via GPIO. > > The WiFi module supports out-of-band interrupt signaling via GPIO, > but this is not supported in this patch. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> It doesn't have Chen-Yu SoB. Chen-Yu, are you fine with adding it? No need to respin the set, I'll add it when applying if it's ok. Maxime
On Mon, May 5, 2014 at 12:02 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Fri, May 02, 2014 at 05:57:29PM +0200, Hans de Goede wrote: >> From: Chen-Yu Tsai <wens@csie.org> >> >> The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The WiFi >> part is a BCM43362 IC connected to MMC3 in the A20 SoC via SDIO. >> The IC also takes a power enable signal via GPIO. >> >> The WiFi module supports out-of-band interrupt signaling via GPIO, >> but this is not supported in this patch. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > It doesn't have Chen-Yu SoB. Chen-Yu, are you fine with adding it? My apologies, I didn't notice this patch still had my name on it. Looks good. Signed-off-by: Chen-Yu Tsai <wens@csie.org> (or Acked-by, not sure which applies in this situation.) > No need to respin the set, I'll add it when applying if it's ok. Thanks! Cheers, ChenYu -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, May 02, 2014 at 05:57:29PM +0200, Hans de Goede wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The WiFi > part is a BCM43362 IC connected to MMC3 in the A20 SoC via SDIO. > The IC also takes a power enable signal via GPIO. > > The WiFi module supports out-of-band interrupt signaling via GPIO, > but this is not supported in this patch. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Applied with Chen-Yu SoB. Maxime
On Mon, May 05, 2014 at 12:20:56PM +0800, Chen-Yu Tsai wrote: > On Mon, May 5, 2014 at 12:02 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > On Fri, May 02, 2014 at 05:57:29PM +0200, Hans de Goede wrote: > >> From: Chen-Yu Tsai <wens@csie.org> > >> > >> The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The WiFi > >> part is a BCM43362 IC connected to MMC3 in the A20 SoC via SDIO. > >> The IC also takes a power enable signal via GPIO. > >> > >> The WiFi module supports out-of-band interrupt signaling via GPIO, > >> but this is not supported in this patch. > >> > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > It doesn't have Chen-Yu SoB. Chen-Yu, are you fine with adding it? > > My apologies, I didn't notice this patch still had my name on it. > Looks good. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > (or Acked-by, not sure which applies in this situation.) Since you're the author, we need your SoB. If you were not involved with writing (or merging the patch), Acked-by would have been appropriate. Maxime
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index b2e2efd..97b6f02 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -29,6 +29,14 @@ status = "okay"; }; + mmc3: mmc@01c12000 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc3_pins_a>; + vmmc-supply = <®_vmmc3>; + non-removable; + status = "okay"; + }; + usbphy: phy@01c13400 { usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; @@ -57,6 +65,18 @@ }; pinctrl@01c20800 { + mmc3_pins_a: mmc3@0 { + /* AP6210 requires pull-up */ + allwinner,pull = <1>; + }; + + vmmc3_pin_cubietruck: vmmc3_pin@0 { + allwinner,pins = "PH9"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; @@ -148,4 +168,15 @@ reg_usb2_vbus: usb2-vbus { status = "okay"; }; + + reg_vmmc3: vmmc3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&vmmc3_pin_cubietruck>; + regulator-name = "vmmc3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 9 0>; + }; };