Commit f306c251 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

ARM: dts: dra71-evm: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown 



commit 0e43884c ("ARM: dts: dra71-evm: Select pull
down for mmc1_clk line in default mode") modified mmc1_pins_default
pinctrl group in dra71-evm.dts to change the CLK line to
PIN_INPUT_PULLDOWN. However instead of changing the pinctrl group,
use the new pinctrl group "mmc1_pins_default_no_clk_pu" in
dra7-mmc-iodelay.dtsi added specifically to be used for CLK line
without external pull up.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent edfc459c

arch/arm/boot/dts/dra71-evm.dts

+2 −14
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include "dra72-evm-common.dtsi"

#include "dra7-mmc-iodelay.dtsi"

#include "dra72x-mmc-iodelay.dtsi"

#include <dt-bindings/net/ti-dp83867.h>
@@ -50,19 +51,6 @@ poweroff: gpio-poweroff { 
	};

};



&dra7_pmx_core {

	mmc1_pins_default: mmc1_pins_default {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */

			DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */

			DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */

			DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */

			DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */

			DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */

		>;

	};

};



&i2c1 {

	status = "okay";

	clock-frequency = <400000>;
@@ -187,7 +175,7 @@ p0 { 


&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;