On Wed, Mar 26, 2014 at 09:18:01PM +0100, Hans de Goede wrote:
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> ---
>  arch/arm/boot/dts/sun6i-a31-m9.dts | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts 
> b/arch/arm/boot/dts/sun6i-a31-m9.dts
> index c95ee77..22837bc 100644
> --- a/arch/arm/boot/dts/sun6i-a31-m9.dts
> +++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
> @@ -21,6 +21,23 @@
>       };
>  
>       soc@01c00000 {
> +             mmc0: mmc@01c0f000 {
> +                     pinctrl-names = "default";
> +                     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
> +                     cd-gpios = <&pio 7 22 0>; /* PH22 */
> +                     /* non-removable; */

Is it removable then or not ? :)

These two properties are mutually exclusive.

> +                     status = "okay";
> +             };
> +
> +             pio: pinctrl@01c20800 {
> +                     mmc0_cd_pin_m9: mmc0_cd_pin@0 {
> +                             allwinner,pins = "PH22";
> +                             allwinner,function = "gpio_in";
> +                             allwinner,drive = <0>;
> +                             allwinner,pull = <1>;
> +                     };
> +             };
> +
>               uart0: serial@01c28000 {
>                       pinctrl-names = "default";
>                       pinctrl-0 = <&uart0_pins_a>;
> -- 
> 1.9.0
> 

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Attachment: signature.asc
Description: Digital signature

Reply via email to