Skip to content
This repository has been archived by the owner on Jul 7, 2021. It is now read-only.

Commit

Permalink
Merge commit '624eff1ba9d0ad7c72ece78b9dad9b0de6ac7e03' into HEAD
Browse files Browse the repository at this point in the history
Change-Id: I377ec6c57b2bb4669aeb43bfa60ff4ea23e3e095
Signed-off-by: Shreyas Narayan <shrena@codeaurora.org>
  • Loading branch information
Shreyas Narayan committed Jul 28, 2020
2 parents 3b9b678 + 624eff1 commit ebbf4da
Show file tree
Hide file tree
Showing 139 changed files with 3,373 additions and 453 deletions.
3 changes: 3 additions & 0 deletions Documentation/cpu-freq/cpufreq-stats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ Freq_i to Freq_j. Freq_i is in descending order with increasing rows and
Freq_j is in descending order with increasing columns. The output here also
contains the actual freq values for each row and column for better readability.

If the transition table is bigger than PAGE_SIZE, reading this will
return an -EFBIG error.

--------------------------------------------------------------------------------
<mysystem>:/sys/devices/system/cpu/cpu0/cpufreq/stats # cat trans_table
From : To
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/arm/coresight.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ its hardware characteristcs.
* arm,sg-enable : indicates whether scatter gather feature is enabled
by default for TMC ETR configuration.

* qcom,qdss-ipa-support : indicates whether qdss to ipa bam connection
need to support.

* Required property for TPDAs:

* qcom,tpda-atid: must be present. Specifies the ATID for TPDA.
Expand Down
10 changes: 10 additions & 0 deletions Documentation/devicetree/bindings/arm/msm/msm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ SoCs:
- QCS410
compatible = "qcom,qcs410"

- QCM6125
compatible = "qcom,qcm6125"

- QCS6125
compatible = "qcom,qcs6125"

Generic board variants:

- CDP device:
Expand Down Expand Up @@ -243,3 +249,7 @@ compatible = "qcom,atoll-ab-atp"
compatible = "qcom,atoll-ab-qrd"
compatible = "qcom,qcs610-iot"
compatible = "qcom,qcs410-iot"
compatible = "qcom,qcm6125"
compatible = "qcom,qcs6125"
compatible = "qcom,qcm6125-idp"
compatible = "qcom,qcs6125-idp"
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/gpu/adreno.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ Bus Scaling Data:
qcom,msm-bus,vectors-KBps
to be used by ocmem msm bus scaling client.

- qcom,cpu-to-ahb-path: Container for another set of bus scaling properties
qcom,msm-bus,name
qcom,msm-bus,num-cases
qcom,msm-bus,num-paths
qcom,msm-bus,vectors-KBps
to be used for keeping all clocks ON in CPU to GPU AHB config path.

GDSC Oxili Regulators:
- regulator-names: List of regulator name strings sorted in power-on order
- vddcx-supply: Phandle for vddcx regulator device node.
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pci/msm_pcie.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ Optional Properties:
property.
- clock-output-names: name of the outgoing clock signal from the PHY PLL.
- qcom,keep-powerdown-phy: If present, power down phy in probe to avoid leakage.
- errata: Selects the list of erratas to configure for the
corresponding switch port. This could be a third party switch connected to
the root port.

