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

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

Merge "soc: qcom: Remove all legacy SoCs information" into msm-next

parents 6935406b cf4758d9
Loading
Loading
Loading
Loading
+0 −190
Original line number Diff line number Diff line
@@ -26,105 +26,24 @@ SoCs:
- APQ8016
  compatible = "qcom,apq8016"

- APQ8026
  compatible = "qcom,apq8026"

- APQ8074
  compatible = "qcom,apq8074"

- APQ8084
  compatible = "qcom,apq8084"

- APQ8094
  compatible = "qcom,apq8094"

- APQ8096
  compatible = "qcom,apq8096"

- APQ8937
  compatible = "qcom,apq8037"

- APQ8017
  compatible = "qcom,apq8017"

- APQ8053
  compatible = "qcom,apq8053"

- MDM9630
  compatible = "qcom,mdm9630"

- MSM8226
  compatible = "qcom,msm8226"

- MSM8610
  compatible = "qcom,msm8610"

- MSM8909
  compatible = "qcom,msm8909"

- MSM8916
  compatible = "qcom,msm8916"

- MSM8917
  compatible = "qcom,msm8917"

- MSM8936
  compatible = "qcom,msm8936"

- MSM8960
  compatible = "qcom,msm8960"

- MSM8992
  compatible = "qcom,msm8992"

- MSM8994
  compatible = "qcom,msm8994"

- MSM8996
  compatible = "qcom,msm8996"

- MSMCOBALT
  compatible = "qcom,msmcobalt"

- SDM845
  compatible = "qcom,sdm845"

- SDM855
  compatible = "qcom,sdm855"

- SDM830
  compatible = "qcom,sdm830"

- MSM8952
  compatible = "qcom,msm8952"

- APQ8052
  compatible = "qcom,apq8052"

- MSM8953
  compatible = "qcom,msm8953"

- MSM8937
  compatible = "qcom,msm8937"

- MDM9640
  compatible = "qcom,mdm9640"

- MDMCALIFORNIUM
  compatible = "qcom,mdmcalifornium"

- SDXPOORWILLS
  compatible = "qcom,sdxpoorwills"

- VPIPA
  compatible = "qcom,msmvpipa"

- MDM9607
  compatible = "qcom,mdm9607"

- MSM8909
  compatible = "qcom,apq8009"

Generic board variants:

- CDP device:
@@ -165,51 +84,16 @@ Generic board variants:
Boards (SoC type + board variant):

