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

Commit fe7a70db authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.14/dt-v3-pt2-signed' of... 

Merge tag 'omap-for-v4.14/dt-v3-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "device tree changes for omaps for v4.14, part2" from Tony Lindgren:

Second set of device tree changes for omaps for v4.14 merge window.
These got delayed a bit because the iodelay changes had to be
reworked for a missing Signed-off-by. And the beagleboard-x15
wants to use iodelay too for mmc:

- A series of changes to add dra7 iodelay data used for mmc

- Add support for new beagleBoard-x15 revision c

- Fix logicpd-torpedo-37xx-devkit mmc card detect direction

* tag 'omap-for-v4.14/dt-v3-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
  ARM: dts: am57xx-beagle-x15: Add support for rev C
  ARM: dts: dra71-evm: Add pinmux configuration for MMC
  ARM: dts: dra72-evm-revc: Add pinmux configuration for MMC
  ARM: dts: dra72-evm: Add pinmux configuration for MMC
  ARM: dts: am572x-idk: Add pinmux configuration for MMC
  ARM: dts: am571x-idk: Add pinmux configuration for MMC
  ARM: dts: am57xx-idk: Move common MMC/SD properties to common file
  ARM: dts: am57xx-beagle-x15: Add pinmux configuration for MMC
  ARM: dts: dra7-evm: Add pinmux configuration for MMC
  ARM: dts: dra74x: Create a common file with MMC/SD IOdelay data
  ARM: dts: dra72x: Create a common file with MMC/SD IOdelay data
parents f042bdd6 b7ace5ed

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ dtb-$(CONFIG_SOC_OMAP5) += \ 
dtb-$(CONFIG_SOC_DRA7XX) += \

	am57xx-beagle-x15.dtb \

	am57xx-beagle-x15-revb1.dtb \

	am57xx-beagle-x15-revc.dtb \

	am57xx-cl-som-am57x.dtb \

	am57xx-sbc-am57x.dtb \

	am572x-idk.dtb \

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

+19 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <dt-bindings/gpio/gpio.h>

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

#include "am57xx-idk-common.dtsi"

#include "dra72x-mmc-iodelay.dtsi"



/ {

	model = "TI AM5718 IDK";
@@ -64,13 +65,6 @@ 
	};

};



&mmc1 {

	status = "okay";

	vmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */

};



&omap_dwc3_2 {

	extcon = <&extcon_usb2>;

};
@@ -105,3 +99,21 @@ 
&pcie1_ep {

	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

};



&mmc1 {

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

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50_rev20 &mmc1_iodelay_ddr50_conf>;

	pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;

};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_1_8v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_hs>;

	pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;

};

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

+19 −8
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/gpio/gpio.h>

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

#include "am57xx-idk-common.dtsi"

#include "dra74x-mmc-iodelay.dtsi"



/ {

	model = "TI AM5728 IDK";
@@ -67,6 +68,24 @@ 
	};

};



&mmc1 {

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

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>;

	pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;

};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_1_8v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_hs>;

	pinctrl-2 = <&mmc2_pins_ddr_rev20>;

};



&omap_dwc3_2 {

	extcon = <&extcon_usb2>;

};
@@ -76,14 +95,6 @@ 
	vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;

};



&mmc1 {

	status = "okay";

	vmmc-supply = <&v3_3d>;

	vqmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */

};



&sn65hvs882 {

	load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;

};

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

+1 −28
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "dra74x.dtsi"

#include "am57xx-commercial-grade.dtsi"

#include "dra74x-mmc-iodelay.dtsi"

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

#include <dt-bindings/interrupt-controller/irq.h>
@@ -166,34 +167,6 @@ 
	};

};



&dra7_pmx_core {

	mmc1_pins_default: mmc1_pins_default {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14)	/* mmc1sdcd.gpio219 */

			DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | 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 */

		>;

	};



	mmc2_pins_default: mmc2_pins_default {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */

			DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */

			DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */

			DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */

			DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */

			DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */

			DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */

			DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */

			DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */

			DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */

		>;

	};

};

&i2c1 {

	status = "okay";

	clock-frequency = <400000>;

arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts

+15 −0
Original line number Diff line number Diff line
@@ -19,10 +19,25 @@ 
};



&mmc1 {

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

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev11_conf>;

	pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev11_conf>;

	vmmc-supply = <&vdd_3v3>;

	vqmmc-supply = <&ldo1_reg>;

};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_1_8v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_hs>;

	pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;

};



/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */

&phy1 {

	max-speed = <100>;