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

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

Merge "msm: board-gold: Add support for apqgold variants"

parents a59e2df0 b55f6237

arch/arm/boot/dts/qcom/apqgold-pmi8950-cdp.dts

+2 −2
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
@@ -20,5 +20,5 @@ 
	model = "Qualcomm Technologies, Inc. APQGOLD-PMI8950 CDP";

	compatible = "qcom,apqgold-cdp", "qcom,apqgold", "qcom,cdp";

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};

arch/arm/mach-msm/board-gold.c

+2 −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
@@ -17,6 +17,7 @@ 


static const char *msmgold_dt_match[] __initconst = {

	"qcom,msmgold",

	"qcom,apqgold",

	NULL

};