diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-12 12:58:29 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-12 12:58:29 +0200 |
| commit | 81dccd5a6e8233ec7cd8f406f5ae6f205cb1a30d (patch) | |
| tree | e4c20c4e3dd4daa476cdbdacd021187806074a9d /arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch | |
| parent | e7dc2ec924aef9df70453f676835c42dc68bfc84 (diff) | |
| parent | 326828aa4ac885ea1e440e2633f66c29582769ed (diff) | |
| download | kernel-81dccd5a6e8233ec7cd8f406f5ae6f205cb1a30d.tar.gz kernel-81dccd5a6e8233ec7cd8f406f5ae6f205cb1a30d.tar.xz kernel-81dccd5a6e8233ec7cd8f406f5ae6f205cb1a30d.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch')
| -rw-r--r-- | arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch b/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch deleted file mode 100644 index 33f9271b7..000000000 --- a/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 90e388ca5d8bbee022f9ed5fc24137b31579fa6e Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Wed, 22 Nov 2017 15:52:36 +0000 -Subject: [PATCH] Revert "arm64: allwinner: a64: pine64: Use dcdc1 regulator - for mmc0" - -This reverts commit 3f241bfa60bdc9c4fde63fa6664a8ce00fd668c6. ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -index d06e34b5d192..caf8b6fbe5e3 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -@@ -61,6 +61,13 @@ - chosen { - stdout-path = "serial0:115200n8"; - }; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; - }; - - &ehci0 { -@@ -84,7 +91,7 @@ - &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; -- vmmc-supply = <®_dcdc1>; -+ vmmc-supply = <®_vcc3v3>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; - cd-inverted; - disable-wp; --- -2.14.3 - |