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

Commit 3089b361 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdm: defconfig: Enable QPNP_MISC config"

parents 46892c36 32c4d781
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ Required properties:
- compatible : should be "qcom,qpnp-misc"
- reg : offset and length of the PMIC peripheral register map.

Optional properties:
- qcom,pwm-sel:			Select PWM source. Possible values:
				0: LOW
				1: PWM1_in
				2: PWM2_in
				3: PWM1_in & PWM2_in
- qcom,enable-gp-driver:	Enable the GP driver. Should only be specified
				if a non-zero PWM source is specified under
				"qcom,pwm-sel" property.

Example:
	qcom,spmi@fc4c0000 {
		#address-cells = <1>;
@@ -22,6 +32,8 @@ Example:
			qcom,misc@900 {
				compatible = "qcom,qpnp-misc";
				reg = <0x900 0x100>;
				qcom,pwm-sel = <2>;
				qcom,enable-gp-driver;
			};
		}
	};
+6 −1
Original line number Diff line number Diff line
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2016, 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
@@ -80,6 +80,11 @@
	};
};

&pmdcalifornium_misc {
	qcom,pwm-sel = <2>;		/* PWM2 */
	qcom,enable-gp-driver;		/* Enable GP */
};

&qnand_1 {
	status = "ok";
};
+6 −1
Original line number Diff line number Diff line
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2016, 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
@@ -29,6 +29,11 @@

		};

		pmdcalifornium_misc: qcom,misc@900 {
			compatible = "qcom,qpnp-misc";
			reg = <0x900 0x100>;
		};

		pmdcalifornium_gpios: gpios {
			spmi-dev-container;
			compatible = "qcom,qpnp-pin";
+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ CONFIG_MTD_MSM_QPIC_NAND=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_QPNP_MISC=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y
+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ CONFIG_MTD_MSM_QPIC_NAND=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_QPNP_MISC=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y
Loading