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

Commit e40f3827 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: sa2150p: enable BLSP0 UART and free up GPIO 83"

parents c558cd65 d5d8a16f
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ SoCs:
- QCS6125
  compatible = "qcom,qcs6125"

- SA2145P
  compatible = "qcom,sa2145p"

- SA2150P
  compatible = "qcom,sa2150p"

Generic board variants:

- CDP device:
@@ -229,6 +235,7 @@ compatible = "qcom,sa6155p-adp-air"
compatible = "qcom,qcs405-rumi"
compatible = "qcom,qcs405-iot"
compatible = "qcom,sa2150p-ccard"
compatible = "qcom,sa2145p-ccard"
compatible = "qcom,qcs403-iot"
compatible = "qcom,qcs401-iot"
compatible = "qcom,qcs404-iot"
+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ dtb-$(CONFIG_ARCH_QCS405) += qcs405-iot-sku1.dtb \
		qcs405-iot-sku12.dtb \
		qcs407-iot-sku12.dtb \
		sa2150p-ccard-emmc.dtb \
		sa2145p-ccard-nand-dc.dtb \
		sa2150p-ccard-nand-dc.dtb \
		sa2150p-ccard-nand.dtb \
		qcs405-iot-sku13.dtb \
		qcs407-iot-sku13.dtb \
+38 −0
Original line number Diff line number Diff line
/* Copyright (c) 2020, 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 "sa2145p-ccard.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SA2145P CCARD NAND DC";
	compatible = "qcom,sa2145p-ccard", "qcom,qcs403", "qcom,sa2145p",
				"qcom,ccard";
	qcom,board-id = <25 2>, <25 0x102>;
};

&qnand_1 {
	status = "okay";
};

&sdhc_1 {
	status = "disabled";
};

&blsp1_uart1_hs {
	status = "ok";
};

&blsp1_uart4_hs {
	status = "disabled";
};
+296 −0
Original line number Diff line number Diff line
/* Copyright (c) 2020, 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.
 */

#include "qcs403.dtsi"

&tlmm {
	pinctrl-0 = <&status_gpio>;
	pinctrl-names = "default";
	status_gpio: status_gpio {
		ap2mdm_status {
			pins = "gpio80";
			function = "gpio";
			drive-strength = <8>;
			bias-pull-up;
			output-high;
		};
	};
};

&pcie0_perst_default {
	mux {
		pins = "gpio107";
		function = "gpio";
	};

	config {
		pins = "gpio107";
		drive-strength = <2>;
		bias-disable;
	};
};

