Commit de776fe9 authored by Phil Elwell's avatar Phil Elwell
Browse files

BCM270X_DT: Tidy up mmc, sdhost, sdio overlays 



The mmc, sdhost, sdio and sdio-1bit overlays had a few
anachronisms and oddities which were overdue for fixing.
The new versions should be functionally equivalent.

Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
parent 2f2836b5

arch/arm/boot/dts/overlays/mmc-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
			mmc_pins: mmc_pins {

				brcm,pins = <48 49 50 51 52 53>;

				brcm,function = <7>; /* alt3 */

				brcm.pull = <0 2 2 2 2 2>;

			};

		};

	};

arch/arm/boot/dts/overlays/sdhost-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
		frag0: __overlay__ {

			brcm,overclock-50 = <0>;

			brcm,pio-limit = <1>;

			brcm,debug-flags = <0>;

			status = "okay";

		};

	};

arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts

+6 −5
Original line number Diff line number Diff line 
/* Enable 1-bit SDIO from MMC interface via GPIOs 22-25. Includes sdhost overlay. */

/dts-v1/;

/plugin/;



/include/ "sdhost-overlay.dts"

/* Enable 1-bit SDIO from MMC interface via GPIOs 22-25. Includes sdhost overlay. */



/{

	compatible = "brcm,bcm2708";



	fragment@3 {

	fragment@0 {

		target = <&mmc>;

		sdio_mmc: __overlay__ {

			compatible = "brcm,bcm2835-mmc";
@@ -18,12 +19,12 @@ 
		};

	};



	fragment@4 {

	fragment@1 {

		target = <&gpio>;

		__overlay__ {

			sdio_pins: sdio_pins {

				brcm,pins = <22 23 24 25>;

				brcm,function = <7 7 7 7>; /* ALT3 = SD1 */

				brcm,function = <7>; /* ALT3 = SD1 */

				brcm,pull = <0 2 2 2>;

			};

		};

arch/arm/boot/dts/overlays/sdio-overlay.dts

+6 −5
Original line number Diff line number Diff line 
/* Enable SDIO from MMC interface via GPIOs 22-27. Includes sdhost overlay. */

/dts-v1/;

/plugin/;



/include/ "sdhost-overlay.dts"

/* Enable SDIO from MMC interface via GPIOs 22-27. Includes sdhost overlay. */



/{

	compatible = "brcm,bcm2708";



	fragment@3 {

	fragment@0 {

		target = <&mmc>;

		sdio_mmc: __overlay__ {

			pinctrl-names = "default";
@@ -17,12 +18,12 @@ 
		};

	};



	fragment@4 {

	fragment@1 {

		target = <&gpio>;

		__overlay__ {

			sdio_pins: sdio_pins {

				brcm,pins = <22 23 24 25 26 27>;

				brcm,function = <7 7 7 7 7 7>; /* ALT3 = SD1 */

				brcm,function = <7>; /* ALT3 = SD1 */

				brcm,pull = <0 2 2 2 2 2>;

			};

		};