Merge "ARM: dts: msm: Add support for SA2150P CCARD boards" (e8aec3d3) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ compatible = "qcom,sa6155-adp-air"
		compatible = "qcom,sa6155p-adp-air"
		compatible = "qcom,qcs405-rumi"
		compatible = "qcom,qcs405-iot"
		compatible = "qcom,sa2150p-ccard"
		compatible = "qcom,qcs403-iot"
		compatible = "qcom,qcs401-iot"
		compatible = "qcom,qcs404-iot"

arch/arm64/boot/dts/qcom/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,9 @@ dtb-$(CONFIG_ARCH_QCS405) += qcs405-iot-sku1.dtb \
		qcs407-iot-sku6.dtb \
		qcs407-iot-sku9.dtb \
		qcs405-iot-sku12.dtb \
		qcs407-iot-sku12.dtb
		qcs407-iot-sku12.dtb \
		sa2150p-ccard-emmc.dtb \
		sa2150p-ccard-nand.dtb

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		dtbo-$(CONFIG_ARCH_SM8150) += \

arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi

+69 −1

Original line number	Diff line number	Diff line
		@@ -1525,7 +1525,7 @@
		};
		};

		usb3_id_det_default: usb2_id_det_default {
		usb3_id_det_default: usb3_id_det_default {
		config {
		pins = "gpio116";
		drive-strength = <2>;
		@@ -1534,6 +1534,48 @@
		};
		};

		usb2_id_det_default: usb2_id_det_default {
		mux {
		pins = "gpio53";
		function = "gpio";
		};

		config {
		pins = "gpio53";
		drive-strength = <2>;
		bias-pull-up;
		input-enable;
		};
		};

		usb2_vbus_boost_default: usb2_vbus_boost_default {
		mux {
		pins = "gpio108";
		function = "gpio";
		};

		config {
		pins = "gpio108";
		drive-strength = <2>;
		bias-pull-down;
		output-low;
		};
		};

		usb2_vbus_det_default: usb2_vbus_det_default {
		mux {
		pins = "gpio116";
		function = "gpio";
		};

		config {
		pins = "gpio116";
		drive-strength = <2>;
		bias-pull-down;
		input-enable;
		};
		};

		usb2_ssrd_det_default: usb2_ssrd_det_default {
		config {
		pins = "gpio27";
		@@ -2700,6 +2742,32 @@
		drive-strength = <2>;
		};
		};

		emac_phy_reset_state: emac_phy_reset_state {
		mux {
		pins = "gpio60";
		function = "gpio";
		};

		config {
		pins = "gpio60";
		bias-pull-up;
		drive-strength = <16>;
		};
		};

		vreg_emac_phy_reg: vreg_emac_phy_reg {
		mux {
		pins = "gpio92";
		function = "gpio";
		};

		config {
		pins = "gpio92";
		bias-pull-up;
		drive-strength = <12>;
		};
		};
		};

		evb_tlmm_gpio_key{

arch/arm64/boot/dts/qcom/sa2150p-ccard-emmc.dts

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, 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/;

		#include "sa2150p-ccard.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SA2150P CCARD EMMC";
		compatible = "qcom,sa2150p-ccard", "qcom,qcs405", "qcom,sa2150p",
		"qcom,ccard";
		qcom,board-id = <25 0>, <25 0x100>;
		};

arch/arm64/boot/dts/qcom/sa2150p-ccard-nand.dts

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, 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/;

		#include "sa2150p-ccard.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SA2150P CCARD NAND";
		compatible = "qcom,sa2150p-ccard", "qcom,qcs405", "qcom,sa2150p",
		"qcom,ccard";
		qcom,board-id = <25 1>, <25 0x101>;

		qcom,msm-id = <373 0x0>;

		cpus {
		/delete-node/ cpu@102;
		/delete-node/ cpu@103;

		cpu-map {
		cluster0 {
		/delete-node/ core2;
		/delete-node/ core3;
		};
		};
		};
		};

		&soc {
		cpuss_dump {
		/delete-node/ qcom,l1_i_cache102;
		/delete-node/ qcom,l1_i_cache103;
		/delete-node/ qcom,l1_d_cache102;
		/delete-node/ qcom,l1_d_cache103;
		};

		qcom,spm@b012000 {
		qcom,cpu-vctl-list = <&CPU0 &CPU1>;
		};

		qcom,lpm-levels {
		qcom,pm-cluster@0{
		qcom,pm-cpu {
		qcom,cpu = <&CPU0 &CPU1>;
		};
		};
		};

		/delete-node/ cti@61ba000;
		/delete-node/ cti@61bb000;
		/delete-node/ etm@61be000;
		/delete-node/ etm@61bf000;

		funnel@61a1000 {
		ports {
		/delete-node/ port@3;
		/delete-node/ port@4;
		};
		};

		/delete-node/ qcom,cpu0-computemon;

		cpu0_computemon: qcom,cpu0-computemon {
		compatible = "qcom,arm-cpu-mon";
		qcom,cpulist = <&CPU0 &CPU1>;
		qcom,target-dev = <&cpu0_cpu_ddr_latfloor>;
		qcom,core-dev-table =
		< 1094400 MHZ_TO_MBPS( 297, 8) >,
		< 1248000 MHZ_TO_MBPS( 597, 8) >,
		< 1401600 MHZ_TO_MBPS( 710, 8) >;
		};
		};

		&thermal_zones {
		cpuss-max-step {
		cooling-maps {
		/delete-node/ cpu2_cdev;
		/delete-node/ cpu3_cdev;
		};
		};

		/delete-node/ cpuss-2-step;
		/delete-node/ cpuss-3-step;
		};

		&qnand_1 {
		status = "okay";
		};

		&sdhc_1 {
		status = "disabled";
		};