[linux-sunxi] Re: [PATCH v7 5/8] ARM: dts: sun7i: Add support for mmc

2014-02-18 Thread Maxime Ripard 
On Mon, Feb 17, 2014 at 11:02:41AM +0100, David Lanzendörfer wrote:
> Signed-off-by: David Lanzendörfer 
> Signed-off-by: Hans de Goede 
> ---
>  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |8 +++
>  arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |8 +++
>  arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts |   23 +
>  arch/arm/boot/dts/sun7i-a20.dtsi|   61 
> +++
>  4 files changed, 100 insertions(+)
> 

I'd prefer to have three patches here:
   - One that add the controllers
   - One that add the pin muxing options
   - One that enable the controllers on the various boards.

> diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts 
> b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> index 5c51cb8..ae800b6 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> @@ -34,6 +34,14 @@
>   };
>   };
>  
> + mmc0: mmc@01c0f000 {
> + pinctrl-names = "default", "default";
> + pinctrl-0 = <&mmc0_pins_a>;
> + pinctrl-1 = <&mmc0_cd_pin_reference_design>;

This can be made a single pinctrl group, you don't need the pinctrl-1
stuff, it only complicates the node.

> + cd-gpios = <&pio 7 1 0>; /* PH1 */
> + status = "okay";
> + };
> +
>   pinctrl@01c20800 {
>   led_pins_cubieboard2: led_pins@0 {
>   allwinner,pins = "PH20", "PH21";
> diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts 
> b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> index f9dcb61..370cef84 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> @@ -19,6 +19,14 @@
>   compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
>  
>   soc@01c0 {
> + mmc0: mmc@01c0f000 {
> + pinctrl-names = "default", "default";
> + pinctrl-0 = <&mmc0_pins_a>;
> + pinctrl-1 = <&mmc0_cd_pin_reference_design>;
> + cd-gpios = <&pio 7 1 0>; /* PH1 */
> + status = "okay";
> + };
> +
>   pinctrl@01c20800 {
>   led_pins_cubietruck: led_pins@0 {
>   allwinner,pins = "PH7", "PH11", "PH20", "PH21";
> diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts 
> b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> index ead3013..685ec06 100644
> --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> @@ -34,7 +34,30 @@
>   };
>   };
>  
> + mmc0: mmc@01c0f000 {
> + pinctrl-names = "default", "default";
> + pinctrl-0 = <&mmc0_pins_a>;
> + pinctrl-1 = <&mmc0_cd_pin_reference_design>;
> + cd-gpios = <&pio 7 1 0>; /* PH1 */
> + status = "okay";
> + };
> +
> + mmc3: mmc@01c12000 {
> + pinctrl-names = "default", "default";
> + pinctrl-0 = <&mmc3_pins_a>;
> + pinctrl-1 = <&mmc3_cd_pin_olinuxinom>;
> + cd-gpios = <&pio 7 11 0>; /* PH11 */
> + status = "okay";
> + };
> +
>   pinctrl@01c20800 {
> + mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
> + allwinner,pins = "PH11";
> + allwinner,function = "gpio_in";
> + allwinner,drive = <0>;
> + allwinner,pull = <1>;
> + };
> +
>   led_pins_olinuxino: led_pins@0 {
>   allwinner,pins = "PH2";
>   allwinner,function = "gpio_out";
> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi 
> b/arch/arm/boot/dts/sun7i-a20.dtsi
> index 9ff0948..5b55414 100644
> --- a/arch/arm/boot/dts/sun7i-a20.dtsi
> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> @@ -355,6 +355,46 @@
>   #size-cells = <0>;
>   };
>  
> + mmc0: mmc@01c0f000 {
> + compatible = "allwinner,sun5i-a13-mmc";
> + reg = <0x01c0f000 0x1000>;
> + clocks = <&ahb_gates 8>, <&mmc0_clk>;
> + clock-names = "ahb", "mod";
> + interrupts = <0 32 4>;
> + bus-width = <4>;

This belongs to the board, the controller itself is able to handle
several bus width.

> + status = "disabled";
> + };
> +
> + mmc1: mmc@01c1 {
> + compatible = "allwinner,sun5i-a13-mmc";
> + reg = <0x01c1 0x1000>;
> + clocks = <&ahb_gates 9>, <&mmc1_clk>;

[linux-sunxi] Re: [PATCH v7 5/8] ARM: dts: sun7i: Add support for mmc

2014-02-18 Thread Hans de Goede 

Hi,

On 02/18/2014 03:22 PM, Maxime Ripard wrote:

On Mon, Feb 17, 2014 at 11:02:41AM +0100, David Lanzendörfer wrote:

Signed-off-by: David Lanzendörfer 
Signed-off-by: Hans de Goede 
---
  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |8 +++
  arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |8 +++
  arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts |   23 +
  arch/arm/boot/dts/sun7i-a20.dtsi|   61 +++
  4 files changed, 100 insertions(+)



I'd prefer to have three patches here:
- One that add the controllers
- One that add the pin muxing options
- One that enable the controllers on the various boards.


diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts 
b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 5c51cb8..ae800b6 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -34,6 +34,14 @@
};
};

+   mmc0: mmc@01c0f000 {
+   pinctrl-names = "default", "default";
+   pinctrl-0 = <&mmc0_pins_a>;
+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;


This can be made a single pinctrl group, you don't need the pinctrl-1
stuff, it only complicates the node.


Then how do we deal with boards which use a different gpio for card-detect ?

In that case we don't want to change the mux setting of the reference
design cd pin. IOW I believe that having 2 separate pinctrl settings for
this is the rigt thing todo. I would prefer using just mmc0_cd_pin_a instead
of _reference_design though.

Oh wait, you're probably talking about using:
pinctrl-0 = <&mmc0_pins_a>, 
<&mmc0_cd_pin_reference_design>;

Yes that would be better.




+   cd-gpios = <&pio 7 1 0>; /* PH1 */
+   status = "okay";
+   };
+
pinctrl@01c20800 {
led_pins_cubieboard2: led_pins@0 {
allwinner,pins = "PH20", "PH21";
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts 
b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index f9dcb61..370cef84 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -19,6 +19,14 @@
compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";

soc@01c0 {
+   mmc0: mmc@01c0f000 {
+   pinctrl-names = "default", "default";
+   pinctrl-0 = <&mmc0_pins_a>;
+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;
+   cd-gpios = <&pio 7 1 0>; /* PH1 */
+   status = "okay";
+   };
+
pinctrl@01c20800 {
led_pins_cubietruck: led_pins@0 {
allwinner,pins = "PH7", "PH11", "PH20", "PH21";
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts 
b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index ead3013..685ec06 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -34,7 +34,30 @@
};
};

+   mmc0: mmc@01c0f000 {
+   pinctrl-names = "default", "default";
+   pinctrl-0 = <&mmc0_pins_a>;
+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;
+   cd-gpios = <&pio 7 1 0>; /* PH1 */
+   status = "okay";
+   };
+
+   mmc3: mmc@01c12000 {
+   pinctrl-names = "default", "default";
+   pinctrl-0 = <&mmc3_pins_a>;
+   pinctrl-1 = <&mmc3_cd_pin_olinuxinom>;
+   cd-gpios = <&pio 7 11 0>; /* PH11 */
+   status = "okay";
+   };
+
pinctrl@01c20800 {
+   mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
+   allwinner,pins = "PH11";
+   allwinner,function = "gpio_in";
+   allwinner,drive = <0>;
+   allwinner,pull = <1>;
+   };
+
led_pins_olinuxino: led_pins@0 {
allwinner,pins = "PH2";
allwinner,function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 9ff0948..5b55414 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -355,6 +355,46 @@
#size-cells = <0>;
};

+   mmc0: mmc@01c0f000 {
+   compatible = "allwinner,sun5i-a13-mmc";
+   reg = <0x01c0f000 0x1000>;
+   clocks = <&ahb_gates 8>, <&mmc0_clk>;
+   clock-names = "ahb",

[linux-sunxi] Re: [PATCH v7 5/8] ARM: dts: sun7i: Add support for mmc

2014-02-21 Thread Maxime Ripard 
On Tue, Feb 18, 2014 at 04:10:38PM +0100, Hans de Goede wrote:
> Hi,
> 
> On 02/18/2014 03:22 PM, Maxime Ripard wrote:
> >On Mon, Feb 17, 2014 at 11:02:41AM +0100, David Lanzendörfer wrote:
> >>Signed-off-by: David Lanzendörfer 
> >>Signed-off-by: Hans de Goede 
> >>---
> >>  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |8 +++
> >>  arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |8 +++
> >>  arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts |   23 +
> >>  arch/arm/boot/dts/sun7i-a20.dtsi|   61 
> >> +++
> >>  4 files changed, 100 insertions(+)
> >>
> >
> >I'd prefer to have three patches here:
> >- One that add the controllers
> >- One that add the pin muxing options
> >- One that enable the controllers on the various boards.
> >
> >>diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts 
> >>b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> >>index 5c51cb8..ae800b6 100644
> >>--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> >>+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> >>@@ -34,6 +34,14 @@
> >>};
> >>};
> >>
> >>+   mmc0: mmc@01c0f000 {
> >>+   pinctrl-names = "default", "default";
> >>+   pinctrl-0 = <&mmc0_pins_a>;
> >>+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;
> >
> >This can be made a single pinctrl group, you don't need the pinctrl-1
> >stuff, it only complicates the node.
> 
> Then how do we deal with boards which use a different gpio for card-detect ?
> 
> In that case we don't want to change the mux setting of the reference
> design cd pin. IOW I believe that having 2 separate pinctrl settings for
> this is the rigt thing todo. I would prefer using just mmc0_cd_pin_a instead
> of _reference_design though.
> 
> Oh wait, you're probably talking about using:
>   pinctrl-0 = <&mmc0_pins_a>, 
> <&mmc0_cd_pin_reference_design>;
> 
> Yes that would be better.

Yep, exactly :)

> >
> >>+   cd-gpios = <&pio 7 1 0>; /* PH1 */
> >>+   status = "okay";
> >>+   };
> >>+
> >>pinctrl@01c20800 {
> >>led_pins_cubieboard2: led_pins@0 {
> >>allwinner,pins = "PH20", "PH21";
> >>diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts 
> >>b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> >>index f9dcb61..370cef84 100644
> >>--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> >>+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> >>@@ -19,6 +19,14 @@
> >>compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
> >>
> >>soc@01c0 {
> >>+   mmc0: mmc@01c0f000 {
> >>+   pinctrl-names = "default", "default";
> >>+   pinctrl-0 = <&mmc0_pins_a>;
> >>+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;
> >>+   cd-gpios = <&pio 7 1 0>; /* PH1 */
> >>+   status = "okay";
> >>+   };
> >>+
> >>pinctrl@01c20800 {
> >>led_pins_cubietruck: led_pins@0 {
> >>allwinner,pins = "PH7", "PH11", "PH20", "PH21";
> >>diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts 
> >>b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> >>index ead3013..685ec06 100644
> >>--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> >>+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
> >>@@ -34,7 +34,30 @@
> >>};
> >>};
> >>
> >>+   mmc0: mmc@01c0f000 {
> >>+   pinctrl-names = "default", "default";
> >>+   pinctrl-0 = <&mmc0_pins_a>;
> >>+   pinctrl-1 = <&mmc0_cd_pin_reference_design>;
> >>+   cd-gpios = <&pio 7 1 0>; /* PH1 */
> >>+   status = "okay";
> >>+   };
> >>+
> >>+   mmc3: mmc@01c12000 {
> >>+   pinctrl-names = "default", "default";
> >>+   pinctrl-0 = <&mmc3_pins_a>;
> >>+   pinctrl-1 = <&mmc3_cd_pin_olinuxinom>;
> >>+   cd-gpios = <&pio 7 11 0>; /* PH11 */
> >>+   status = "okay";
> >>+   };
> >>+
> >>pinctrl@01c20800 {
> >>+   mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
> >>+   allwinner,pins = "PH11";
> >>+   allwinner,function = "gpio_in";
> >>+   allwinner,drive = <0>;
> >>+   allwinner,pull = <1>;
> >>+   };
> >>+
> >>led_pins_olinuxino: led_pins@0 {
> >>allwinner,pins = "PH2";
> >>allwinner,function = "gpio_out";
> >>diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi 
> >>b/arch/arm/boot/dts/sun7i-a20.dtsi
> >>index 9ff0948..5b55414 100644
> >>--- a/arch/arm/boot/dts/sun7i-a20.dtsi
> >>+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> >>@@ -355,6 +355,46 @@
> >>