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

Commit 0517a093 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.17/dt-sdhci-signed' of... 

Merge tag 'omap-for-v4.17/dt-sdhci-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Device tree changes for dra7 sdhci for v4.17" from Tony Lindgren:

This series from Sekhar Nori and Kishon Vijay Abraham I adds
sdhci related nodes for dra7. To support higher transfer speeds,
the iodelay pinmux controller needs to be also configured.

Note that as these changes need SDHCI_OMAP to be enabled to avoid
breaking booting for various systems, these changes are based on
two defconfig changes to enable SDHCI_OMAP in the defconfig files.

* tag 'omap-for-v4.17/dt-sdhci-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am57xx-idk: Select pull down for mmc1_clk line in default mode
  ARM: dts: dra71-evm: Select pull down for mmc1_clk line in default mode
  ARM: dts: dra71-evm: Correct evm_sd regulator max voltage
  ARM: dts: dra76-evm: Add "vqmmc-supply" property for mmc2
  ARM: dts: am57xx-idk: Add "vqmmc-supply" property for mmc2
  ARM: dts: dra7-evm: Add "vqmmc-supply" property for mmc2
  ARM: dts: dra7-evm: Remove mmc specific pinmux
  ARM: dts: am57xx-beagle-x15: Add "vqmmc-supply" property for mmc2
  ARM: dts: dra76-evm: Add pinctrl data for higher speed MMC/SD modes
  ARM: dts: dra76-evm: Shift to using common IOdelay data
  ARM: dts: dra76x: Create a common file with MMC/SD IOdelay data
  ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
  ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
parents ea99a354 18aa0f4b

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

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

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

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

#include "am57xx-idk-common.dtsi"

#include "dra72x-mmc-iodelay.dtsi"

#include "am57xx-idk-common.dtsi"



/ {

	model = "TI AM5718 IDK";

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

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



#include "dra74x.dtsi"

#include "am572x-idk-common.dtsi"

#include "am57xx-idk-common.dtsi"

#include "dra74x-mmc-iodelay.dtsi"

#include "am572x-idk-common.dtsi"



/ {

	model = "TI AM5728 IDK";

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

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ 
	pinctrl-0 = <&mmc2_pins_default>;



	vmmc-supply = <&vdd_3v3>;

	vqmmc-supply = <&vdd_3v3>;

	bus-width = <8>;

	ti,non-removable;

	cap-mmc-dual-data-rate;

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

+12 −0
Original line number Diff line number Diff line
@@ -115,6 +115,17 @@ 
			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 {
@@ -410,6 +421,7 @@ 
&mmc2 {

	status = "okay";

	vmmc-supply = <&v3_3d>;

	vqmmc-supply = <&v3_3d>;

	bus-width = <8>;

	ti,non-removable;

	max-frequency = <96000000>;

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

+1 −27
Original line number Diff line number Diff line
@@ -87,33 +87,6 @@ 
			DRA7XX_CORE_IOPAD(0x3818, MUX_MODE15 | PULL_UP)	/* wakeup0.off */

		>;

	};



	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 {
@@ -350,6 +323,7 @@ 
&mmc2 {

	status = "okay";

	vmmc-supply = <&evm_1v8_sw>;

	vqmmc-supply = <&evm_1v8_sw>;

	bus-width = <8>;

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

	pinctrl-0 = <&mmc2_pins_default>;