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

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

Merge changes Ica538316,Ia7def37b into msm-next 

* changes:
  ARM: dts: msm: Add dummy GDSC support for SDM855
  ARM: dts: msm: Add dummy clock support for SDM855
parents 92f0f844 6cb86873

arch/arm64/boot/dts/qcom/sdm855-gdsc.dtsi

0 → 100644
+247 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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.

 */



&soc {

	/* GDSCs in Global CC */

	emac_gdsc: qcom,gdsc@0x106004 {

		compatible = "regulator-fixed";

		regulator-name = "emac_gdsc";

		reg = <0x106004 0x4>;

		status = "disabled";

	};



	pcie_0_gdsc: qcom,gdsc@0x16b004 {

		compatible = "regulator-fixed";

		regulator-name = "pcie_0_gdsc";

		reg = <0x16b004 0x4>;

		status = "disabled";

	};



	pcie_1_gdsc: qcom,gdsc@0x18d004 {

		compatible = "regulator-fixed";

		regulator-name = "pcie_1_gdsc";

		reg = <0x18d004 0x4>;

		status = "disabled";

	};



	ufs_card_gdsc: qcom,gdsc@0x175004 {

		compatible = "regulator-fixed";

		regulator-name = "ufs_card_gdsc";

		reg = <0x175004 0x4>;

		status = "disabled";

	};



	ufs_phy_gdsc: qcom,gdsc@0x177004 {

		compatible = "regulator-fixed";

		regulator-name = "ufs_phy_gdsc";

		reg = <0x177004 0x4>;

		status = "disabled";

	};



	usb30_prim_gdsc: qcom,gdsc@0x10f004 {

		compatible = "regulator-fixed";

		regulator-name = "usb30_prim_gdsc";

		reg = <0x10f004 0x4>;

		status = "disabled";

	};



	usb30_sec_gdsc: qcom,gdsc@0x110004 {

		compatible = "regulator-fixed";

		regulator-name = "usb30_sec_gdsc";

		reg = <0x110004 0x4>;

		status = "disabled";

	};



	hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc: qcom,gdsc@0x17d030 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc";

		reg = <0x17d030 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_aggre_noc_mmu_tbu1_gdsc: qcom,gdsc@0x17d034 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_aggre_noc_mmu_tbu1_gdsc";

		reg = <0x17d034 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_aggre_noc_mmu_tbu2_gdsc: qcom,gdsc@0x17d038 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_aggre_noc_mmu_tbu2_gdsc";

		reg = <0x17d038 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc: qcom,gdsc@0x17d03c {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc";

		reg = <0x17d03c 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc: qcom,gdsc@0x17d040 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc";

		reg = <0x17d040 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_mmnoc_mmu_tbu_sf_gdsc: qcom,gdsc@0x17d044 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_mmnoc_mmu_tbu_sf_gdsc";

		reg = <0x17d044 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc: qcom,gdsc@0x17d048 {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc";

		reg = <0x17d048 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	hlos1_vote_turing_mmu_tbu_gdsc: qcom,gdsc@0x17d04c {

		compatible = "regulator-fixed";

		regulator-name = "hlos1_vote_turing_mmu_tbu_gdsc";

		reg = <0x17d04c 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	/* GDSCs in Camera CC */

	bps_gdsc: qcom,gdsc@0xad07004 {

		compatible = "regulator-fixed";

		regulator-name = "bps_gdsc";

		reg = <0xad07004 0x4>;

		status = "disabled";

	};



	ipe_0_gdsc: qcom,gdsc@0xad08004 {

		compatible = "regulator-fixed";

		regulator-name = "ipe_0_gdsc";

		reg = <0xad08004 0x4>;

		status = "disabled";

	};



	ipe_1_gdsc: qcom,gdsc@0xad09004 {

		compatible = "regulator-fixed";

		regulator-name = "ipe_1_gdsc";

		reg = <0xad09004 0x4>;

		status = "disabled";

	};



	ife_0_gdsc: qcom,gdsc@0xad0a004 {

		compatible = "regulator-fixed";

		regulator-name = "ife_0_gdsc";

		reg = <0xad0a004 0x4>;

		status = "disabled";

	};



	ife_1_gdsc: qcom,gdsc@0xad0b004 {

		compatible = "regulator-fixed";

		regulator-name = "ife_1_gdsc";

		reg = <0xad0b004 0x4>;

		status = "disabled";

	};



	titan_top_gdsc: qcom,gdsc@0xad0c1bc {

		compatible = "regulator-fixed";

		regulator-name = "titan_top_gdsc";

		reg = <0xad0c1bc 0x4>;

		status = "disabled";

	};



	/* GDSCs in Display CC */

	mdss_core_gdsc: qcom,gdsc@0xaf03000 {

		compatible = "regulator-fixed";

		regulator-name = "mdss_core_gdsc";

		reg = <0xaf03000 0x4>;

		qcom,support-hw-trigger;

		status = "disabled";

	};



	/* GDSCs in Graphics CC */

	gpu_cx_hw_ctrl: syscon@0x2c91540 {

		compatible = "syscon";

		reg = <0x2c91540 0x4>;

	};



	gpu_cx_gdsc: qcom,gdsc@0x2c9106c {

		compatible = "regulator-fixed";

		regulator-name = "gpu_cx_gdsc";

		reg = <0x2c9106c 0x4>;

		hw-ctrl-addr = <&gpu_cx_hw_ctrl>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};



	gpu_gx_domain_addr: syscon@0x2c91508 {

		compatible = "syscon";

		reg = <0x2c91508 0x4>;

	};



	gpu_gx_sw_reset: syscon@0x2c91008 {

		compatible = "syscon";

		reg = <0x2c91008 0x4>;

	};



	gpu_gx_gdsc: qcom,gdsc@0x2c9100c {

		compatible = "regulator-fixed";

		regulator-name = "gpu_gx_gdsc";

		reg = <0x2c9100c 0x4>;

		domain-addr = <&gpu_gx_domain_addr>;

		sw-reset = <&gpu_gx_sw_reset>;

		qcom,reset-aon-logic;

		qcom,toggle-sw-collapse-in-disable;

		status = "disabled";

	};



	/* GDSCs in Video CC */

	mvsc_gdsc: qcom,gdsc@0xab00814 {

		compatible = "regulator-fixed";

		regulator-name = "mvsc_gdsc";

		reg = <0xab00814 0x4>;

		status = "disabled";

	};



	mvs0_gdsc: qcom,gdsc@0xab00874 {

		compatible = "regulator-fixed";

		regulator-name = "mvs0_gdsc";

		reg = <0xab00874 0x4>;

		status = "disabled";

	};



	mvs1_gdsc: qcom,gdsc@0xab008b4 {

		compatible = "regulator-fixed";

		regulator-name = "mvs1_gdsc";

		reg = <0xab008b4 0x4>;

		status = "disabled";

	};

};

arch/arm64/boot/dts/qcom/sdm855.dtsi

+174 −0
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ 
 */



#include "skeleton64.dtsi"

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

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

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

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

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

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

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

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



/ {

	model = "Qualcomm Technologies, Inc. SDM855";
@@ -198,6 +206,8 @@ 
	soc: soc { };

};



#include "sdm855-gdsc.dtsi"



&soc {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -282,5 +292,169 @@ 
			status = "disabled";

		};

	};



	clock_rpmh: qcom,rpmhclk {

		compatible = "qcom,dummycc";

		clock-output-names = "rpm_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_aop: qcom,aopclk {

		compatible = "qcom,dummycc";

		clock-output-names = "aop_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_gcc: qcom,gcc {

		compatible = "qcom,dummycc";

		clock-output-names = "gcc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_videocc: qcom,videocc {

		compatible = "qcom,dummycc";

		clock-output-names = "videocc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_camcc: qcom,camcc {

		compatible = "qcom,dummycc";

		clock-output-names = "camcc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_dispcc: qcom,dispcc {

		compatible = "qcom,dummycc";

		clock-output-names = "dispcc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_gpucc: qcom,dispcc {

		compatible = "qcom,dummycc";

		clock-output-names = "gpucc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_cpucc: qcom,cpucc {

		compatible = "qcom,dummycc";

		clock-output-names = "cpucc_clocks";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

};



&emac_gdsc {

	status = "ok";

};



&pcie_0_gdsc {

	status = "ok";

};



&pcie_1_gdsc {

	status = "ok";

};



&ufs_card_gdsc {

	status = "ok";

};



&ufs_phy_gdsc {

	status = "ok";

};



&usb30_prim_gdsc {

	status = "ok";

};



&usb30_sec_gdsc {

	status = "ok";

};



&hlos1_vote_aggre_noc_mmu_audio_tbu_gdsc {

	status = "ok";

};



&hlos1_vote_aggre_noc_mmu_tbu1_gdsc {

	status = "ok";

};



&hlos1_vote_aggre_noc_mmu_tbu2_gdsc {

	status = "ok";

};



&hlos1_vote_aggre_noc_mmu_pcie_tbu_gdsc {

	status = "ok";

};



&hlos1_vote_mmnoc_mmu_tbu_hf0_gdsc {

	status = "ok";

};



&hlos1_vote_mmnoc_mmu_tbu_sf_gdsc {

	status = "ok";

};



&hlos1_vote_mmnoc_mmu_tbu_hf1_gdsc {

	status = "ok";

};



&hlos1_vote_turing_mmu_tbu_gdsc {

	status = "ok";

};



&bps_gdsc {

	status = "ok";

};



&ipe_0_gdsc {

	status = "ok";

};



&ipe_1_gdsc {

	status = "ok";

};



&ife_0_gdsc {

	status = "ok";

};



&ife_1_gdsc {

	status = "ok";

};



&titan_top_gdsc {

	status = "ok";

};



&mdss_core_gdsc {

	status = "ok";

};



&gpu_cx_gdsc {

	status = "ok";

};



&gpu_gx_gdsc {

	status = "ok";

};



&mvsc_gdsc {

	status = "ok";

};



&mvs0_gdsc {

	status = "ok";

};



&mvs1_gdsc {

	status = "ok";

};

#include "sdm855-pinctrl.dtsi"

include/dt-bindings/clock/qcom,aop-qmp.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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.

 */



#ifndef _DT_BINDINGS_CLK_QCOM_AOP_QMP_H

#define _DT_BINDINGS_CLK_QCOM_AOP_QMP_H



#define QDSS_CLK_LEVEL_OFF		0

#define QDSS_CLK_LEVEL_DYNAMIC		1

#define QDSS_CLK_LEVEL_TURBO		2

#define QDSS_CLK_LEVEL_NOMINAL		3

#define QDSS_CLK_LEVEL_SVS_L1		4

#define QDSS_CLK_LEVEL_SVS		5

#define QDSS_CLK_LEVEL_LOW_SVS		6

#define QDSS_CLK_LEVEL_MIN_SVS		7



/* clocks id */

#define QDSS_CLK			0



#endif

include/dt-bindings/clock/qcom,camcc-sdm855.h

0 → 100644
+138 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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.

 */



#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SDM855_H

#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SDM855_H



#define CAM_CC_BPS_AHB_CLK					0

#define CAM_CC_BPS_AREG_CLK					1

#define CAM_CC_BPS_AXI_CLK					2

#define CAM_CC_BPS_CLK						3

#define CAM_CC_BPS_CLK_SRC					4

#define CAM_CC_CAMNOC_AXI_CLK					5

#define CAM_CC_CAMNOC_AXI_CLK_SRC				6

#define CAM_CC_CAMNOC_DCD_XO_CLK				7

#define CAM_CC_CCI_0_CLK					8

#define CAM_CC_CCI_0_CLK_SRC					9

#define CAM_CC_CCI_1_CLK					10

#define CAM_CC_CCI_1_CLK_SRC					11

#define CAM_CC_CORE_AHB_CLK					12

#define CAM_CC_CPAS_AHB_CLK					13

#define CAM_CC_CPHY_RX_CLK_SRC					14

#define CAM_CC_CSI0PHYTIMER_CLK					15

#define CAM_CC_CSI0PHYTIMER_CLK_SRC				16

#define CAM_CC_CSI1PHYTIMER_CLK					17

#define CAM_CC_CSI1PHYTIMER_CLK_SRC				18

#define CAM_CC_CSI2PHYTIMER_CLK					19

#define CAM_CC_CSI2PHYTIMER_CLK_SRC				20

#define CAM_CC_CSI3PHYTIMER_CLK					21

#define CAM_CC_CSI3PHYTIMER_CLK_SRC				22

#define CAM_CC_CSIPHY0_CLK					23

#define CAM_CC_CSIPHY1_CLK					24

#define CAM_CC_CSIPHY2_CLK					25

#define CAM_CC_CSIPHY3_CLK					26

#define CAM_CC_FAST_AHB_CLK_SRC					27

#define CAM_CC_FD_CORE_CLK					28

#define CAM_CC_FD_CORE_CLK_SRC					29

#define CAM_CC_FD_CORE_UAR_CLK					30

#define CAM_CC_GDSC_CLK						31

#define CAM_CC_ICP_AHB_CLK					32

#define CAM_CC_ICP_CLK						33

#define CAM_CC_ICP_CLK_SRC					34

#define CAM_CC_IFE_0_AXI_CLK					35

#define CAM_CC_IFE_0_CLK					36

#define CAM_CC_IFE_0_CLK_SRC					37

#define CAM_CC_IFE_0_CPHY_RX_CLK				38

#define CAM_CC_IFE_0_CSID_CLK					39

#define CAM_CC_IFE_0_CSID_CLK_SRC				40

#define CAM_CC_IFE_0_DSP_CLK					41

#define CAM_CC_IFE_1_AXI_CLK					42

#define CAM_CC_IFE_1_CLK					43

#define CAM_CC_IFE_1_CLK_SRC					44

#define CAM_CC_IFE_1_CPHY_RX_CLK				45

#define CAM_CC_IFE_1_CSID_CLK					46

#define CAM_CC_IFE_1_CSID_CLK_SRC				47

#define CAM_CC_IFE_1_DSP_CLK					48

#define CAM_CC_IFE_LITE_0_CLK					49

#define CAM_CC_IFE_LITE_0_CLK_SRC				50

#define CAM_CC_IFE_LITE_0_CPHY_RX_CLK				51

#define CAM_CC_IFE_LITE_0_CSID_CLK				52

#define CAM_CC_IFE_LITE_0_CSID_CLK_SRC				53

#define CAM_CC_IFE_LITE_1_CLK					54

#define CAM_CC_IFE_LITE_1_CLK_SRC				55

#define CAM_CC_IFE_LITE_1_CPHY_RX_CLK				56

#define CAM_CC_IFE_LITE_1_CSID_CLK				57

#define CAM_CC_IFE_LITE_1_CSID_CLK_SRC				58

#define CAM_CC_IPE_0_AHB_CLK					59

#define CAM_CC_IPE_0_AREG_CLK					60

#define CAM_CC_IPE_0_AXI_CLK					61

#define CAM_CC_IPE_0_CLK					62

#define CAM_CC_IPE_0_CLK_SRC					63

#define CAM_CC_IPE_1_AHB_CLK					64

#define CAM_CC_IPE_1_AREG_CLK					65

#define CAM_CC_IPE_1_AXI_CLK					66

#define CAM_CC_IPE_1_CLK					67

#define CAM_CC_JPEG_CLK						68

#define CAM_CC_JPEG_CLK_SRC					69

#define CAM_CC_LRME_CLK						70

#define CAM_CC_LRME_CLK_SRC					71

#define CAM_CC_MCLK0_CLK					72

#define CAM_CC_MCLK0_CLK_SRC					73

#define CAM_CC_MCLK1_CLK					74

#define CAM_CC_MCLK1_CLK_SRC					75

#define CAM_CC_MCLK2_CLK					76

#define CAM_CC_MCLK2_CLK_SRC					77

#define CAM_CC_MCLK3_CLK					78

#define CAM_CC_MCLK3_CLK_SRC					79

#define CAM_CC_PLL0						80

#define CAM_CC_PLL0_OUT_EVEN					81

#define CAM_CC_PLL0_OUT_ODD					82

#define CAM_CC_PLL1						83

#define CAM_CC_PLL1_OUT_EVEN					84

#define CAM_CC_PLL2						85

#define CAM_CC_PLL2_OUT_MAIN					86

#define CAM_CC_PLL3						87

#define CAM_CC_PLL3_OUT_EVEN					88

#define CAM_CC_PLL4						89

#define CAM_CC_PLL4_OUT_EVEN					90

#define CAM_CC_PLL_TEST_CLK					91

#define CAM_CC_QDSS_DEBUG_CLK					92

#define CAM_CC_QDSS_DEBUG_CLK_SRC				93

#define CAM_CC_QDSS_DEBUG_XO_CLK				94

#define CAM_CC_SLOW_AHB_CLK_SRC					95



#define CAM_CC_BPS_BCR						0

#define CAM_CC_CAMNOC_BCR					1

#define CAM_CC_CCI_BCR						2

#define CAM_CC_CPAS_BCR						3

#define CAM_CC_CSI0PHY_BCR					4

#define CAM_CC_CSI1PHY_BCR					5

#define CAM_CC_CSI2PHY_BCR					6

#define CAM_CC_CSI3PHY_BCR					7

#define CAM_CC_FD_BCR						8

#define CAM_CC_ICP_BCR						9

#define CAM_CC_IFE_0_BCR					10

#define CAM_CC_IFE_1_BCR					11

#define CAM_CC_IFE_LITE_0_BCR					12

#define CAM_CC_IFE_LITE_1_BCR					13

#define CAM_CC_IPE_0_BCR					14

#define CAM_CC_IPE_1_BCR					15

#define CAM_CC_JPEG_BCR						16

#define CAM_CC_LRME_BCR						17

#define CAM_CC_MCLK0_BCR					18

#define CAM_CC_MCLK1_BCR					19

#define CAM_CC_MCLK2_BCR					20

#define CAM_CC_MCLK3_BCR					21

#define CAM_CC_QDSS_DEBUG_BCR					22



#endif

include/dt-bindings/clock/qcom,cpucc-sdm855.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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.

 */



#ifndef _DT_BINDINGS_CLK_QCOM_CPU_CC_SDM855_H

#define _DT_BINDINGS_CLK_QCOM_CPU_CC_SDM855_H



#define L3_CLUSTER0_VOTE_CLK					0

#define L3_CLUSTER1_VOTE_CLK					1

#define L3_CLK							2

#define CPU0_PWRCL_CLK						3

#define CPU1_PWRCL_CLK						4

#define CPU2_PWRCL_CLK						5

#define CPU3_PWRCL_CLK						6

#define PWRCL_CLK						7

#define CPU4_PERFCL_CLK						8

#define CPU5_PERFCL_CLK						9

#define CPU6_PERFCL_CLK						10

#define CPU7_PERFCL_CLK						11

#define PERFCL_CLK						12



#endif