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

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

Merge "ARM: dts: msm: Add SMSC HUB device for msm8926 V2 MTP"

parents 1057c230 bb7da7e7

arch/arm/boot/dts/qcom/msm8226-v2-1080p-cdp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -21,6 +21,6 @@ 
	qcom,board-id = <1 2>;

};



&hsic_host {

&smsc_hub {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8226-v2-720p-cdp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -21,6 +21,6 @@ 
	qcom,board-id = <1 0>;

};



&hsic_host {

&smsc_hub {

	status = "ok";

};

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

+35 −27
Original line number Diff line number Diff line
@@ -347,8 +347,15 @@ 
		qcom,streaming-func = "rndis";

	};



	hsic_host: hsic@f9a00000 {

	smsc_hub: hsic_hub {

		status = "disabled";

		compatible = "qcom,hsic-smsc-hub";

		smsc,model-id = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		hsic_host: hsic@f9a00000 {

			compatible = "qcom,hsic-host";

			reg = <0xf9a00000 0x400>;

			#address-cells = <0>;
@@ -378,6 +385,7 @@ 
				<85 512 0 0>,

				<85 512 40000 160000>;

		};

	};



	wcd9xxx_intc: wcd9xxx-irq {

		compatible = "qcom,wcd9xxx-irq";

arch/arm/boot/dts/qcom/msm8926-v1-1080p-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ 


};



&hsic_host {

&smsc_hub {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8926-v1-720p-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ 


};



&hsic_host {

&smsc_hub {

	status = "ok";

};