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

Commit 81d24f54 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable PPS for sdxprairie-auto platforms"

parents 6160b1df a0484921

arch/arm/configs/vendor/sdxprairie-auto-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ CONFIG_MTD_UBI=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -245,6 +246,8 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_SLIMBUS=y

CONFIG_PPS=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y

arch/arm/configs/vendor/sdxprairie-auto_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ CONFIG_MTD_UBI=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -245,6 +246,8 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_SLIMBUS=y

CONFIG_PPS=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ 
		AVDD-supply = <&codec_vreg>;

		IOVDD-supply = <&codec_vreg>;

	};



	eeprom@52 {

		compatible = "atmel,24c128";

		reg = <0x52>;

		pagesize = <32>;

	};

};



&i2c_4 {

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ 
		qcom,arm-smmu;

		reg = <0x20000 0x10000>,

		   <0x36000 0x100>,

		   <0x3900000 0x300000>;

		   <0xf100000 0x300000>;

		reg-names = "emac-base", "rgmii-base", "tlmm-central-base";

		interrupts-extended = <&pdc 0 62 4>, <&pdc 0 60 4>,

		  <&tlmm 90 2>, <&pdc 0 49 4>,