Merge "ARM: dts: msm: Add stub regulators for pmd-californium" (eb310418) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ SoCs:
		- MSMZIRC
		compatible = "qcom,msmzirc"

		- MDMCALIFORNIUM
		compatible = "qcom,mdmcalifornium"

		- VPIPA
		compatible = "qcom,msmvpipa"

		@@ -222,3 +225,5 @@ compatible = "qcom,msmzirc-rumi"
		compatible = "qcom,msmzirc-sim"
		compatible = "qcom,msmvpipa-sim"
		compatible = "qcom,mdmfermium-rumi"
		compatible = "qcom,mdmcalifornium-rumi"
		compatible = "qcom,mdmcalifornium-sim"

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ Required properties:
		- compatible: "qcom,msm8996-pinctrl"
		"qcom,mdm9640-pinctrl"
		"qcom,mdmfermium-pinctrl"
		"qcom,mdmcalifornium-pinctrl"
		- reg: Should be the base address and length of the TLMM block.
		- interrupts: Should be the parent IRQ of the TLMM block.
		- interrupt-controller: Marks the device node as an interrupt controller.

arch/arm/boot/dts/qcom/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ dtb-$(CONFIG_ARCH_MDM9640) += mdm9640-sim.dtb \
		mdm9640-emmc-cdp.dtb \
		mdm9640-nand-cdp.dtb \
		mdm9640-mtp.dtb
		dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \
		mdmcalifornium-rumi.dtb

		dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \
		msmtitanium-rumi.dtb

arch/arm/boot/dts/qcom/mdmcalifornium-pinctrl.dtsi

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		&soc {
		tlmm_pinmux: pinctrl@1000000 {
		compatible = "qcom,mdmcalifornium-pinctrl";
		reg = <0x1000000 0x300000>;
		interrupts = <0 208 0>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		#interrupt-cells = <2>;

		uart2_console_active: uart2_console_active {
		mux {
		pins = "gpio4", "gpio5";
		function = "blsp_uart2";
		};
		config {
		pins = "gpio4", "gpio5";
		drive-strength = <2>;
		bias-disable;
		};
		};

		uart3_console_active: uart3_console_active {
		mux {
		pins = "gpio8", "gpio9";
		function = "blsp_uart3";
		};
		config {
		pins = "gpio8", "gpio9";
		drive-strength = <2>;
		bias-disable;
		};
		};

		};
		};

arch/arm/boot/dts/qcom/mdmcalifornium-regulator.dtsi

0 → 100644

+169 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

		/* Stub regulators */

		/ {
		/* PMDCALIFORNIUM S1 = VDD_MSS supply */
		pmdcalifornium_s1: regulator-s1 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s1";
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <800000>;
		};

		pmdcalifornium_s2: regulator-s2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s2";
		regulator-min-microvolt = <1256000>;
		regulator-max-microvolt = <1256000>;
		};

		pmdcalifornium_s3: regulator-s3 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s3";
		regulator-min-microvolt = <1024000>;
		regulator-max-microvolt = <1024000>;
		};

		pmdcalifornium_s4: regulator-s4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s4";
		regulator-min-microvolt = <1856000>;
		regulator-max-microvolt = <1856000>;
		};

		/* PMDCALIFORNIUM S5 = VDD_CX supply */
		pmdcalifornium_s5_level: regulator-s5-level {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s5_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};

		pmdcalifornium_s5_level_ao: regulator-s5-level-ao {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s5_level_ao";
		qcom,set = <1>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};

		pmdcalifornium_s5_floor_level: regulator-s5-floor-level {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s5_floor_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-floor-level;
		};

		pmdcalifornium_l1: regulator-l1 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l1";
		regulator-min-microvolt = <1224000>;
		regulator-max-microvolt = <1224000>;
		};

		pmdcalifornium_l2: regulator-l2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l2";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		};

		pmdcalifornium_l3: regulator-l3 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l3";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <1000000>;
		};

		pmdcalifornium_l4: regulator-l4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l4";
		regulator-min-microvolt = <928000>;
		regulator-max-microvolt = <928000>;
		};

		pmdcalifornium_l5: regulator-l5 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l5";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		pmdcalifornium_l6: regulator-l6 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l6";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		pmdcalifornium_l7: regulator-l7 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l7";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2848000>;
		};

		pmdcalifornium_l8: regulator-l8 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l8";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <1000000>;
		};

		/* PMDCALIFORNIUM L9 = VDD_MX supply */
		pmdcalifornium_l9_level: regulator-l9-level {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l9_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};

		pmdcalifornium_l10: regulator-l10 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l10";
		regulator-min-microvolt = <3088000>;
		regulator-max-microvolt = <3088000>;
		};

		pmdcalifornium_l11: regulator-l11 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l11";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		pmdcalifornium_l12: regulator-l12 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l12";
		regulator-min-microvolt = <2704000>;
		regulator-max-microvolt = <2704000>;
		};

		pmdcalifornium_l13: regulator-l13 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l13";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2848000>;
		};
		};