Verified Commit 129dd405 authored by Dan Johansen's avatar Dan Johansen
Browse files

add boottime fix patch

parent 2f8ed5fd
Loading
Loading
Loading
Loading
+64 −0
Original line number Diff line number Diff line
From fa9cc61a3eb9e2e6b6e3810375216513aa742e43 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Wed, 7 Aug 2019 17:10:42 +0200
Subject: [PATCH] revert 'Add capacity-dmips-mhz attributes to rk3399'

---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index cede1ad81be2..e6e224205573 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -71,7 +71,6 @@
 			compatible = "arm,cortex-a53";
 			reg = <0x0 0x0>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <485>;
 			clocks = <&cru ARMCLKL>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <100>;
@@ -83,7 +82,6 @@
 			compatible = "arm,cortex-a53";
 			reg = <0x0 0x1>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <485>;
 			clocks = <&cru ARMCLKL>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <100>;
@@ -95,7 +93,6 @@
 			compatible = "arm,cortex-a53";
 			reg = <0x0 0x2>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <485>;
 			clocks = <&cru ARMCLKL>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <100>;
@@ -107,7 +104,6 @@
 			compatible = "arm,cortex-a53";
 			reg = <0x0 0x3>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <485>;
 			clocks = <&cru ARMCLKL>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <100>;
@@ -119,7 +115,6 @@
 			compatible = "arm,cortex-a72";
 			reg = <0x0 0x100>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <1024>;
 			clocks = <&cru ARMCLKB>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <436>;
@@ -131,7 +126,6 @@
 			compatible = "arm,cortex-a72";
 			reg = <0x0 0x101>;
 			enable-method = "psci";
-			capacity-dmips-mhz = <1024>;
 			clocks = <&cru ARMCLKB>;
 			#cooling-cells = <2>; /* min followed by max */
 			dynamic-power-coefficient = <436>;
-- 
2.22.0
+4 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ _srcname=linux-${_rcver}-rc${_rcrel}
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform (release candidate)"
pkgver=${_rcver}.rc${_rcrel}
pkgrel=1
pkgrel=2
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
@@ -23,6 +23,7 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
        '0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch'
        '0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch'
        '0001-revert-to-old-logitech-drivers.patch'
        '0002-revert-Add-capacity-dmips-mhz-attributes-to-rk3399.patch'
        'config'
        'kernel.its'
        'kernel.keyblock'
@@ -36,6 +37,7 @@ md5sums=('f6569c2bceb7fc64419fec75c1a5f1f7'
         '9986e28b5c2c3c62a5c3bb53abd94640'
         '552ea82c3a5e14ca9149da8c4b4d5a82'
         '87f79444e05a60f6b7b6df66ae53f305'
         '83e9337154271bdbe63f3bbf52cc46fe'
         'c5a875ec2cc34cd51774e4a95f674a2e'
         '7f1a96e24f5150f790df94398e9525a3'
         '61c5ff73c136ed07a7aadbf58db3d96a'
@@ -67,6 +69,7 @@ sed -i s/'# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set'/'CONFIG_CPU_FREQ_DE
  
  # Manjaro ARM Patches
  git apply ../0001-revert-to-old-logitech-drivers.patch
  git apply ../0002-revert-Add-capacity-dmips-mhz-attributes-to-rk3399.patch

  cat "${srcdir}/config" > ./.config