OSDN Git Service

staging: mt7621-dts: update sdhci config.
authorNeilBrown <neil@brown.name>
Mon, 1 Jul 2019 00:43:07 +0000 (10:43 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Jul 2019 16:28:29 +0000 (18:28 +0200)
The mtk-sd driver has been updated to support
the IP in the mt7621, so update our configuration
to work with it.

Signed-off-by: NeilBrown <neil@brown.name>
Link: https://lore.kernel.org/r/156194178761.1430.1625105851941268306.stgit@noble.brown
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/mt7621-dts/mt7621.dtsi

index 9c90cac..549ff5a 100644 (file)
                clock-frequency = <220000000>;
        };
 
+       mmc_clock: mmc_clock@0 {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <48000000>;
+       };
+
+       mmc_fixed_3v3: fixedregulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "mmc_power";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               regulator-always-on;
+         };
+
+         mmc_fixed_1v8_io: fixedregulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "mmc_io";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               enable-active-high;
+               regulator-always-on;
+       };
+
        palmbus: palmbus@1E000000 {
                compatible = "palmbus";
                reg = <0x1E000000 0x100000>;
        sdhci: sdhci@1E130000 {
                status = "disabled";
 
-               compatible = "ralink,mt7620-sdhci";
+               compatible = "mediatek,mt7620-mmc";
                reg = <0x1E130000 0x4000>;
 
+               bus-width = <4>;
+               max-frequency = <48000000>;
+               cap-sd-highspeed;
+               cap-mmc-highspeed;
+               vmmc-supply = <&mmc_fixed_3v3>;
+               vqmmc-supply = <&mmc_fixed_1v8_io>;
+               disable-wp;
+
+               pinctrl-names = "default", "state_uhs";
+               pinctrl-0 = <&sdhci_pins>;
+               pinctrl-1 = <&sdhci_pins>;
+
+               clocks = <&mmc_clock &mmc_clock>;
+               clock-names = "source", "hclk";
+
                interrupt-parent = <&gic>;
                interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
        };