ipq40xx: directly define voltage per opp
authorPavel Kubelun <be.dissent@gmail.com>
Tue, 14 May 2019 13:42:17 +0000 (16:42 +0300)
committerChristian Lamparter <chunkeey@gmail.com>
Sat, 15 Jun 2019 17:55:32 +0000 (19:55 +0200)
This should align opp table with what it was before converting to OPP v2.

Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
22 files changed:
target/linux/ipq40xx/patches-4.14/072-qcom-ipq4019-add-cpu-operating-points-for-cpufreq-su.patch
target/linux/ipq40xx/patches-4.14/073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch
target/linux/ipq40xx/patches-4.14/077-qcom-ipq4019-add-USB-devicetree-nodes.patch
target/linux/ipq40xx/patches-4.14/078-ARM-dts-ipq4019-Add-a-few-peripheral-nodes.patch
target/linux/ipq40xx/patches-4.14/079-ARM-dts-ipq4019-fix-PCI-range.patch
target/linux/ipq40xx/patches-4.14/080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch
target/linux/ipq40xx/patches-4.14/084-ARM-dts-ipq4019-Add-a-default-chosen-node.patch
target/linux/ipq40xx/patches-4.14/086-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch
target/linux/ipq40xx/patches-4.14/087-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch
target/linux/ipq40xx/patches-4.14/701-dts-ipq4019-add-mdio-node.patch
target/linux/ipq40xx/patches-4.14/702-dts-ipq4019-add-PHY-switch-nodes.patch
target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch
target/linux/ipq40xx/patches-4.19/072-v4.20-ARM-dts-qcom-ipq4019-add-cpu-operating-points-for-cp.patch
target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch
target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch
target/linux/ipq40xx/patches-4.19/079-v4.20-ARM-dts-qcom-ipq4019-fix-PCI-range.patch
target/linux/ipq40xx/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch
target/linux/ipq40xx/patches-4.19/083-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch
target/linux/ipq40xx/patches-4.19/084-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch
target/linux/ipq40xx/patches-4.19/701-dts-ipq4019-add-mdio-node.patch
target/linux/ipq40xx/patches-4.19/702-dts-ipq4019-add-PHY-switch-nodes.patch
target/linux/ipq40xx/patches-4.19/711-dts-ipq4019-add-ethernet-essedma-node.patch

index 156ffa1b6d1426116b54d905a2c798d5373d4b78..06749ea7330d08440962f9903ba1b234f7ff068b 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
  arch/arm/boot/dts/qcom-ipq4019.dtsi | 34 ++++++++++++++++++++++++++--------
- 1 file changed, 26 insertions(+), 8 deletions(-)
+ 1 file changed, 30 insertions(+), 8 deletions(-)
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -54,7 +54,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
                };
  
                L2: l2-cache {
-@@ -94,6 +90,28 @@
+@@ -94,6 +90,32 @@
                };
        };
  
@@ -65,18 +65,22 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +              opp-48000000 {
 +                      opp-hz = /bits/ 64 <48000000>;
 +                      clock-latency-ns = <256000>;
++                      opp-microvolt = <1100000>;
 +              };
 +              opp-200000000 {
 +                      opp-hz = /bits/ 64 <200000000>;
 +                      clock-latency-ns = <256000>;
++                      opp-microvolt = <1100000>;
 +              };
 +              opp-500000000 {
 +                      opp-hz = /bits/ 64 <500000000>;
 +                      clock-latency-ns = <256000>;
++                      opp-microvolt = <1100000>;
 +              };
 +              opp-716000000 {
 +                      opp-hz = /bits/ 64 <716000000>;
 +                      clock-latency-ns = <256000>;
++                      opp-microvolt = <1100000>;
 +              };
 +      };
 +
index d72e3d3c36a1c3f9488000594f4d5258a71d7401..ac128ab9e1a8171db383bab45831fc0cd5f0b91d 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -262,7 +262,7 @@
+@@ -266,7 +266,7 @@
  
                  saw0: regulator@b089000 {
                          compatible = "qcom,saw2";
index 44c07f8f457000b53ed8e50cdce6926888f8d65f..be413188a70b9cabafc3c5e0019411ad9505e64c 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  };
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -410,5 +410,79 @@
+@@ -414,5 +414,79 @@
                                          "legacy";
                        status = "disabled";
                };
index b761073c12e8ecf67856a0972236e5275a50cfd4..b1e0e352ad99306f48731adb85f0a288958ac036 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
        };
  
        cpus {
-@@ -132,6 +134,12 @@
+@@ -136,6 +138,12 @@
                };
        };
  
