diff options
| author | ian <ian@FreeBSD.org> | 2013-12-13 22:46:10 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-12-13 22:46:10 +0000 |
| commit | 2b338fd3cf33e292a21262c8da8e5f3025a8eb79 (patch) | |
| tree | c0643a868c044f76dbf936423378fa0019b3be2f /sys/boot | |
| parent | ec4b958426ff780b90323bfeff2578b33b87eaa5 (diff) | |
| download | FreeBSD-src-2b338fd3cf33e292a21262c8da8e5f3025a8eb79.zip FreeBSD-src-2b338fd3cf33e292a21262c8da8e5f3025a8eb79.tar.gz | |
MFC r257518, r257519:
TI sdhci driver improvements, mostly related to fdt data...
Use the published compatible strings (our own invention, "ti,mmchs" is
still accepted as well, for now).
Don't blindly turn on 8-bit bus mode, because even though the controller
supports it, the board has to be wired appropriately as well. Use the
published property (bus-width=<n>) and honor all the valid values (1,4,8).
The eMMC device on a Beaglebone Black is wired for 8-bit, update the dts.
The mmchs controller can inherently do both 1.8v and 3.0v on the first
device and 1.8v only on other devices, unless an external transceiver is
used. Set the voltage automatically for the first device and honor
the published fdt property (ti,dualvolt) for other devices.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/fdt/dts/am335x.dtsi | 5 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/beaglebone-black.dts | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/fdt/dts/am335x.dtsi b/sys/boot/fdt/dts/am335x.dtsi index 8374d70..c16f039 100644 --- a/sys/boot/fdt/dts/am335x.dtsi +++ b/sys/boot/fdt/dts/am335x.dtsi @@ -163,16 +163,17 @@ }; mmchs0@48060000 { - compatible = "ti,mmchs"; + compatible = "ti,omap3-hsmmc", "ti,mmchs"; reg =<0x48060000 0x1000 >; interrupts = <64>; interrupt-parent = <&AINTC>; mmchs-device-id = <0>; mmchs-wp-gpio-pin = <0xffffffff>; + ti,dual-volt; }; mmchs1@481D8000 { - compatible = "ti,mmchs"; + compatible = "ti,omap3-hsmmc", "ti,mmchs"; reg =<0x481D8000 0x1000 >; interrupts = <28>; interrupt-parent = <&AINTC>; diff --git a/sys/boot/fdt/dts/beaglebone-black.dts b/sys/boot/fdt/dts/beaglebone-black.dts index 04460f5..026363e 100644 --- a/sys/boot/fdt/dts/beaglebone-black.dts +++ b/sys/boot/fdt/dts/beaglebone-black.dts @@ -134,6 +134,7 @@ }; mmchs1@481D8000 { + bus-width = <8>; status = "okay"; }; |
