diff options
| -rw-r--r-- | arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch | 41 | ||||
| -rw-r--r-- | configs/base-generic/CONFIG_IR_SIR | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-aarch64.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 1 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 1 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 1 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 1 | ||||
| -rw-r--r-- | kernel-i686.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 1 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 1 | ||||
| -rw-r--r-- | kernel-s390x.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64.config | 1 | ||||
| -rw-r--r-- | kernel.spec | 2 |
21 files changed, 62 insertions, 0 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/configs/base-generic/CONFIG_IR_SIR b/configs/base-generic/CONFIG_IR_SIR new file mode 100644 index 000000000..58ea0b9e1 --- /dev/null +++ b/configs/base-generic/CONFIG_IR_SIR @@ -0,0 +1 @@ +# CONFIG_IR_SIR is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index e7499f03a..481ad6d86 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2492,6 +2492,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index d7e5fbbd7..addb46708 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2475,6 +2475,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index b2a7fd562..356929654 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2646,6 +2646,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 6cade04ee..e3e13b4e1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2514,6 +2514,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index fd7bfa93e..2e97c5065 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2497,6 +2497,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 088497601..f1295aef1 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2629,6 +2629,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index f5071788b..ae202a3ca 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2383,6 +2383,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index bd999bb87..b6182ce73 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2401,6 +2401,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 08a5361c3..717f3160a 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2401,6 +2401,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-i686.config b/kernel-i686.config index 81c115a52..809cf9150 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2383,6 +2383,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 3d4456f74..5400e93bb 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2250,6 +2250,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index edc4285d7..9985b0f2b 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2232,6 +2232,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 15e8b35ce..eeb33e98d 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2195,6 +2195,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 01e39d5fd..37ee234e7 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2177,6 +2177,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index cb795dfdc..d63b2ac8a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2146,6 +2146,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 2e35907b5..5fae96448 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2128,6 +2128,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 298ce0bf3..9e604e123 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2457,6 +2457,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4506e9530..0a0a55037 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2439,6 +2439,7 @@ CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SHARP_DECODER=m +# CONFIG_IR_SIR is not set CONFIG_IR_SONY_DECODER=m CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m diff --git a/kernel.spec b/kernel.spec index a028773f3..97e9c1e92 100644 --- a/kernel.spec +++ b/kernel.spec @@ -591,6 +591,8 @@ Patch305: arm-imx6-hummingboard2.patch Patch306: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +Patch307: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch + # https://patchwork.kernel.org/patch/9820417/ Patch310: qcom-msm89xx-fixes.patch |