=================
Root Complex node
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/vendor/sdxprairie-perf_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ CONFIG_ARCH_SDXPRAIRIE=y
# CONFIG_VDSO is not set
CONFIG_PCI_MSM=y
CONFIG_PCI_MSM_MSI=y
CONFIG_PCI_SW_QCOM_SWITCH=y
CONFIG_PREEMPT=y
CONFIG_HIGHMEM=y
CONFIG_ARM_MODULE_PLTS=y
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/vendor/sdxprairie_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ CONFIG_ARCH_SDXPRAIRIE=y
# CONFIG_VDSO is not set
CONFIG_PCI_MSM=y
CONFIG_PCI_MSM_MSI=y
CONFIG_PCI_SW_QCOM_SWITCH=y
CONFIG_PREEMPT=y
CONFIG_HIGHMEM=y
CONFIG_ARM_MODULE_PLTS=y
Expand Down
34 changes: 32 additions & 2 deletions arch/arm64/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,17 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
trinket-external-codec-idp-overlay.dtbo \
trinket-usbc-external-codec-idp-overlay.dtbo \
trinket-usbc-idp-overlay.dtbo \
trinket-dp-idp-overlay.dtbo
trinket-dp-idp-overlay.dtbo \
qcm6125-iot-idp-overlay.dtbo \
qcs6125-iot-idp-overlay.dtbo \
qcm6125-iot-external-codec-idp-overlay.dtbo \
qcs6125-iot-external-codec-idp-overlay.dtbo \
qcm6125-iot-usbc-external-codec-idp-overlay.dtbo \
qcs6125-iot-usbc-external-codec-idp-overlay.dtbo \
qcm6125-iot-usbc-idp-overlay.dtbo \
qcs6125-iot-usbc-idp-overlay.dtbo \
qcm6125-iot-dp-idp-overlay.dtbo \
qcs6125-iot-dp-idp-overlay.dtbo

