diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-11-23 10:00:59 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-11-23 10:00:59 +0000 |
| commit | 03b4169fef3cd7aad7106edf3a1e92d81f75793f (patch) | |
| tree | 0a6090cea52a184a402a658f8fba9b3d4810c926 | |
| parent | ad92605b2bb5d00724b3426193b643e001a1003d (diff) | |
| download | kernel-03b4169fef3cd7aad7106edf3a1e92d81f75793f.tar.gz kernel-03b4169fef3cd7aad7106edf3a1e92d81f75793f.tar.xz kernel-03b4169fef3cd7aad7106edf3a1e92d81f75793f.zip | |
revert patch to fix boot on Pine64
| -rw-r--r-- | arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch | 41 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 45 insertions, 2 deletions
diff --git a/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch b/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch new file mode 100644 index 000000000..33f9271b7 --- /dev/null +++ b/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch @@ -0,0 +1,41 @@ +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 + diff --git a/kernel.spec b/kernel.spec index 4bff284eb..bfc63d683 100644 --- a/kernel.spec +++ b/kernel.spec @@ -593,10 +593,12 @@ Patch303: ARM-tegra-usb-no-reset.patch Patch304: allwinner-net-emac.patch +Patch305: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch + # https://www.spinics.net/lists/arm-kernel/msg554183.html -Patch305: arm-imx6-hummingboard2.patch +Patch306: arm-imx6-hummingboard2.patch -Patch306: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +Patch307: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch # https://patchwork.kernel.org/patch/9820417/ Patch310: qcom-msm89xx-fixes.patch |