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

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



commit 18aa0f4b ("ARM: dts: am57xx-idk: Select pull down
for mmc1_clk line in default mode") modified mmc1_pins_default
pinctrl group in am57xx-idk-common.dtsi in order to change the CLK
line to PIN_INPUT_PULLDOWN. However instead of modifying 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 ca2618b5

arch/arm/boot/dts/am571x-idk.dts

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "dra72x.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include "dra7-mmc-iodelay.dtsi"

#include "dra72x-mmc-iodelay.dtsi"

#include "am57xx-idk-common.dtsi"
@@ -102,7 +103,7 @@ &pcie1_ep { 


&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>;

arch/arm/boot/dts/am572x-idk.dts

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



#include "dra74x.dtsi"

#include "dra7-mmc-iodelay.dtsi"

#include "dra74x-mmc-iodelay.dtsi"

#include "am572x-idk-common.dtsi"
@@ -20,7 +21,7 @@ / { 


&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>;

arch/arm/boot/dts/am57xx-idk-common.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -115,17 +115,6 @@ DRA7XX_CORE_IOPAD(0x37d0, MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ 
			DRA7XX_CORE_IOPAD(0x37d4, MUX_MODE15 | PULL_UP)	/* dcan1_rx.off */

		>;

	};



	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 {