@@ -54,7 +54,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
        timer {
                compatible = "arm,armv7-timer";
                interrupts = <1 2 0xf08>,
-@@ -177,13 +185,13 @@
+@@ -181,13 +189,13 @@
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
@@ -70,7 +70,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        clocks = <&gcc GCC_BLSP1_AHB_CLK>;
                        clock-names = "bam_clk";
                        #dma-cells = <1>;
-@@ -191,7 +199,7 @@
+@@ -195,7 +203,7 @@
                        status = "disabled";
                };
  
@@ -79,7 +79,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x78b5000 0x600>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-@@ -200,10 +208,26 @@
+@@ -204,10 +212,26 @@
                        clock-names = "core", "iface";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -107,7 +107,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x78b7000 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-@@ -212,14 +236,29 @@
+@@ -216,14 +240,29 @@
                        clock-names = "iface", "core";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -138,7 +138,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        clocks = <&gcc GCC_CRYPTO_AHB_CLK>;
                        clock-names = "bam_clk";
                        #dma-cells = <1>;
-@@ -293,7 +332,7 @@
+@@ -297,7 +336,7 @@
                serial@78af000 {
                        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
                        reg = <0x78af000 0x200>;
@@ -147,7 +147,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        status = "disabled";
                        clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>,
                                <&gcc GCC_BLSP1_AHB_CLK>;
-@@ -305,7 +344,7 @@
+@@ -309,7 +348,7 @@
                serial@78b0000 {
                        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
                        reg = <0x78b0000 0x200>;
@@ -156,7 +156,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        status = "disabled";
                        clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,
                                <&gcc GCC_BLSP1_AHB_CLK>;
-@@ -327,6 +366,101 @@
+@@ -331,6 +370,101 @@
                        reg = <0x4ab000 0x4>;
                };
  
@@ -258,7 +258,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                wifi0: wifi@a000000 {
                        compatible = "qcom,ipq4019-wifi";
                        reg = <0xa000000 0x200000>;
-@@ -360,7 +494,7 @@
+@@ -364,7 +498,7 @@
                                     <GIC_SPI 45 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 46 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>,
@@ -267,7 +267,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        interrupt-names =  "msi0",  "msi1",  "msi2",  "msi3",
                                           "msi4",  "msi5",  "msi6",  "msi7",
                                           "msi8",  "msi9", "msi10", "msi11",
-@@ -402,7 +536,7 @@
+@@ -406,7 +540,7 @@
                                     <GIC_SPI 61 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 62 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 63 IRQ_TYPE_EDGE_RISING>,
index 253e91480fcaccb7638303696a28df842f01bb9e..42ce65034b0056044dfdae2f5988afe8bb293b3e 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -381,7 +381,7 @@
+@@ -385,7 +385,7 @@
                        #size-cells = <2>;
  
                        ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000
index 81b13e6b2cf5e830110c1ba3fae8ba26ec64f8c7..0efb38b244cbdfd570553516d216d9f6d13d91f0 100644 (file)
@@ -61,7 +61,7 @@ Origin: other, https://patchwork.kernel.org/patch/10339127/
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -182,6 +182,7 @@
+@@ -186,6 +186,7 @@
                        compatible = "qcom,ipq4019-pinctrl";
                        reg = <0x01000000 0x300000>;
                        gpio-controller;
index 513e623ded69fd9210479bf7e5ba242eb8e12aee..5d9023e60ccf794e35f68cc10d5ca01f0e97286d 100644 (file)
@@ -34,7 +34,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                        status = "ok";
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -346,7 +346,7 @@
+@@ -350,7 +350,7 @@
                        regulator;
                };
  
index eb1e912f5d5c7dea69f5baec2fa9aedc119f9991..acea3fb90c7637f9059fc5c9f0e1f857381cb580 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -397,8 +397,8 @@
+@@ -401,8 +401,8 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
  
index 44cc72505262b7839b701cf786cd408abfcd32f3..7864ef7fdff51b3c2541565a46533f8881d0e82e 100644 (file)
@@ -21,7 +21,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -400,7 +400,7 @@
+@@ -404,7 +404,7 @@
                        ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>,
                                 <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>;
  
index 5c2e19941b73fc23b8c6c6111e3c0a3aad56b771..0e1bb87368816c93e51433977466af2686fba5e7 100644 (file)
@@ -15,7 +15,7 @@ so the info might change.
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -562,6 +562,34 @@
+@@ -566,6 +566,34 @@
                        status = "disabled";
                };
  
index 2b7921a616259a2be9a659fa380c37f5230ba0ac..03da6c863a8eb4c4de2b0a60850a1e8acc23f628 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -590,6 +590,29 @@
+@@ -594,6 +594,29 @@
                        };
                };
  
