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

Commit 682cb193 authored by LuK1337's avatar LuK1337
Browse files

Merge branch 'oneplus/SM8150_Q_10.0' of... 

Merge branch 'oneplus/SM8150_Q_10.0' of https://github.com/OnePlusOSS/android_kernel_oneplus_sm8150 into HEAD
parents 49606807 6b749189

arch/arm64/boot/dts/qcom/Makefile

+11 −1
Original line number Diff line number Diff line
@@ -108,7 +108,12 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		hotdog-overlay-t0.dtbo \

		hotdog-overlay-evt.dtbo \

		hotdog-overlay-dvt.dtbo \

		hotdog-overlay-pvt.dtbo

		hotdog-overlay-pvt.dtbo \

		hotdogg-sdx55m-overlay-t0.dtbo \

		hotdogg-sdx55m-overlay-evt1.dtbo \

		hotdogg-sdx55m-overlay-evt2.dtbo \

		hotdogg-sdx55m-overlay-dvt.dtbo \

		hotdogg-sdx55m-overlay-pvt.dtbo



sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdxprairie-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
@@ -137,6 +142,11 @@ hotdog-overlay-t0.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.d 
hotdog-overlay-evt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdog-overlay-dvt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdog-overlay-pvt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogg-sdx55m-overlay-t0.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogg-sdx55m-overlay-evt1.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogg-sdx55m-overlay-evt2.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogg-sdx55m-overlay-dvt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogg-sdx55m-overlay-pvt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogb-overlay-t0.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogb-overlay-evt.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

hotdogb-overlay-evt-second.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

arch/arm64/boot/dts/qcom/hotdog-overlay-dvt.dts

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, 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.

 */



/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-mtp.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"

#include "sm8150-oem-camera-hotdog-t0.dtsi"



#include "sm8150-oem.dtsi"

#include "hotdog.dtsi"

#include "hotdog_sm8150.dtsi"

#include "hotdog_dvt.dtsi"



/ {

	model = "MTP 19081 DVT 13";

	compatible = "qcom,sm8150-mtp", "qcom,sm8150", "qcom,mtp";

	qcom,board-id = <8 0 >;

	/*we can add project id to this array,uefi can auto read it,if new project,we add to this array */

	oem,project-id = <19801>;

	/*we can add hw id to this array,uefi can auto read it,if new hw,we add to this array  */

	oem,hw-id = <13>;

};

arch/arm64/boot/dts/qcom/hotdog-overlay-evt.dts

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, 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.

 */



/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-mtp.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"

#include "sm8150-oem-camera-hotdog-t0.dtsi"



#include "sm8150-oem.dtsi"

#include "hotdog.dtsi"

#include "hotdog_sm8150.dtsi"

#include "hotdog_evt1.dtsi"

#include "hotdog_evt2.dtsi"

/ {

	model = "MTP 19801 EVT 12";

	compatible = "qcom,sm8150-mtp", "qcom,sm8150", "qcom,mtp";

	qcom,board-id = <8 0>;

	/*we can add project id to this array,uefi can auto read it,if new project,we add to this array */

	oem,project-id = <19801>;

	/*we can add hw id to this array,uefi can auto read it,if new hw,we add to this array  */

	oem,hw-id = <12>;

};

arch/arm64/boot/dts/qcom/hotdog-overlay-pvt.dts

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, 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.

 */



/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-mtp.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"

#include "sm8150-oem-camera-hotdog-t0.dtsi"



#include "sm8150-oem.dtsi"

#include "hotdog.dtsi"

#include "hotdog_sm8150.dtsi"

#include "hotdog_pvt.dtsi"



/ {

	model = "MTP 19801 MP 14 15";

	compatible = "qcom,sm8150-mtp", "qcom,sm8150", "qcom,mtp";

	qcom,board-id = <8 0>;

	/*we can add project id to this array,uefi can auto read it,if new project,we add to this array */

	oem,project-id = <19801>;

	/*we can add hw id to this array,uefi can auto read it,if new hw,we add to this array  */

	oem,hw-id = <14 15>;

};

arch/arm64/boot/dts/qcom/hotdog-overlay-t0.dts

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, 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.

 */



/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-mtp.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"

#include "sm8150-oem-camera-hotdog-t0.dtsi"



#include "sm8150-oem.dtsi"

#include "hotdog.dtsi"

#include "hotdog_sm8150.dtsi"

#include "hotdog_t0.dtsi"



/ {

	model = "MTP 19801 T0 11";

	compatible = "qcom,sm8150-mtp", "qcom,sm8150", "qcom,mtp";

	qcom,board-id = <8 0>;

	/*we can add project id to this array,uefi can auto read it,if new project,we add to this array */

	oem,project-id = <19801>;

	/*we can add hw id to this array,uefi can auto read it,if new hw,we add to this array  */

	oem,hw-id = <11>;

};