Commit 430640a6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'qcom-dts-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm ARM dts updates for v5.8

This adds SCM firmware node for IPQ806x and fixes the high resolution
timer for IPQ4019. Samsung Galaxy S5 gains regulators, eMMC and USB
support.

* tag 'qcom-dts-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: msm8974-klte: Add max77826 pmic node
  ARM: dts: qcom: msm8974-klte: Add USB node
  ARM: dts: qcom: msm8974-klte: Add sdhci1 node
  ARM: dts: qcom: msm8974-klte: Add gpio-keys nodes
  ARM: dts: qcom: msm8974-klte: Remove inherited vreg_boost node
  ARM: dts: qcom: msm8974-klte: Add pma8084 regulator nodes
  ARM: dts: qcom: ipq4019: fix high resolution timer
  ARM: dts: qcom: add scm definition to ipq806x

Link: https://lore.kernel.org/r/20200519052538.1250076-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1cb00f8c cd13c72c

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

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
			     <1 4 0xf08>,

			     <1 1 0xf08>;

		clock-frequency = <48000000>;

		always-on;

	};



	soc {

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

+6 −0
Original line number Diff line number Diff line
@@ -93,6 +93,12 @@ 
		};

	};



	firmware {

		scm {

			compatible = "qcom,scm-ipq806x", "qcom,scm";

		};

	};



	soc: soc {

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts

+403 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "qcom-msm8974pro.dtsi"

#include "qcom-pm8841.dtsi"

#include "qcom-pm8941.dtsi"

#include "qcom-pma8084.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>



/ {

	model = "Samsung Galaxy S5";
@@ -14,6 +16,194 @@ 
	chosen {

		stdout-path = "serial0:115200n8";

	};



	smd {

		rpm {

			rpm_requests {

				pma8084-regulators {

					compatible = "qcom,rpm-pma8084-regulators";

					status = "okay";



					pma8084_s1: s1 {

						regulator-min-microvolt = <675000>;

						regulator-max-microvolt = <1050000>;

					};



					pma8084_s2: s2 {

						regulator-min-microvolt = <500000>;

						regulator-max-microvolt = <1050000>;

					};



					pma8084_s3: s3 {

						regulator-min-microvolt = <1300000>;

						regulator-max-microvolt = <1300000>;

					};



					pma8084_s4: s4 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_s5: s5 {

						regulator-min-microvolt = <2150000>;

						regulator-max-microvolt = <2150000>;

					};



					pma8084_s6: s6 {

						regulator-min-microvolt = <1050000>;

						regulator-max-microvolt = <1050000>;

					};



					pma8084_l1: l1 {

						regulator-min-microvolt = <1225000>;

						regulator-max-microvolt = <1225000>;

					};



					pma8084_l2: l2 {

						regulator-min-microvolt = <1200000>;

						regulator-max-microvolt = <1200000>;

					};



					pma8084_l3: l3 {

						regulator-min-microvolt = <1050000>;

						regulator-max-microvolt = <1200000>;

					};



					pma8084_l4: l4 {

						regulator-min-microvolt = <1200000>;

						regulator-max-microvolt = <1225000>;

					};



					pma8084_l5: l5 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l6: l6 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l7: l7 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l8: l8 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l9: l9 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;

					};



					pma8084_l10: l10 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;

					};



					pma8084_l11: l11 {

						regulator-min-microvolt = <1300000>;

						regulator-max-microvolt = <1300000>;

					};



					pma8084_l12: l12 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l13: l13 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;

					};



					pma8084_l14: l14 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					pma8084_l15: l15 {

						regulator-min-microvolt = <2050000>;

						regulator-max-microvolt = <2050000>;

					};



					pma8084_l16: l16 {

						regulator-min-microvolt = <2700000>;

						regulator-max-microvolt = <2700000>;

					};



					pma8084_l17: l17 {

						regulator-min-microvolt = <2850000>;

						regulator-max-microvolt = <2850000>;

					};



					pma8084_l18: l18 {

						regulator-min-microvolt = <2850000>;

						regulator-max-microvolt = <2850000>;

					};



					pma8084_l19: l19 {

						regulator-min-microvolt = <2900000>;

						regulator-max-microvolt = <3300000>;

					};



					pma8084_l20: l20 {

						regulator-min-microvolt = <2950000>;

						regulator-max-microvolt = <2950000>;



						regulator-allow-set-load;

						regulator-system-load = <200000>;

					};



					pma8084_l21: l21 {

						regulator-min-microvolt = <2950000>;

						regulator-max-microvolt = <2950000>;

					};



					pma8084_l22: l22 {

						regulator-min-microvolt = <3000000>;

						regulator-max-microvolt = <3300000>;

					};



					pma8084_l23: l23 {

						regulator-min-microvolt = <3000000>;

						regulator-max-microvolt = <3000000>;

					};



					pma8084_l24: l24 {

						regulator-min-microvolt = <3075000>;

						regulator-max-microvolt = <3075000>;

					};



					pma8084_l25: l25 {

						regulator-min-microvolt = <2100000>;

						regulator-max-microvolt = <2100000>;

					};



					pma8084_l26: l26 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2050000>;

					};



					pma8084_l27: l27 {

						regulator-min-microvolt = <1000000>;

						regulator-max-microvolt = <1225000>;

					};



					pma8084_lvs1: lvs1 {};

					pma8084_lvs2: lvs2 {};

					pma8084_lvs3: lvs3 {};

					pma8084_lvs4: lvs4 {};



					pma8084_5vs1: 5vs1 {};

				};

			};

		};

	};



	/delete-node/ vreg-boost;

};