index db545e6906ee81bada50f20e00a955b79d3c5240..7302d237bcf9f559e27593cfe3700403bbc59db4 100644 (file)
@@ -25,7 +25,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        };
  
        cpus {
-@@ -613,6 +615,64 @@
+@@ -617,6 +619,64 @@
                        status = "disabled";
                };
  
index 303546105e15f223da1d6af203b474455d2501e2..991b366eda86d310d8f871ebebb908c589f9f91f 100644 (file)
@@ -10,8 +10,8 @@ Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
 Signed-off-by: John Crispin <john@phrozen.org>
 Signed-off-by: Andy Gross <andy.gross@linaro.org>
 ---
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 54 ++++++++++++++---------------
- 1 file changed, 26 insertions(+), 28 deletions(-)
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 58 ++++++++++++++---------------
+ 1 file changed, 30 insertions(+), 28 deletions(-)
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -79,7 +79,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
                };
  
                L2: l2-cache {
-@@ -136,6 +112,28 @@
+@@ -136,6 +112,32 @@
                };
        };
  
@@ -89,18 +89,22 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
 +
 +              opp-48000000 {
 +                      opp-hz = /bits/ 64 <48000000>;
++                      opp-microvolt = <1100000>;
 +                      clock-latency-ns = <256000>;
 +              };
 +              opp-200000000 {
 +                      opp-hz = /bits/ 64 <200000000>;
++                      opp-microvolt = <1100000>;
 +                      clock-latency-ns = <256000>;
 +              };
 +              opp-500000000 {
 +                      opp-hz = /bits/ 64 <500000000>;
++                      opp-microvolt = <1100000>;
 +                      clock-latency-ns = <256000>;
 +              };
 +              opp-716000000 {
 +                      opp-hz = /bits/ 64 <716000000>;
++                      opp-microvolt = <1100000>;
 +                      clock-latency-ns = <256000>;
 +              };
 +      };
index 7573e4897ff47eb30d936ba7e3bc790345a12243..cd1370ea5ed04decf2dfdfdb2b0286528babc524 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -321,7 +321,7 @@
+@@ -325,7 +325,7 @@
  
                  saw0: regulator@b089000 {
                          compatible = "qcom,saw2";
index ff6fb4b5762bc1bf5ad4eac9f3814ee9c9bc4813..e02fdf59c23f39b60ba371c6a2edeae1301532d7 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  };
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -564,5 +564,79 @@
+@@ -568,5 +568,79 @@
                                          "legacy";
                        status = "disabled";
                };
index 6bfea2a5c275ecdfefa9dab6227249706a5b23b5..ecf2a4aefbb767684e6b38f13d8d0a63e7d70934 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Andy Gross <andy.gross@linaro.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -401,7 +401,7 @@
+@@ -405,7 +405,7 @@
                        #size-cells = <2>;
  
                        ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000
index 67522f5cf29616f1033c789deeb8e9057dae8381..3a18ffc08f631fc5142d3268c6959426fa1efd44 100644 (file)
@@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl.
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -202,6 +202,7 @@
+@@ -206,6 +206,7 @@
                        compatible = "qcom,ipq4019-pinctrl";
                        reg = <0x01000000 0x300000>;
                        gpio-controller;
index acea3fb90c7637f9059fc5c9f0e1f857381cb580..1283f93708288d9e96a765148cf0986e63ff23bb 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -401,8 +401,8 @@
+@@ -405,8 +405,8 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
  
index 7864ef7fdff51b3c2541565a46533f8881d0e82e..b5492c9f98391ae858caf3626cf06cde992b0b27 100644 (file)
@@ -21,7 +21,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -404,7 +404,7 @@
+@@ -408,7 +408,7 @@
                        ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>,
                                 <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>;
  
index 0e1bb87368816c93e51433977466af2686fba5e7..e5936a0c93aa73e509200104ff746fd40f69d970 100644 (file)
@@ -15,7 +15,7 @@ so the info might change.
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -566,6 +566,34 @@
+@@ -570,6 +570,34 @@
                        status = "disabled";
                };
  
index 03da6c863a8eb4c4de2b0a60850a1e8acc23f628..7c5d1ec2bbb3805bfab85857b1bf937e2b16b002 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -594,6 +594,29 @@
+@@ -598,6 +598,29 @@
                        };
                };
  
index 7302d237bcf9f559e27593cfe3700403bbc59db4..51cf41114325b34e3c5a7fd21939b0561cb1191b 100644 (file)
@@ -25,7 +25,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        };
  
        cpus {
-@@ -617,6 +619,64 @@
+@@ -621,6 +623,64 @@
                        status = "disabled";
                };