compatible = "qcom,apq8016"
compatible = "qcom,apq8026-cdp"
compatible = "qcom,apq8026-mtp"
compatible = "qcom,apq8026-xpm"
compatible = "qcom,apq8074-cdp"
compatible = "qcom,apq8074-dragonboard"
compatible = "qcom,apq8074-liquid"
compatible = "qcom,apq8084-cdp"
compatible = "qcom,apq8084-liquid"
compatible = "qcom,apq8084-mtp"
compatible = "qcom,apq8084-sbc"
compatible = "qcom,apq8094-cdp"
compatible = "qcom,apq8094-fluid"
compatible = "qcom,apq8094-liquid"
compatible = "qcom,apq8094-mtp"
compatible = "qcom,apq8094-dragonboard"
compatible = "qcom,apq8096-cdp"
compatible = "qcom,apq8096-mtp"
compatible = "qcom,apq8096-dragonboard"
compatible = "qcom,apq8096-sbc"
compatible = "qcom,apq8096-liquid"
compatible = "qcom,apq8037-cdp"
compatible = "qcom,apq8037-mtp"
compatible = "qcom,apq8017-cdp"
compatible = "qcom,apq8017-mtp"
compatible = "qcom,apq8053-cdp"
compatible = "qcom,apq8053-mtp"
compatible = "qcom,mdm9630-cdp"
compatible = "qcom,mdm9630-mtp"
compatible = "qcom,mdm9630-sim"
compatible = "qcom,msm8226-cdp"
compatible = "qcom,msm8226-fluid"
compatible = "qcom,msm8226-mtp"
compatible = "qcom,msm8226-qrd"
compatible = "qcom,msm8226-sim"
compatible = "qcom,msm8610-cdp"
compatible = "qcom,msm8610-mtp"
compatible = "qcom,msm8610-qrd"
compatible = "qcom,msm8610-rumi"
compatible = "qcom,msm8610-sim"
compatible = "qcom,msm8660-surf"
compatible = "qcom,msm8909-cdp"
compatible = "qcom,msm8909-mtp"
compatible = "qcom,msm8909-qrd"
compatible = "qcom,msm8909-rumi"
compatible = "qcom,msm8909-sim"
compatible = "qcom,msm8916-cdp"
compatible = "qcom,msm8916-mtp"
compatible = "qcom,msm8916-qrd-skuh"
@@ -220,22 +104,6 @@ compatible = "qcom,msm8916-qrd-skuid"
compatible = "qcom,msm8916-qrd-skut1"
compatible = "qcom,msm8916-rumi"
compatible = "qcom,msm8916-sim"
compatible = "qcom,msm8917-cdp"
compatible = "qcom,msm8917-mtp"
compatible = "qcom,msm8917-rumi"
compatible = "qcom,msm8917-qrd"
compatible = "qcom,msm8917-qrd-sku5"
compatible = "qcom,msm8926-cdp"
compatible = "qcom,msm8926-mtp"
compatible = "qcom,msm8926-qrd"
compatible = "qcom,msm8936-cdp"
compatible = "qcom,msm8936-mtp"
compatible = "qcom,msm8939-cdp"
compatible = "qcom,msm8939-mtp"
compatible = "qcom,msm8939-qrd-skuk"
compatible = "qcom,msm8939-qrd-skul"
compatible = "qcom,msm8939-rumi"
compatible = "qcom,msm8939-sim"
compatible = "qcom,msm8960-cdp"
compatible = "qcom,msm8974-cdp"
compatible = "qcom,msm8974-fluid"
@@ -243,16 +111,6 @@ compatible = "qcom,msm8974-liquid"
compatible = "qcom,msm8974-mtp"
compatible = "qcom,msm8974-rumi"
compatible = "qcom,msm8974-sim"
compatible = "qcom,msm8992-cdp"
compatible = "qcom,msm8992-mtp"
compatible = "qcom,msm8992-rumi"
compatible = "qcom,msm8992-sim"
compatible = "qcom,msm8994-cdp"
compatible = "qcom,msm8994-fluid"
compatible = "qcom,msm8994-liquid"
compatible = "qcom,msm8994-mtp"
compatible = "qcom,msm8994-rumi"
compatible = "qcom,msm8994-sim"
compatible = "qcom,msm8996-rumi"
compatible = "qcom,msm8996-sim"
compatible = "qcom,msm8996-cdp"
@@ -261,54 +119,6 @@ compatible = "qcom,msm8996-fluid"
compatible = "qcom,msm8996-liquid"
compatible = "qcom,msm8996-mtp"
compatible = "qcom,msm8996-adp"
compatible = "qcom,msmcobalt-sim"
compatible = "qcom,msmcobalt-rumi"
compatible = "qcom,msmcobalt-cdp"
compatible = "qcom,sdm845-sim"
compatible = "qcom,sdm845-rumi"
compatible = "qcom,sdm845-cdp"
compatible = "qcom,sdm845-mtp"
compatible = "qcom,sdm845-mtp"
compatible = "qcom,sdm845-qrd"
compatible = "qcom,sdm830-sim"
compatible = "qcom,sdm830-rumi"
compatible = "qcom,sdm830-cdp"
compatible = "qcom,sdm830-mtp"
compatible = "qcom,msm8952-rumi"
compatible = "qcom,msm8952-sim"
compatible = "qcom,msm8952-qrd"
compatible = "qcom,msm8952-qrd-skum"
compatible = "qcom,msm8952-cdp"
compatible = "qcom,msm8952-mtp"
compatible = "qcom,apq8052-cdp"
compatible = "qcom,apq8052-mtp"
compatible = "qcom,msm8937-rumi"
compatible = "qcom,msm8937-cdp"
compatible = "qcom,msm8937-mtp"
compatible = "qcom,msm8937-qrd"
compatible = "qcom,msm8937-pmi8950-qrd-sku1"
compatible = "qcom,msm8937-pmi8937-qrd-sku2"
compatible = "qcom,msm8953-rumi"
compatible = "qcom,msm8953-sim"
compatible = "qcom,msm8953-cdp"
compatible = "qcom,msm8953-mtp"
compatible = "qcom,msm8953-qrd"
compatible = "qcom,msm8953-qrd-sku3"
compatible = "qcom,mdm9640-cdp"
compatible = "qcom,mdm9640-mtp"
compatible = "qcom,mdm9640-rumi"
compatible = "qcom,mdm9640-sim"
compatible = "qcom,msmvpipa-sim"
compatible = "qcom,mdm9607-rumi"
compatible = "qcom,mdm9607-cdp"
compatible = "qcom,mdm9607-mtp"
compatible = "qcom,mdmcalifornium-rumi"
compatible = "qcom,mdmcalifornium-sim"
compatible = "qcom,mdmcalifornium-cdp"
compatible = "qcom,mdmcalifornium-mtp"
compatible = "qcom,apq8009-cdp"
compatible = "qcom,apq8009-mtp"
compatible = "qcom,sdxpoorwills-rumi"
compatible = "qcom,sdm855-rumi"
compatible = "qcom,sdm855-mtp"
compatible = "qcom,sdm855-cdp"
+0 −99
Original line number Diff line number Diff line
@@ -48,54 +48,15 @@
#define of_board_is_sbc()	of_machine_is_compatible("qcom,sbc")

