Hi,
On 03/27/2014 10:58 AM, Maxime Ripard wrote:
> On Wed, Mar 26, 2014 at 09:17:59PM +0100, Hans de Goede wrote:
>> Signed-off-by: Hans de Goede <hdego...@redhat.com>
>> ---
>> arch/arm/boot/dts/sun6i-a31.dtsi | 59
>> ++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 59 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi
>> b/arch/arm/boot/dts/sun6i-a31.dtsi
>> index 45b5775..8fa124b 100644
>> --- a/arch/arm/boot/dts/sun6i-a31.dtsi
>> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
>> @@ -307,6 +307,58 @@
>> #dma-cells = <1>;
>> };
>>
>> + mmc0: mmc@01c0f000 {
>> + compatible = "allwinner,sun5i-a13-mmc";
>> + reg = <0x01c0f000 0x1000>;
>> + clocks = <&ahb1_gates 8>, <&mmc0_clk>;
>> + clock-names = "ahb", "mod";
>> + resets = <&ahb1_rst 8>;
>> + reset-names = "reset";
>
> You don't need the reset-names iirc.
Hmm, looking at drivers/reset/core.c it looks like your right, if I
pass in NULL as id to devm_reset_control_get it will just take the first one.
So then the question becomes do we ever expect to need a second reset? The
advantage
of using names right away is that adding a second reset becomes a lot cleaner.
So my vote goes to keeping the name.
>
>> + interrupts = <0 60 4>;
>> + bus-width = <4>;
>> + cd-inverted;
>
> And I still feel those two should be in the board files.
Ack, I was just doing what all the other dt files in sunxi-devel
currently do. When David posts a new cleaned up version I'll fix
this too.
Regards,
Hans
>
>> + status = "disabled";
>> + };
>> +
>> + mmc1: mmc@01c10000 {
>> + compatible = "allwinner,sun5i-a13-mmc";
>> + reg = <0x01c10000 0x1000>;
>> + clocks = <&ahb1_gates 9>, <&mmc1_clk>;
>> + clock-names = "ahb", "mod";
>> + resets = <&ahb1_rst 9>;
>> + reset-names = "reset";
>> + interrupts = <0 61 4>;
>> + bus-width = <4>;
>> + cd-inverted;
>> + status = "disabled";
>> + };
>> +
>> + mmc2: mmc@01c11000 {
>> + compatible = "allwinner,sun5i-a13-mmc";
>> + reg = <0x01c11000 0x1000>;
>> + clocks = <&ahb1_gates 10>, <&mmc2_clk>;
>> + clock-names = "ahb", "mod";
>> + resets = <&ahb1_rst 10>;
>> + reset-names = "reset";
>> + interrupts = <0 62 4>;
>> + bus-width = <4>;
>> + cd-inverted;
>> + status = "disabled";
>> + };
>> +
>> + mmc3: mmc@01c12000 {
>> + compatible = "allwinner,sun5i-a13-mmc";
>> + reg = <0x01c12000 0x1000>;
>> + clocks = <&ahb1_gates 11>, <&mmc3_clk>;
>> + clock-names = "ahb", "mod";
>> + resets = <&ahb1_rst 11>;
>> + reset-names = "reset";
>> + interrupts = <0 63 4>;
>> + bus-width = <4>;
>> + cd-inverted;
>> + status = "disabled";
>> + };
>> +
>> pio: pinctrl@01c20800 {
>> compatible = "allwinner,sun6i-a31-pinctrl";
>> reg = <0x01c20800 0x400>;
>> @@ -390,6 +442,13 @@
>> allwinner,drive = <3>;
>> allwinner,pull = <0>;
>> };
>> +
>> + mmc0_pins_a: mmc0@0 {
>> + allwinner,pins =
>> "PF0","PF1","PF2","PF3","PF4","PF5";
>> + allwinner,function = "mmc0";
>> + allwinner,drive = <2>;
>> + allwinner,pull = <0>;
>> + };
>> };
>>
>> ahb1_rst: reset@01c202c0 {
>> --
>> 1.9.0
>>
>
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
