[v2] arm64/hisilicon: fix SDcard detection

Message ID 1547454274-1674-1-git-send-email-vincent.guittot@linaro.org
State New
Headers show
Series
  • [v2] arm64/hisilicon: fix SDcard detection
Related show

Commit Message

Vincent Guittot Jan. 14, 2019, 8:24 a.m.
The SDcard detection of hikey960 is active low so cd-inverted is wrong.
Instead of adding cd-inverted, we should better set correctly cd-gpios
to use GPIO_ACTIVE_LOW.

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>

---

SD card detection was not working on v5.0-rc1 but patch
https://marc.info/?l=linux-mmc&m=154637189021211&w=2 makes it work.
Nevertheles, latest changes in of_mmc_detection makes possible to have 
a correct DT config.

 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.7.4

Comments

Linus Walleij Jan. 14, 2019, 8:28 a.m. | #1
On Mon, Jan 14, 2019 at 9:24 AM Vincent Guittot
<vincent.guittot@linaro.org> wrote:

> The SDcard detection of hikey960 is active low so cd-inverted is wrong.

> Instead of adding cd-inverted, we should better set correctly cd-gpios

> to use GPIO_ACTIVE_LOW.

>

> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>


Reviewed-by: Linus Walleij <linus.walleij@linaro.org>


Yours,
Linus Walleij
Leo Yan Jan. 14, 2019, 8:36 a.m. | #2
Hi Vincent,

On Mon, Jan 14, 2019 at 09:24:34AM +0100, Vincent Guittot wrote:
> The SDcard detection of hikey960 is active low so cd-inverted is wrong.

> Instead of adding cd-inverted, we should better set correctly cd-gpios

> to use GPIO_ACTIVE_LOW.


Just remind, usually ARM maintainer has requirement for subject as:
'arm64: dts: hikey960: xxxx'.

> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>

> ---

> 

> SD card detection was not working on v5.0-rc1 but patch

> https://marc.info/?l=linux-mmc&m=154637189021211&w=2 makes it work.

> Nevertheles, latest changes in of_mmc_detection makes possible to have 

> a correct DT config.

> 

>  arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> index 71bfe41..dc314e7 100644

> --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> @@ -665,8 +665,7 @@

>  	sd-uhs-sdr50;

>  	sd-uhs-sdr104;

>  	disable-wp;

> -	cd-inverted;

> -	cd-gpios = <&gpio25 3 0>;

> +	cd-gpios = <&gpio25 3 GPIO_ACTIVE_LOW>;

>  	pinctrl-names = "default";

>  	pinctrl-0 = <&sd_pmx_func

>  		     &sd_clk_cfg_func

> -- 

> 2.7.4

>
Wei Xu Feb. 1, 2019, 5 p.m. | #3
Hi Vincent,

On 1/14/2019 8:24 AM, Vincent Guittot wrote:
> The SDcard detection of hikey960 is active low so cd-inverted is wrong.

> Instead of adding cd-inverted, we should better set correctly cd-gpios

> to use GPIO_ACTIVE_LOW.

> 

> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>


Updated the subject as Leo suggested and applied to the hisilicon tree.
Thanks!

Best Regards,
Wei

> ---

> 

> SD card detection was not working on v5.0-rc1 but patch

> https://marc.info/?l=linux-mmc&m=154637189021211&w=2 makes it work.

> Nevertheles, latest changes in of_mmc_detection makes possible to have 

> a correct DT config.

> 

>  arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> index 71bfe41..dc314e7 100644

> --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

> @@ -665,8 +665,7 @@

>  	sd-uhs-sdr50;

>  	sd-uhs-sdr104;

>  	disable-wp;

> -	cd-inverted;

> -	cd-gpios = <&gpio25 3 0>;

> +	cd-gpios = <&gpio25 3 GPIO_ACTIVE_LOW>;

>  	pinctrl-names = "default";

>  	pinctrl-0 = <&sd_pmx_func

>  		     &sd_clk_cfg_func

>

Patch

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 71bfe41..dc314e7 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -665,8 +665,7 @@ 
 	sd-uhs-sdr50;
 	sd-uhs-sdr104;
 	disable-wp;
-	cd-inverted;
-	cd-gpios = <&gpio25 3 0>;
+	cd-gpios = <&gpio25 3 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sd_pmx_func
 		     &sd_clk_cfg_func