&soc {
@@ -21,4 +211,215 @@ 
		status = "ok";

	};



	gpio-keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_pin_a>;



		volume-down {

			label = "volume_down";

			gpios = <&pma8084_gpios 2 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEDOWN>;

			debounce-interval = <15>;

		};



		home-key {

			label = "home_key";

			gpios = <&pma8084_gpios 3 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOMEPAGE>;

			wakeup-source;

			debounce-interval = <15>;

		};



		volume-up {

			label = "volume_up";

			gpios = <&pma8084_gpios 5 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <15>;

		};

	};



	pinctrl@fd510000 {

		sdhc1_pin_a: sdhc1-pin-active {

			clk {

				pins = "sdc1_clk";

				drive-strength = <4>;

				bias-disable;

			};



			cmd-data {

				pins = "sdc1_cmd", "sdc1_data";

				drive-strength = <4>;

				bias-pull-up;

			};

		};

	};



	sdhci@f9824900 {

		status = "ok";



		vmmc-supply = <&pma8084_l20>;

		vqmmc-supply = <&pma8084_s4>;



		bus-width = <8>;

		non-removable;



		pinctrl-names = "default";

		pinctrl-0 = <&sdhc1_pin_a>;

	};



	usb@f9a55000 {

		status = "ok";



		phys = <&usb_hs1_phy>;

		phy-select = <&tcsr 0xb000 0>;

		/*extcon = <&smbb>, <&usb_id>;*/

		/*vbus-supply = <&chg_otg>;*/



		hnp-disable;

		srp-disable;

		adp-disable;



		ulpi {

			phy@a {

				status = "ok";



				v1p8-supply = <&pma8084_l6>;

				v3p3-supply = <&pma8084_l24>;



				/*extcon = <&smbb>;*/

				qcom,init-seq = /bits/ 8 <0x1 0x64>;

			};

		};

	};



	pinctrl@fd510000 {

		i2c6_pins: i2c6 {

			mux {

				pins = "gpio29", "gpio30";

				function = "blsp_i2c6";



				drive-strength = <2>;

				bias-disable;

			};

		};

	};



	i2c@f9928000 {

		status = "okay";



		pinctrl-names = "default";

		pinctrl-0 = <&i2c6_pins>;



		pmic@60 {

			reg = <0x60>;

			compatible = "maxim,max77826";



			regulators {

				max77826_ldo1: LDO1 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				max77826_ldo2: LDO2 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

				};



				max77826_ldo3: LDO3 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				max77826_ldo4: LDO4 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				max77826_ldo5: LDO5 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				max77826_ldo6: LDO6 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

				};



				max77826_ldo7: LDO7 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				max77826_ldo8: LDO8 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

				};



				max77826_ldo9: LDO9 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				max77826_ldo10: LDO10 {

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2950000>;

				};



				max77826_ldo11: LDO11 {

					regulator-min-microvolt = <2700000>;

					regulator-max-microvolt = <2950000>;

				};



				max77826_ldo12: LDO12 {

					regulator-min-microvolt = <2500000>;

					regulator-max-microvolt = <3300000>;

				};



				max77826_ldo13: LDO13 {

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				max77826_ldo14: LDO14 {

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				max77826_ldo15: LDO15 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				max77826_buck: BUCK {

					regulator-min-microvolt = <1225000>;

					regulator-max-microvolt = <1225000>;

				};



				max77826_buckboost: BUCKBOOST {

					regulator-min-microvolt = <3400000>;

					regulator-max-microvolt = <3400000>;

				};

			};

		};

	};

};



&spmi_bus {

	pma8084@0 {

		gpios@c000 {

			gpio_keys_pin_a: gpio-keys-active {

				pins = "gpio2", "gpio3", "gpio5";

				function = "normal";



				bias-pull-up;

				power-source = <PMA8084_GPIO_S4>;

			};

		};

	};

};

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

+11 −0
Original line number Diff line number Diff line
@@ -974,6 +974,17 @@ 
			#size-cells = <0>;

		};



		blsp_i2c6: i2c@f9928000 {

			status = "disabled";

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

			reg = <0xf9928000 0x1000>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;

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

			#address-cells = <1>;

			#size-cells = <0>;

		};



		blsp_i2c8: i2c@f9964000 {

			status = "disabled";

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