Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0f096b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-dts-for-4.19' of... 

Merge tag 'qcom-dts-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm Device Tree Changes for v4.19

* Add missing OPPs on IPQ4019
* Fix sdhci l20 load on Hammerhead
* Use proper IRQ macros for IPQ8064 interrupts

* tag 'qcom-dts-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  ARM: dts: qcom: Add missing OPP properties for CPUs
  ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci
  ARM: dts: qcom: Fix 'interrupts = <>' property to use proper macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9be6a940 b0c28f27

arch/arm/boot/dts/qcom-ipq4019.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -77,6 +77,14 @@ 
			reg = <0x1>;

			clocks = <&gcc GCC_APPS_CLK_SRC>;

			clock-frequency = <0>;

			operating-points = <

				/* kHz	uV (fixed) */

				48000	1100000

				200000	1100000

				500000	1100000

				666000	1100000

			>;

			clock-latency = <256000>;

		};



		cpu@2 {
@@ -88,6 +96,14 @@ 
			reg = <0x2>;

			clocks = <&gcc GCC_APPS_CLK_SRC>;

			clock-frequency = <0>;

			operating-points = <

				/* kHz	uV (fixed) */

				48000	1100000

				200000	1100000

				500000	1100000

				666000	1100000

			>;

			clock-latency = <256000>;

		};



		cpu@3 {
@@ -99,6 +115,14 @@ 
			reg = <0x3>;

			clocks = <&gcc GCC_APPS_CLK_SRC>;

			clock-frequency = <0>;

			operating-points = <

				/* kHz	uV (fixed) */

				48000	1100000

				200000	1100000

				500000	1100000

				666000	1100000

			>;

			clock-latency = <256000>;

		};

	};

arch/arm/boot/dts/qcom-ipq8064.dtsi

+24 −17
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>

#include <dt-bindings/clock/qcom,lcc-ipq806x.h>

#include <dt-bindings/soc/qcom,gsbi.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	model = "Qualcomm IPQ8064";
@@ -43,7 +44,8 @@ 


	cpu-pmu {

		compatible = "qcom,krait-pmu";

		interrupts = <1 10 0x304>;

		interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |

					  IRQ_TYPE_LEVEL_HIGH)>;

	};



	reserved-memory {
@@ -97,7 +99,7 @@ 
			clock-names = "ahbix-clk",

					"mi2s-osr-clk",

					"mi2s-bit-clk";

			interrupts = <0 85 1>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "lpass-irq-lpaif";

			reg = <0x28100000 0x10000>;

			reg-names = "lpass-lpaif";
@@ -111,7 +113,7 @@ 
			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <0 16 0x4>;

			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		};



		intc: interrupt-controller@2000000 {
@@ -125,11 +127,16 @@ 
		timer@200a000 {

			compatible = "qcom,kpss-timer",

				     "qcom,kpss-wdt-ipq8064", "qcom,msm-timer";

			interrupts = <1 1 0x301>,

				     <1 2 0x301>,

				     <1 3 0x301>,

				     <1 4 0x301>,

				     <1 5 0x301>;

			interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) |

						 IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) |

						 IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) |

						 IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) |

						 IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) |

						 IRQ_TYPE_EDGE_RISING)>;

			reg = <0x0200a000 0x100>;

			clock-frequency = <25000000>,

					  <32768>;
@@ -177,7 +184,7 @@ 
				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

				reg = <0x12490000 0x1000>,

				      <0x12480000 0x1000>;

				interrupts = <0 195 0x0>;

				interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>;

				clock-names = "core", "iface";

				status = "disabled";
@@ -186,7 +193,7 @@ 
			i2c@124a0000 {

				compatible = "qcom,i2c-qup-v1.1.1";

				reg = <0x124a0000 0x1000>;

				interrupts = <0 196 0>;

				interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;



				clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;

				clock-names = "core", "iface";
@@ -215,7 +222,7 @@ 
				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

				reg = <0x16340000 0x1000>,

				      <0x16300000 0x1000>;

				interrupts = <0 152 0x0>;

				interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;

				clock-names = "core", "iface";

				status = "disabled";
@@ -224,7 +231,7 @@ 
			i2c@16380000 {

				compatible = "qcom,i2c-qup-v1.1.1";

				reg = <0x16380000 0x1000>;

				interrupts = <0 153 0>;

				interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;



				clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>;

				clock-names = "core", "iface";
@@ -252,7 +259,7 @@ 
				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

				reg = <0x1a240000 0x1000>,

				      <0x1a200000 0x1000>;

				interrupts = <0 154 0x0>;

				interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;

				clock-names = "core", "iface";

				status = "disabled";
@@ -261,7 +268,7 @@ 
			i2c@1a280000 {

				compatible = "qcom,i2c-qup-v1.1.1";

				reg = <0x1a280000 0x1000>;

				interrupts = <0 155 0>;

				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;



				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;

				clock-names = "core", "iface";
@@ -274,7 +281,7 @@ 
			spi@1a280000 {

				compatible = "qcom,spi-qup-v1.1.1";

				reg = <0x1a280000 0x1000>;

				interrupts = <0 155 0>;

				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;



				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;

				clock-names = "core", "iface";
@@ -301,7 +308,7 @@ 
				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

				reg = <0x16640000 0x1000>,

				      <0x16600000 0x1000>;

				interrupts = <0 158 0x0>;

				interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;

				clock-names = "core", "iface";

				status = "disabled";
@@ -323,7 +330,7 @@ 
			compatible = "qcom,ipq806x-ahci", "generic-ahci";

			reg = <0x29000000 0x180>;



			interrupts = <0 209 0x0>;

			interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;



			clocks = <&gcc SFAB_SATA_S_H_CLK>,

				 <&gcc SATA_H_CLK>,

arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ 
						regulator-max-microvolt = <2950000>;



						regulator-boot-on;

						regulator-system-load = <200000>;

						regulator-allow-set-load;

					};



					l21 {