* [PATCH 1/2] ARM: sunxi: Add fixed 3V regulator @ 2014-05-20 15:47 Maxime Ripard 2014-05-20 15:47 ` [PATCH 2/2] ARM: sun6i: Add MMC0 controller to the Colombus board Maxime Ripard 0 siblings, 1 reply; 3+ messages in thread From: Maxime Ripard @ 2014-05-20 15:47 UTC (permalink / raw) To: linux-arm-kernel A few boards we've seen have a fixed 3V regulator. Add this one on the common DTSI. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sunxi-common-regulators.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi index 026bd83f078f..3d021efd1a38 100644 --- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi +++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi @@ -73,6 +73,13 @@ status = "disabled"; }; + reg_vcc3v0: vcc3v0 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v0"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + reg_vcc3v3: vcc3v3 { compatible = "regulator-fixed"; regulator-name = "vcc3v3"; -- 1.9.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: sun6i: Add MMC0 controller to the Colombus board 2014-05-20 15:47 [PATCH 1/2] ARM: sunxi: Add fixed 3V regulator Maxime Ripard @ 2014-05-20 15:47 ` Maxime Ripard 2014-05-20 20:55 ` Hans de Goede 0 siblings, 1 reply; 3+ messages in thread From: Maxime Ripard @ 2014-05-20 15:47 UTC (permalink / raw) To: linux-arm-kernel The Colombus has a full size SD slot wired to the MMC0 controller. In order to work, the MMC lines have to have the pull-ups enabled though. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun6i-a31-colombus.dts | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 3898a7bce831..e2cf2f3646bf 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts @@ -13,6 +13,7 @@ /dts-v1/; /include/ "sun6i-a31.dtsi" +/include/ "sunxi-common-regulators.dtsi" / { model = "WITS A31 Colombus Evaluation Board"; @@ -23,6 +24,32 @@ }; soc at 01c00000 { + mmc0: mmc at 01c0f000 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_colombus>, <&mmc0_cd_pin_colombus>; + vmmc-supply = <®_vcc3v0>; + bus-width = <4>; + cd-gpios = <&pio 0 8 0>; /* PA8 */ + cd-inverted; + status = "okay"; + }; + + pio: pinctrl at 01c20800 { + mmc0_pins_colombus: mmc0 at 0 { + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; + allwinner,function = "mmc0"; + allwinner,drive = <2>; + allwinner,pull = <1>; + }; + + mmc0_cd_pin_colombus: mmc0_cd_pin at 0 { + allwinner,pins = "PA8"; + allwinner,function = "gpio_in"; + allwinner,drive = <0>; + allwinner,pull = <1>; + }; + }; + uart0: serial at 01c28000 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -- 1.9.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: sun6i: Add MMC0 controller to the Colombus board 2014-05-20 15:47 ` [PATCH 2/2] ARM: sun6i: Add MMC0 controller to the Colombus board Maxime Ripard @ 2014-05-20 20:55 ` Hans de Goede 0 siblings, 0 replies; 3+ messages in thread From: Hans de Goede @ 2014-05-20 20:55 UTC (permalink / raw) To: linux-arm-kernel Hi, On 05/20/2014 05:47 PM, Maxime Ripard wrote: > The Colombus has a full size SD slot wired to the MMC0 controller. In order to > work, the MMC lines have to have the pull-ups enabled though. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun6i-a31-colombus.dts | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts > index 3898a7bce831..e2cf2f3646bf 100644 > --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts > +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts > @@ -13,6 +13,7 @@ > > /dts-v1/; > /include/ "sun6i-a31.dtsi" > +/include/ "sunxi-common-regulators.dtsi" > > / { > model = "WITS A31 Colombus Evaluation Board"; > @@ -23,6 +24,32 @@ > }; > > soc at 01c00000 { > + mmc0: mmc at 01c0f000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_colombus>, <&mmc0_cd_pin_colombus>; > + vmmc-supply = <®_vcc3v0>; > + bus-width = <4>; > + cd-gpios = <&pio 0 8 0>; /* PA8 */ > + cd-inverted; > + status = "okay"; > + }; > + > + pio: pinctrl at 01c20800 { > + mmc0_pins_colombus: mmc0 at 0 { > + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; > + allwinner,function = "mmc0"; > + allwinner,drive = <2>; > + allwinner,pull = <1>; > + }; You could just use mmc0_pins_a here and only set allwinner,pull. Other then that both patches are: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-20 20:55 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-20 15:47 [PATCH 1/2] ARM: sunxi: Add fixed 3V regulator Maxime Ripard 2014-05-20 15:47 ` [PATCH 2/2] ARM: sun6i: Add MMC0 controller to the Colombus board Maxime Ripard 2014-05-20 20:55 ` Hans de Goede
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).