#define machine_is_msm8974()	of_machine_is_compatible("qcom,msm8974")
#define machine_is_msm9625()	of_machine_is_compatible("qcom,msm9625")
#define machine_is_msm8610()	of_machine_is_compatible("qcom,msm8610")
#define machine_is_msm8226()	of_machine_is_compatible("qcom,msm8226")
#define machine_is_apq8074()	of_machine_is_compatible("qcom,apq8074")
#define machine_is_msm8926()	of_machine_is_compatible("qcom,msm8926")

#define early_machine_is_msm8610()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8610")
#define early_machine_is_msm8909()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8909")
#define early_machine_is_msm8916()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8916")
#define early_machine_is_msm8936()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8936")
#define early_machine_is_msm8939()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8939")
#define early_machine_is_apq8084()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8084")
#define early_machine_is_mdm9630()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9630")
#define early_machine_is_msmzirc()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmzirc")
#define early_machine_is_fsm9900()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")
#define early_machine_is_msm8994()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8994")
#define early_machine_is_msm8992()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8992")
#define early_machine_is_fsm9010()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9010")
#define early_machine_is_msm8976()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8976")
#define early_machine_is_msmtellurium()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium")
#define early_machine_is_msm8996()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")
#define early_machine_is_msm8996_auto()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")
#define early_machine_is_msm8929()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
#define early_machine_is_msmcobalt()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt")
#define early_machine_is_apqcobalt()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apqcobalt")
#define early_machine_is_msmhamster()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster")
#define early_machine_is_msmfalcon()	\
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmfalcon")
#else
#define of_board_is_sim()		0
#define of_board_is_rumi()		0
@@ -110,29 +71,10 @@
#define of_board_is_sbc()		0

#define machine_is_msm8974()		0
#define machine_is_msm9625()		0
#define machine_is_msm8610()		0
#define machine_is_msm8226()		0
#define machine_is_apq8074()		0
#define machine_is_msm8926()		0

#define early_machine_is_msm8610()	0
#define early_machine_is_msm8909()	0
#define early_machine_is_msm8916()	0
#define early_machine_is_msm8936()	0
#define early_machine_is_msm8939()	0
#define early_machine_is_apq8084()	0
#define early_machine_is_mdm9630()	0
#define early_machine_is_fsm9900()	0
#define early_machine_is_fsm9010()	0
#define early_machine_is_msmtellurium()	0
#define early_machine_is_msm8996()	0
#define early_machine_is_msm8976() 0
#define early_machine_is_msm8929()	0
#define early_machine_is_msmcobalt()	0
#define early_machine_is_apqcobalt()	0
#define early_machine_is_msmhamster()	0
#define early_machine_is_msmfalcon()	0
#endif

#define PLATFORM_SUBTYPE_MDM	1
@@ -141,57 +83,16 @@

enum msm_cpu {
	MSM_CPU_UNKNOWN = 0,
	MSM_CPU_7X01,
	MSM_CPU_7X25,
	MSM_CPU_7X27,
	MSM_CPU_8X50,
	MSM_CPU_8X50A,
	MSM_CPU_7X30,
	MSM_CPU_8X55,
	MSM_CPU_8X60,
	MSM_CPU_8960,
	MSM_CPU_8960AB,
	MSM_CPU_7X27A,
	FSM_CPU_9XXX,
	MSM_CPU_7X25A,
	MSM_CPU_7X25AA,
	MSM_CPU_7X25AB,
	MSM_CPU_8064,
	MSM_CPU_8064AB,
	MSM_CPU_8064AA,
	MSM_CPU_8930,
	MSM_CPU_8930AA,
	MSM_CPU_8930AB,
	MSM_CPU_7X27AA,
	MSM_CPU_9615,
	MSM_CPU_8974,
	MSM_CPU_8974PRO_AA,
	MSM_CPU_8974PRO_AB,
	MSM_CPU_8974PRO_AC,
	MSM_CPU_8627,
	MSM_CPU_8625,
	MSM_CPU_9625,
	MSM_CPU_8909,
	MSM_CPU_8916,
	MSM_CPU_8936,
	MSM_CPU_8939,
	MSM_CPU_8226,
	MSM_CPU_8610,
	MSM_CPU_8625Q,
	MSM_CPU_8084,
	MSM_CPU_9630,
	FSM_CPU_9900,
	MSM_CPU_ZIRC,
	MSM_CPU_8994,
	MSM_CPU_8992,
	FSM_CPU_9010,
	MSM_CPU_TELLURIUM,
	MSM_CPU_8996,
	MSM_CPU_8976,
	MSM_CPU_8929,
	MSM_CPU_COBALT,
	MSM_CPU_HAMSTER,
	MSM_CPU_FALCON,
};

struct msm_soc_info {