&pcie0_wake_default {
	mux {
		pins = "gpio115";
		function = "gpio";
	};

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

&usb3_id_det_default {
	mux {
		pins = "gpio113";
		function = "gpio";
	};

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

&spi_1 {
	status = "disabled";
};

&i2c_3 {
	status = "disabled";
};

&smb1351_otg_supply {
	status = "disabled";
};

&cnss_sdio {
	status = "disabled";
};

&spi_2 {
	status = "okay";

	can-controller@0 {
		compatible = "qcom,nxp,mpc5746c";
		reg = <0>;
		interrupt-parent = <&tlmm>;
		interrupts = <34 0>;
		spi-max-frequency = <5000000>;
		qcom,clk-freq-mhz = <40000000>;
		qcom,max-can-channels = <2>;
		qcom,bits-per-word = <8>;
		qcom,support-can-fd;
	};
};

&spi_6 {
	status = "okay";

	spidev0: spidev@0 {
		compatible = "qcom,spi-msm-codec-slave";
		reg = <0>;
		spi-max-frequency = <50000000>;
	};
};

&i2c_5 {
	status = "okay";
	qcom,clk-freq-out = <100000>;
};

&soc {
	gpio_keys {
		status = "disabled";
	};

	vreg_emac_phy: emac_phy_regulator {
		compatible = "regulator-fixed";
		regulator-name = "emac_phy";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		regulator-enable-ramp-delay = <100>;
		gpio = <&tlmm 92 GPIO_ACTIVE_HIGH>;
		enable-active-high;
	};

	vreg_rgmii_io_pads: rgmii_io_pads_regulator {
		compatible = "regulator-fixed";
		regulator-name = "rgmii_io_pads";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-enable-ramp-delay = <100>;
		gpio = <&tlmm 15 GPIO_ACTIVE_HIGH>;
		enable-active-high;
	};

	usb2_extcon: usb2_extcon {
		compatible = "linux,extcon-usb-gpio";
		id-gpio = <&tlmm 53 GPIO_ACTIVE_HIGH>;
		vbus-gpio = <&tlmm 116 GPIO_ACTIVE_HIGH>;
		vbus-out-gpio = <&tlmm 108 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";
		pinctrl-0 = <&usb2_vbus_det_default
				&usb2_id_det_default
				&usb2_vbus_boost_default>;
	};

	pps {
		compatible = "pps-gpio";
		gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>;
		status = "okay";
	};

	qmi-tmd-devices {
		adsp {
			qcom,instance-id = <0x1>;

			adsp_vdd: adsp-vdd {
				qcom,qmi-dev-name = "cpuv_restriction_cold";
				#cooling-cells = <2>;
			};
		};
	};
};

&thermal_zones {
	aoss-lowf {
		cooling-maps {
			adsp_vdd_cdev {
				trip = <&aoss_lowf>;
				cooling-device = <&adsp_vdd 0 0>;
			};
		};
	};
};

&usb3 {
	qcom,ignore-wakeup-src-in-hostmode;
};

&usb3_extcon {
	id-gpio = <&tlmm 113 GPIO_ACTIVE_HIGH>;
};

&usb2s {
	extcon = <&usb2_extcon>;
};

&ethqos_hw {
	status = "okay";
	vreg_emac_phy-supply = <&vreg_emac_phy>;
	vreg_rgmii_io_pads-supply = <&vreg_rgmii_io_pads>;
	rxc-skew-ps = <0>;

	pinctrl-names = "dev-emac-mdc", "dev-emac-mdio",
		"dev-emac-rgmii_txd0_state", "dev-emac-rgmii_txd1_state",
		"dev-emac-rgmii_txd2_state", "dev-emac-rgmii_txd3_state",
		"dev-emac-rgmii_txc_state",  "dev-emac-rgmii_tx_ctl_state",
		"dev-emac-rgmii_rxd0_state", "dev-emac-rgmii_rxd1_state",
		"dev-emac-rgmii_rxd2_state", "dev-emac-rgmii_rxd3_state",
		"dev-emac-rgmii_rxc_state", "dev-emac-rgmii_rx_ctl_state",
		"dev-emac-phy_intr", "dev-emac-phy_reset_state";
	pinctrl-15 = <&emac_phy_reset_state>;
};

&emac_hw {
	status = "okay";
	vreg_emac_phy-supply = <&vreg_emac_phy>;
	vreg_rgmii_io_pads-supply = <&vreg_rgmii_io_pads>;
	qcom,phy-reset-delay-msecs = <10>;
	rxc-skew-ps = <0>;

	pinctrl-names = "dev-emac-mdc", "dev-emac-mdio",
		"dev-emac-rgmii_txd0_state", "dev-emac-rgmii_txd1_state",
		"dev-emac-rgmii_txd2_state", "dev-emac-rgmii_txd3_state",
		"dev-emac-rgmii_txc_state",  "dev-emac-rgmii_tx_ctl_state",
		"dev-emac-rgmii_rxd0_state", "dev-emac-rgmii_rxd1_state",
		"dev-emac-rgmii_rxd2_state", "dev-emac-rgmii_rxd3_state",
		"dev-emac-rgmii_rxc_state", "dev-emac-rgmii_rx_ctl_state",
		"dev-emac-phy_intr", "dev-emac-phy_reset_state";
	pinctrl-15 = <&emac_phy_reset_state>;
};

&pcie0 {
	pinctrl-0 = <&pcie0_perst_default
		     &pcie0_wake_default>;

	perst-gpio = <&tlmm 107 0>;
	wake-gpio = <&tlmm 115 0>;
};

&sdhc_2 {
	/delete-property/ qcom,nonhotplug;
	/delete-property/ qcom,nonremovable;

	vdd-io-supply = <&pms405_l11>;
	qcom,vdd-io-voltage-level = <2950000 2950000>;
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
		    &sdc2_cd_on>;
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
		    &sdc2_cd_off>;
	cd-gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;

	status = "ok";
};

&gpu_bw_tbl {
	status = "disabled";
};

&gpubw {
	status = "disabled";
};

&msm_gpu {
	status = "disabled";
};

&kgsl_msm_iommu {
	status = "disabled";
};

&rpm_bus {
	rpm-regulator-ldoa1 {
		status = "disabled";
		pms405_l1: regulator-l1 {
			status = "disabled";
		};
	};

	rpm-regulator-ldoa2 {
		status = "disabled";
		pms405_l2: regulator-l2 {
			status = "disabled";
		};
	};

	rpm-regulator-ldoa7 {
		status = "disabled";
		pms405_l7: regulator-l7 {
			status = "disabled";
		};
	};

	rpm-regulator-ldoa10 {
		status = "disabled";
		pms405_l10: regulator-l10 {
			status = "disabled";
		};
	};
};
+106 −0
Original line number Diff line number Diff line
/* Copyright (c) 2020, 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 DC";
	compatible = "qcom,sa2150p-ccard", "qcom,qcs405", "qcom,sa2150p",
				"qcom,ccard";
	qcom,board-id = <25 2>, <25 0x102>;

	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";
};

&blsp1_uart1_hs {
	status = "ok";
};

&blsp1_uart4_hs {
	status = "disabled";
};