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

Commit ef8d2ffe authored by Kevin Hilman's avatar Kevin Hilman
Browse files

ARM64: dts: meson-gxbb: add MMC support 



Add binding and basic support for the SD/eMMC controller on Amlogic
S905/GXBB devices.

Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
[narmstrong: added nodes for GX, enabled SDIO on P20x]
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 5a0803bd

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+21 −0
Original line number Original line Diff line number Diff line
@@ -203,6 +203,27 @@ 
			#address-cells = <2>;

			#address-cells = <2>;

			#size-cells = <2>;

			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;

			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;



			sd_emmc_a: mmc@70000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x70000 0x0 0x2000>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			sd_emmc_b: mmc@72000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x72000 0x0 0x2000>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			sd_emmc_c: mmc@74000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x74000 0x0 0x2000>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};

		};

		};

	};

	};

};
 
};

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+88 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,56 @@ 
			default-state = "off";

			default-state = "off";

		};

		};

	};

	};



	tflash_vdd: regulator-tflash_vdd {

		/*

		 * signal name from schematics: TFLASH_VDD_EN

		 */

		compatible = "regulator-fixed";



		regulator-name = "TFLASH_VDD";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&gpio_ao GPIOAO_12 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	tf_io: gpio-regulator-tf_io {

		compatible = "regulator-gpio";



		regulator-name = "TF_IO";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		/*

		 * signal name from schematics: TF_3V3N_1V8_EN

		 */

		gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;

		gpios-states = <0>;



		states = <3300000 0

			  1800000 1>;

	};



	vcc1v8: regulator-vcc1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VCC1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	vcc3v3: regulator-vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};

};

};





&uart_AO {

&uart_AO {
@@ -127,3 +177,41 @@ 
&usb1 {

&usb1 {

	status = "okay";

	status = "okay";

};

};



/* SD */

&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;



	vmmc-supply = <&tflash_vdd>;

	vqmmc-supply = <&tf_io>;

};



/* eMMC */

&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";



	bus-width = <8>;

	cap-sd-highspeed;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

	cap-mmc-highspeed;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	mmc-pwrseq = <&emmc_pwrseq>;

	vmmc-supply = <&vcc3v3>;

	vqmmc-supply = <&vcc1v8>;

};

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

+98 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,47 @@ 
		gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		enable-active-high;

	};

	};



	vddio_card: gpio-regulator {

		compatible = "regulator-gpio";



		regulator-name = "VDDIO_CARD";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;



		/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */

		states = <1800000 0

			  3300000 1>;

	};



	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	vcc_3v3: regulator-vcc_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};

};

};





/* This UART is brought out to the DB9 connector */

/* This UART is brought out to the DB9 connector */
@@ -107,3 +148,60 @@ 
&usb1 {

&usb1 {

	status = "okay";

	status = "okay";

};

};



/* Wireless SDIO Module */

&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-names = "default";

	#address-cells = <1>;

	#size-cells = <0>;



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;



	non-removable;

	disable-wp;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;

};



/* SD card */

&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_card>;

};



/* eMMC */

&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	mmc-pwrseq = <&emmc_pwrseq>;

	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vddio_boot>;

};

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

+23 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,8 @@ 
			mux {

			mux {

				groups = "emmc_nand_d07",

				groups = "emmc_nand_d07",

				       "emmc_cmd",

				       "emmc_cmd",

				       "emmc_clk";

				       "emmc_clk",

				       "emmc_ds";

				function = "emmc";

				function = "emmc";

			};

			};

		};

		};
@@ -545,3 +546,24 @@ 
		#mbox-cells = <1>;

		#mbox-cells = <1>;

	};

	};

};

};



&sd_emmc_a {

	clocks = <&clkc CLKID_SD_EMMC_A>,

		 <&xtal>,

		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "core", "clkin0", "clkin1";

};



&sd_emmc_b {

	clocks = <&clkc CLKID_SD_EMMC_B>,

		 <&xtal>,

		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "core", "clkin0", "clkin1";

};



&sd_emmc_c {

	clocks = <&clkc CLKID_SD_EMMC_C>,

		 <&xtal>,

		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "core", "clkin0", "clkin1";

};