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

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

Merge "mdm9630: rename msmkrypton to mdm9630"

parents 2f8fb2e9 f0358e8b

Documentation/devicetree/bindings/arm/msm/acpuclock/clock-a7.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ a configurable divider. This hw is different than normal rcgs in that it may 
optionally have a register which encodes the maximum rate supported by hw.

optionally have a register which encodes the maximum rate supported by hw.





Required properties:

Required properties:

- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-krypton"

- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-9630"

- reg: pairs of physical address and region size

- reg: pairs of physical address and region size

- reg-names: "rcg-base" is expected

- reg-names: "rcg-base" is expected

- clock-names: list of names of clock inputs

- clock-names: list of names of clock inputs

Documentation/devicetree/bindings/thermal/tsens.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ Required properties: 
	       should be "qcom,msm8x10-tsens" for 8x10 TSENS driver.

	       should be "qcom,msm8x10-tsens" for 8x10 TSENS driver.

	       should be "qcom,msm8x26-tsens" for 8x26 TSENS driver.

	       should be "qcom,msm8x26-tsens" for 8x26 TSENS driver.

	       should be "qcom,fsm9900-tsens" for 9900 TSENS driver.

	       should be "qcom,fsm9900-tsens" for 9900 TSENS driver.

	       should be "qcom,msmkrypton-tsens" for krypton TSENS driver.

	       should be "qcom,mdm9630-tsens" for 9630 TSENS driver.

	       The compatible property is used to identify the respective fusemap to use

	       The compatible property is used to identify the respective fusemap to use

	       for the corresponding SoC.

	       for the corresponding SoC.

- reg : offset and length of the TSENS registers.

- reg : offset and length of the TSENS registers.

arch/arm/boot/dts/qcom/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -71,9 +71,9 @@ dtb-$(CONFIG_ARCH_FSM9900) += fsm9900-rumi.dtb \ 
	fsm9900-sim.dtb \

	fsm9900-sim.dtb \

	fsm9900-cdp.dtb \

	fsm9900-cdp.dtb \

	fsm9900-mtp.dtb

	fsm9900-mtp.dtb

dtb-$(CONFIG_ARCH_MSMKRYPTON) += msmkrypton-sim.dtb \

dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \

	msmkrypton-cdp.dtb \

	mdm9630-cdp.dtb \

	msmkrypton-mtp.dtb

	mdm9630-mtp.dtb

dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \

dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \

	msmsamarium-rumi.dtb \

	msmsamarium-rumi.dtb \

	msmsamarium-cdp-interposer.dtb \

	msmsamarium-cdp-interposer.dtb \

arch/arm/boot/dts/qcom/msmkrypton-cdp.dts→arch/arm/boot/dts/qcom/mdm9630-cdp.dts

+5 −5
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@ 




/dts-v1/;

/dts-v1/;





#include "msmkrypton.dtsi"

#include "mdm9630.dtsi"

#include "msmkrypton-cdp.dtsi"

#include "mdm9630-cdp.dtsi"





/ {

/ {

	model = "Qualcomm MSM KRYPTON CDP";

	model = "Qualcomm MDM 9630 CDP";

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

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

	qcom,board-id = <1 0>;

	qcom,board-id = <1 0>;

};
 
};