summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-08-21 15:04:19 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2016-09-06 10:29:27 -0500
commitecd4644d091628950a843f83a44abbb175bc5d59 (patch)
tree8bb77f034c7e08166ac3de031e05383ffce657a5
parentceedb4245fa266a3499913613e49f9ef1321030e (diff)
downloadFreeBSD-src-ecd4644d091628950a843f83a44abbb175bc5d59.zip
FreeBSD-src-ecd4644d091628950a843f83a44abbb175bc5d59.tar.gz
Update the uFW DTS.
Obtained from: Netgate (cherry picked from commit 336c4c4aae239436a4a69bb22c133a7213700424)
-rw-r--r--sys/boot/fdt/dts/arm/ubmc.dtsi9
-rw-r--r--sys/boot/fdt/dts/arm/ufw.dts5
2 files changed, 13 insertions, 1 deletions
diff --git a/sys/boot/fdt/dts/arm/ubmc.dtsi b/sys/boot/fdt/dts/arm/ubmc.dtsi
index ba8141c..e5b0d20 100644
--- a/sys/boot/fdt/dts/arm/ubmc.dtsi
+++ b/sys/boot/fdt/dts/arm/ubmc.dtsi
@@ -151,12 +151,19 @@
mmc1_pins: pinmux_mmc1_pins {
pinctrl-single,pins = <
- AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
+ AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */
+ AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat2.mmc0_dat2 */
+ AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat1.mmc0_dat1 */
+ AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat0.mmc0_dat0 */
+ AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_clk.mmc0_clk */
+ AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */
+ AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE5) /* spi0_cs1.mmc0_cd */
>;
};
emmc_pins: pinmux_emmc_pins {
pinctrl-single,pins = <
+ AM33XX_IOPAD(0x994, PIN_INPUT_PULLUP | MUX_MODE4) /* mcasp0_fsx.mmc1_cd */
AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
diff --git a/sys/boot/fdt/dts/arm/ufw.dts b/sys/boot/fdt/dts/arm/ufw.dts
index f6d301b..d02dd3b 100644
--- a/sys/boot/fdt/dts/arm/ufw.dts
+++ b/sys/boot/fdt/dts/arm/ufw.dts
@@ -37,6 +37,11 @@
};
&mmc1 {
+ vmmc-supply = <&vmmcsd_fixed>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ bus-width = <4>;
+ non-removable;
status = "okay";
};
OpenPOWER on IntegriCloud