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

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

Merge "defconfig: sa415m: Enable the AT24 EEPROM for SA415M"

parents 623f4c07 5747bd9b

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

+2 −2
Original line number Diff line number Diff line
@@ -410,6 +410,6 @@ compatible = "qcom,sdxpoorwills-rumi" 
compatible = "qcom,sdxpoorwills-atp"

compatible = "qcom,sdxpoorwills-mtp"

compatible = "qcom,sdxpoorwills-cdp"

compatible = "qcom,sdxpoorwills-ttp"

compatible = "qcom,sdxpoorwills-ccard"

compatible = "qcom,sa415m-ttp"

compatible = "qcom,sa415m-ccard"

compatible = "qcom,mdm9607-ttp"

arch/arm/boot/dts/qcom/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sdxpoorwills-cdp.dtb \

	sdxpoorwills-mtp.dtb \

	sdxpoorwills-atp.dtb \

	sdxpoorwills-v2-ttp.dtb \

	sa415m-ttp.dtb \

	sdxpoorwills-cdp-256.dtb \

	sdxpoorwills-mtp-256.dtb \

	sdxpoorwills-dualwifi-cdp.dtb \
@@ -16,9 +16,10 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sdxpoorwills-v2-cdp.dtb \

	sdxpoorwills-v2-dualwifi-mtp.dtb \

	sdxpoorwills-v2-dualwifi-cdp.dtb \

	sdxpoorwills-ccard.dtb \

	sdxpoorwills-ccard-pcie-ep.dtb \

	sdxpoorwills-ccard-usb-ep.dtb \

	sa415m-ccard.dtb \

	sa415m-ccard-pcie-ep.dtb \

	sa415m-ccard-usb-ep.dtb \

	sa415m-ttp-usb-ep.dtb \

	sdxpoorwills-v2-pcie-ep-mtp-256.dtb \

	sdxpoorwills-v2-pcie-ep-mtp.dtb

arch/arm/boot/dts/qcom/pmxpoorwills.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -60,16 +60,18 @@ 
					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc4 0 IRQ_TYPE_NONE>,

					<0x0 0xc5 0 IRQ_TYPE_NONE>;

					<0x0 0xc5 0 IRQ_TYPE_NONE>,

					<0x0 0xc8 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmxpoorwills_gpio1",

					  "pmxpoorwills_gpio2",

					  "pmxpoorwills_gpio3",

					  "pmxpoorwills_gpio4",

					  "pmxpoorwills_gpio5",

					  "pmxpoorwills_gpio6";

					  "pmxpoorwills_gpio6",

					  "pmxpoorwills_gpio9";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <7 8 9>;

			qcom,gpios-disallowed = <7 8>;

		};



		pmxpoorwills_rtc: qcom,pmxpoorwills_rtc {

arch/arm/boot/dts/qcom/sdxpoorwills-ccard-pcie-ep.dts→arch/arm/boot/dts/qcom/sa415m-ccard-pcie-ep.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


/dts-v1/;



#include "sdxpoorwills-ccard.dtsi"

#include "sa415m-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA415M CCARD PCIE-EP";

	compatible = "qcom,sdxpoorwills-ccard",

	compatible = "qcom,sa415m-ccard",

		"qcom,sdxpoorwills", "qcom,ccard";

	qcom,board-id = <25 1>, <25 0x101>;

};

arch/arm/boot/dts/qcom/sdxpoorwills-ccard-usb-ep.dts→arch/arm/boot/dts/qcom/sa415m-ccard-usb-ep.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


/dts-v1/;



#include "sdxpoorwills-ccard.dtsi"

#include "sa415m-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA415M CCARD USB-EP";

	compatible = "qcom,sdxpoorwills-ccard",

	compatible = "qcom,sa415m-ccard",

		"qcom,sdxpoorwills", "qcom,ccard";

	qcom,board-id = <25 2>, <25 0x102>;

};