diff mbox

[v4,1/2] arm: dts: mt7623: Add SD-card and EMMC to bananapi-r2

Message ID 1c83eae1944992f7c5a9af946e03bc2c4e62c874.1501819056.git.sean.wang@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sean Wang Aug. 4, 2017, 3:59 a.m. UTC 
From: Sean Wang <sean.wang@mediatek.com>

The bananapi-r2 board has an SD-card controller and built-in
EMMC storage so enables those devices in the devicetree. Also
cleanup nodes in alphabetical order in the patch.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
 arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

Comments

Sean Wang Aug. 4, 2017, 10:14 a.m. UTC | #1 
On Fri, 2017-08-04 at 11:59 +0800, sean.wang@mediatek.com wrote:
> From: Sean Wang <sean.wang@mediatek.com>
> 
> The bananapi-r2 board has an SD-card controller and built-in
> EMMC storage so enables those devices in the devicetree. Also
> cleanup nodes in alphabetical order in the patch.
> 

Hi, Matthias

could your help remove those words "Also cleanup nodes in alphabetical
order in the patch." when merging, i was forgetting to do it.

or prefer wanting me to resend it again?

	Sean

> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
>  arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 37 +++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
> index 9f3e6dd..444ed93 100644
> --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
> +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
> @@ -179,6 +179,32 @@
>  	status = "okay";
>  };
>  
> +&mmc0 {
> +	pinctrl-names = "default", "state_uhs";
> +	pinctrl-0 = <&mmc0_pins_default>;
> +	pinctrl-1 = <&mmc0_pins_uhs>;
> +	status = "okay";
> +	bus-width = <8>;
> +	max-frequency = <50000000>;
> +	cap-mmc-highspeed;
> +	vmmc-supply = <&mt6323_vemc3v3_reg>;
> +	vqmmc-supply = <&mt6323_vio18_reg>;
> +	non-removable;
> +};
> +
> +&mmc1 {
> +	pinctrl-names = "default", "state_uhs";
> +	pinctrl-0 = <&mmc1_pins_default>;
> +	pinctrl-1 = <&mmc1_pins_uhs>;
> +	status = "okay";
> +	bus-width = <4>;
> +	max-frequency = <50000000>;
> +	cap-sd-highspeed;
> +	cd-gpios = <&pio 261 0>;
> +	vmmc-supply = <&mt6323_vmch_reg>;
> +	vqmmc-supply = <&mt6323_vio18_reg>;
> +};
> +
>  &pio {
>  	cir_pins_a:cir@0 {
>  		pins_cir {
> @@ -314,6 +340,17 @@
>  			bias-pull-down;
>  			drive-strength = <MTK_DRIVE_4mA>;
>  		};
> +
> +		pins_wp {
> +			pinmux = <MT7623_PIN_29_EINT7_FUNC_MSDC1_WP>;
> +			input-enable;
> +			bias-pull-up;
> +		};
> +
> +		pins_insert {
> +			pinmux = <MT7623_PIN_261_MSDC1_INS_FUNC_GPIO261>;
> +			bias-pull-up;
> +		};
>  	};
>  
>  	mmc1_pins_uhs: mmc1 {
Matthias Brugger Aug. 4, 2017, 12:19 p.m. UTC | #2 
On 08/04/2017 12:14 PM, Sean Wang wrote:
> On Fri, 2017-08-04 at 11:59 +0800, sean.wang@mediatek.com wrote:
>> From: Sean Wang <sean.wang@mediatek.com>
>>
>> The bananapi-r2 board has an SD-card controller and built-in
>> EMMC storage so enables those devices in the devicetree. Also
>> cleanup nodes in alphabetical order in the patch.
>>
> 
> Hi, Matthias
> 
> could your help remove those words "Also cleanup nodes in alphabetical
> order in the patch." when merging, i was forgetting to do it.
> 
> or prefer wanting me to resend it again?

Yes I can do that. No need to resend.

Regards,
Matthias

> 
> 	Sean
> 
>> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
>> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
>> ---
>>   arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 37 +++++++++++++++++++++++++++
>>   1 file changed, 37 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>> index 9f3e6dd..444ed93 100644
>> --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>> +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>> @@ -179,6 +179,32 @@
>>   	status = "okay";
>>   };
>>   
>> +&mmc0 {
>> +	pinctrl-names = "default", "state_uhs";
>> +	pinctrl-0 = <&mmc0_pins_default>;
>> +	pinctrl-1 = <&mmc0_pins_uhs>;
>> +	status = "okay";
>> +	bus-width = <8>;
>> +	max-frequency = <50000000>;
>> +	cap-mmc-highspeed;
>> +	vmmc-supply = <&mt6323_vemc3v3_reg>;
>> +	vqmmc-supply = <&mt6323_vio18_reg>;
>> +	non-removable;
>> +};
>> +
>> +&mmc1 {
>> +	pinctrl-names = "default", "state_uhs";
>> +	pinctrl-0 = <&mmc1_pins_default>;
>> +	pinctrl-1 = <&mmc1_pins_uhs>;
>> +	status = "okay";
>> +	bus-width = <4>;
>> +	max-frequency = <50000000>;
>> +	cap-sd-highspeed;
>> +	cd-gpios = <&pio 261 0>;
>> +	vmmc-supply = <&mt6323_vmch_reg>;
>> +	vqmmc-supply = <&mt6323_vio18_reg>;
>> +};
>> +
>>   &pio {
>>   	cir_pins_a:cir@0 {
>>   		pins_cir {
>> @@ -314,6 +340,17 @@
>>   			bias-pull-down;
>>   			drive-strength = <MTK_DRIVE_4mA>;
>>   		};
>> +
>> +		pins_wp {
>> +			pinmux = <MT7623_PIN_29_EINT7_FUNC_MSDC1_WP>;
>> +			input-enable;
>> +			bias-pull-up;
>> +		};
>> +
>> +		pins_insert {
>> +			pinmux = <MT7623_PIN_261_MSDC1_INS_FUNC_GPIO261>;
>> +			bias-pull-up;
>> +		};
>>   	};
>>   
>>   	mmc1_pins_uhs: mmc1 {
> 
>
Matthias Brugger Aug. 14, 2017, 3:18 p.m. UTC | #3 
On 08/04/2017 02:19 PM, Matthias Brugger wrote:
> 
> 
> On 08/04/2017 12:14 PM, Sean Wang wrote:
>> On Fri, 2017-08-04 at 11:59 +0800, sean.wang@mediatek.com wrote:
>>> From: Sean Wang <sean.wang@mediatek.com>
>>>
>>> The bananapi-r2 board has an SD-card controller and built-in
>>> EMMC storage so enables those devices in the devicetree. Also
>>> cleanup nodes in alphabetical order in the patch.
>>>
>>
>> Hi, Matthias
>>
>> could your help remove those words "Also cleanup nodes in alphabetical
>> order in the patch." when merging, i was forgetting to do it.
>>
>> or prefer wanting me to resend it again?
> 
> Yes I can do that. No need to resend.
> 

Both patches pushed to v4.13-next/dts32 now

Thanks a lot,
Matthias

> Regards,
> Matthias
> 
>>
>>     Sean
>>
>>> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
>>> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
>>> ---
>>>   arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 37 +++++++++++++++++++++++++++
>>>   1 file changed, 37 insertions(+)
>>>
>>> diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 
>>> b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>>> index 9f3e6dd..444ed93 100644
>>> --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>>> +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
>>> @@ -179,6 +179,32 @@
>>>       status = "okay";
>>>   };
>>> +&mmc0 {
>>> +    pinctrl-names = "default", "state_uhs";
>>> +    pinctrl-0 = <&mmc0_pins_default>;
>>> +    pinctrl-1 = <&mmc0_pins_uhs>;
>>> +    status = "okay";
>>> +    bus-width = <8>;
>>> +    max-frequency = <50000000>;
>>> +    cap-mmc-highspeed;
>>> +    vmmc-supply = <&mt6323_vemc3v3_reg>;
>>> +    vqmmc-supply = <&mt6323_vio18_reg>;
>>> +    non-removable;
>>> +};
>>> +
>>> +&mmc1 {
>>> +    pinctrl-names = "default", "state_uhs";
>>> +    pinctrl-0 = <&mmc1_pins_default>;
>>> +    pinctrl-1 = <&mmc1_pins_uhs>;
>>> +    status = "okay";
>>> +    bus-width = <4>;
>>> +    max-frequency = <50000000>;
>>> +    cap-sd-highspeed;
>>> +    cd-gpios = <&pio 261 0>;
>>> +    vmmc-supply = <&mt6323_vmch_reg>;
>>> +    vqmmc-supply = <&mt6323_vio18_reg>;
>>> +};
>>> +
>>>   &pio {
>>>       cir_pins_a:cir@0 {
>>>           pins_cir {
>>> @@ -314,6 +340,17 @@
>>>               bias-pull-down;
>>>               drive-strength = <MTK_DRIVE_4mA>;
>>>           };
>>> +
>>> +        pins_wp {
>>> +            pinmux = <MT7623_PIN_29_EINT7_FUNC_MSDC1_WP>;
>>> +            input-enable;
>>> +            bias-pull-up;
>>> +        };
>>> +
>>> +        pins_insert {
>>> +            pinmux = <MT7623_PIN_261_MSDC1_INS_FUNC_GPIO261>;
>>> +            bias-pull-up;
>>> +        };
>>>       };
>>>       mmc1_pins_uhs: mmc1 {
>>
>>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index 9f3e6dd..444ed93 100644
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -179,6 +179,32 @@ 
 	status = "okay";
 };
 
+&mmc0 {
+	pinctrl-names = "default", "state_uhs";
+	pinctrl-0 = <&mmc0_pins_default>;
+	pinctrl-1 = <&mmc0_pins_uhs>;
+	status = "okay";
+	bus-width = <8>;
+	max-frequency = <50000000>;
+	cap-mmc-highspeed;
+	vmmc-supply = <&mt6323_vemc3v3_reg>;
+	vqmmc-supply = <&mt6323_vio18_reg>;
+	non-removable;
+};
+
+&mmc1 {
+	pinctrl-names = "default", "state_uhs";
+	pinctrl-0 = <&mmc1_pins_default>;
+	pinctrl-1 = <&mmc1_pins_uhs>;
+	status = "okay";
+	bus-width = <4>;
+	max-frequency = <50000000>;
+	cap-sd-highspeed;
+	cd-gpios = <&pio 261 0>;
+	vmmc-supply = <&mt6323_vmch_reg>;
+	vqmmc-supply = <&mt6323_vio18_reg>;
+};
+
 &pio {
 	cir_pins_a:cir@0 {
 		pins_cir {
@@ -314,6 +340,17 @@ 
 			bias-pull-down;
 			drive-strength = <MTK_DRIVE_4mA>;
 		};
+
+		pins_wp {
+			pinmux = <MT7623_PIN_29_EINT7_FUNC_MSDC1_WP>;
+			input-enable;
+			bias-pull-up;
+		};
+
+		pins_insert {
+			pinmux = <MT7623_PIN_261_MSDC1_INS_FUNC_GPIO261>;
+			bias-pull-up;
+		};
 	};
 
 	mmc1_pins_uhs: mmc1 {