diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:24:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:24:48 +0200 |
| commit | 6bf99a6cb69f78de0083b76a7c033918f853f580 (patch) | |
| tree | ba451dc4faecd37cbea0eb21397ce4ddbab35c9b /arch/arm64 | |
| parent | 716479a39fc9f1f867735fc0dafaa8cd547bc72b (diff) | |
| parent | a231d2783c332ef3e3ba238e82dbe599ff41ba14 (diff) | |
| download | linux-6bf99a6cb69f78de0083b76a7c033918f853f580.tar.bz2 | |
Merge tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Pull "Allwinner fixes for 4.14" from Maxime Ripard:
Two fixes, one for the A31 DRM binding, and one for a missing regulator on
the pine MMC controller.
* tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun6i: Fix endpoint IDs in second display pipeline
arm64: allwinner: a64: pine64: Use dcdc1 regulator for mmc0
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index caf8b6fbe5e3..d06e34b5d192 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -61,13 +61,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - - reg_vcc3v3: vcc3v3 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; }; &ehci0 { @@ -91,7 +84,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <®_vcc3v3>; + vmmc-supply = <®_dcdc1>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; cd-inverted; disable-wp; |