Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f29200c8 authored by Loys Ollivier's avatar Loys Ollivier Committed by Kevin Hilman
Browse files

arm64: dts: meson: Fix mmc cd-gpios polarity 



Commit 89a5e15b ("gpio/mmc/of: Respect polarity in the device tree")
changed the behavior of "cd-inverted" to follow the device tree bindings
specification:
According to SDHCI standard, CD lines are specified as "active low".
Using the "cd-inverted" property means that the CD line is "active high".

Fix the SD card description for meson by setting the cd-gpios as
"active low", according to the boards specifications, and dropping the
"cd-inverted" property.

Fixes: 89a5e15b ("gpio/mmc/of: Respect polarity in the device tree")
Signed-off-by: default avatarLoys Ollivier <lollivier@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 8615f559

arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ 
	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;

arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ 
	max-frequency = <200000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vddio_ao3v3>;

	vqmmc-supply = <&vddio_tf>;

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

+1 −2
Original line number Diff line number Diff line
@@ -238,8 +238,7 @@ 
	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_card>;

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+1 −2
Original line number Diff line number Diff line
@@ -258,8 +258,7 @@ 
	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&tflash_vdd>;

	vqmmc-supply = <&tf_io>;

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -196,8 +196,7 @@ 
	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_card>;