trinket-rumi-overlay.dtbo-base := trinket.dtb
trinket-idp-overlay.dtbo-base := trinket.dtb
Expand All @@ -245,14 +255,34 @@ trinket-external-codec-idp-overlay.dtbo-base := trinket.dtb
trinket-usbc-external-codec-idp-overlay.dtbo-base := trinket.dtb
trinket-usbc-idp-overlay.dtbo-base := trinket.dtb
trinket-dp-idp-overlay.dtbo-base := trinket.dtb
qcm6125-iot-idp-overlay.dtbo-base := qcm6125.dtb
qcs6125-iot-idp-overlay.dtbo-base := qcs6125.dtb
qcm6125-iot-external-codec-idp-overlay.dtbo-base := qcm6125.dtb
qcs6125-iot-external-codec-idp-overlay.dtbo-base := qcs6125.dtb
qcm6125-iot-usbc-external-codec-idp-overlay.dtbo-base := qcm6125.dtb
qcs6125-iot-usbc-external-codec-idp-overlay.dtbo-base := qcs6125.dtb
qcm6125-iot-usbc-idp-overlay.dtbo-base := qcm6125.dtb
qcs6125-iot-usbc-idp-overlay.dtbo-base := qcs6125.dtb
qcm6125-iot-dp-idp-overlay.dtbo-base := qcm6125.dtb
qcs6125-iot-dp-idp-overlay.dtbo-base := qcs6125.dtb
else
dtb-$(CONFIG_ARCH_TRINKET) += trinket-rumi.dtb \
trinket-idp.dtb \
trinket-qrd.dtb \
trinket-external-codec-idp.dtb \
trinket-usbc-external-codec-idp.dtb \
trinket-usbc-idp.dtb \
trinket-dp-idp.dtb
trinket-dp-idp.dtb \
qcm6125-iot-idp.dtb \
qcs6125-iot-idp.dtb \
qcm6125-iot-external-codec-idp.dtb \
qcs6125-iot-external-codec-idp.dtb \
qcm6125-iot-usbc-external-codec-idp.dtb \
qcs6125-iot-usbc-external-codec-idp.dtb \
qcm6125-iot-usbc-idp.dtb \
qcs6125-iot-usbc-idp.dtb \
qcm6125-iot-dp-idp.dtb \
qcs6125-iot-dp-idp.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
Expand Down
51 changes: 51 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-dp-idp-overlay.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/* 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/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-trinket.h>
#include "qcm6125-iot-idp.dtsi"
#include "trinket-audio-overlay.dtsi"

/ {
model = "Display Port Enable IDP";
compatible = "qcom,qcm6125-idp", "qcom,qcm6125", "qcom,idp";
qcom,msm-id = <467 0x10000>;
qcom,board-id = <34 4>;
};

&dsi_td4330_truly_cmd_display {
qcom,dsi-display-active;
};

&sde_dp {
status = "ok";
qcom,dp-hpd-gpio = <&tlmm 100 0>;
qcom,dp-low-power-hw-hpd;
};

&mdss_dp_pll {
status = "ok";
};

&usb0 {
dwc3@4e00000 {
usb-phy = <&qusb_phy0>, <&usb_nop_phy>;
maximum-speed = "high-speed";
};
};

&mdss_mdp {
connectors = <&sde_wb &sde_dsi &sde_dp>;
};
44 changes: 44 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-dp-idp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* 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 "qcm6125.dtsi"
#include "qcm6125-iot-idp.dtsi"

/ {
model = "Qualcomm Technologies, Inc. QCM6125 IOT Disp. Port Enable IDP";
compatible = "qcom,qcm6125-idp", "qcom,qcm6125", "qcom,idp";
qcom,board-id = <34 4>;
};

&sde_dp {
status = "ok";
qcom,dp-hpd-gpio = <&tlmm 100 0>;
qcom,dp-low-power-hw-hpd;
};

&mdss_dp_pll {
status = "ok";
};

&usb0 {
dwc3@4e00000 {
usb-phy = <&qusb_phy0>, <&usb_nop_phy>;
maximum-speed = "high-speed";
};
};

&mdss_mdp {
connectors = <&sde_wb &sde_dsi &sde_dp>;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* 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/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "qcm6125-iot-idp.dtsi"
#include "trinket-tasha-codec-audio-overlay.dtsi"
#include "trinket-tasha-codec.dtsi"

/ {
model = "Ext Audio Codec IDP";
compatible = "qcom,qcm6125-idp", "qcom,qcm6125", "qcom,idp";
qcom,msm-id = <467 0x10000>;
qcom,board-id = <34 1>;
};

&dsi_td4330_truly_cmd_display {
qcom,dsi-display-active;
};
24 changes: 24 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-external-codec-idp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* 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 "qcm6125.dtsi"
#include "qcm6125-iot-idp.dtsi"
#include "trinket-tasha-codec-audio-overlay.dtsi"
#include "trinket-tasha-codec.dtsi"

/ {
model = "Qualcomm Technologies, Inc. QCM6125 IOT Ext Audio Codec IDP";
compatible = "qcom,qcm6125-idp", "qcom,qcm6125", "qcom,idp";
qcom,board-id = <34 1>;
};
26 changes: 26 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-idp-overlay.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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/;
/plugin/;

#include "qcm6125-iot-idp.dtsi"
#include "trinket-audio-overlay.dtsi"

/ {
model = "Qualcomm Technologies, Inc. QCM6125 IOT IDP Overlay";
compatible = "qcom,qcm6125";
qcom,msm-id = <467 0x10000>;
qcom,board-id = <34 0>;
};

23 changes: 23 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-idp.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* 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 "qcm6125.dtsi"
#include "qcm6125-iot-idp.dtsi"

/ {
model = "Qualcomm Technologies, Inc. QCM6125 IOT IDP SoC";
compatible = "qcom,qcm6125";
qcom,board-id = <34 0>;
};
13 changes: 13 additions & 0 deletions arch/arm64/boot/dts/qcom/qcm6125-iot-idp.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* 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 "trinket-idp.dtsi"
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* 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/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "qcm6125-iot-idp.dtsi"

/ {
model = "USB-C Ext Audio Codec IDP";
compatible = "qcom,qcm6125-idp", "qcom,qcm6125", "qcom,idp";
qcom,msm-id = <467 0x10000>;
qcom,board-id = <34 3>;
};

&dsi_td4330_truly_cmd_display {
qcom,dsi-display-active;
};
Loading

0 comments on commit ebbf4da

Please sign in to comment.