diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2018-04-17 14:18:51 +0100 |
|---|---|---|
| committer | Jeremy Cline <jeremy@jcline.org> | 2018-04-19 14:21:38 -0400 |
| commit | 2bafd9f6c10039835db316dbe6ddd6814534020e (patch) | |
| tree | 6cc64411b1731d47ba0975b02adfc5ab4bda65ce | |
| parent | 0bde8a004c020c9a7183c4ad7c2c2c2a8409f2bc (diff) | |
| download | kernel-2bafd9f6c10039835db316dbe6ddd6814534020e.tar.gz kernel-2bafd9f6c10039835db316dbe6ddd6814534020e.tar.xz kernel-2bafd9f6c10039835db316dbe6ddd6814534020e.zip | |
Fix Tegra TX series firmware/thermal interface
26 files changed, 15 insertions, 31 deletions
diff --git a/baseconfig/CONFIG_TEGRA_BPMP_THERMAL b/baseconfig/CONFIG_TEGRA_BPMP_THERMAL deleted file mode 100644 index e1e1b80f4..000000000 --- a/baseconfig/CONFIG_TEGRA_BPMP_THERMAL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TEGRA_BPMP_THERMAL is not set diff --git a/baseconfig/arm/CONFIG_TEGRA_BPMP b/baseconfig/arm/CONFIG_TEGRA_BPMP index 348002b0b..9127d3c57 100644 --- a/baseconfig/arm/CONFIG_TEGRA_BPMP +++ b/baseconfig/arm/CONFIG_TEGRA_BPMP @@ -1 +1 @@ -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set diff --git a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX index 3d46b7c93..54f071b05 100644 --- a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX +++ b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX @@ -1 +1 @@ -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set diff --git a/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP b/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP new file mode 100644 index 000000000..348002b0b --- /dev/null +++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP @@ -0,0 +1 @@ +CONFIG_TEGRA_BPMP=y diff --git a/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL b/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL new file mode 100644 index 000000000..41b5a2ab5 --- /dev/null +++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL @@ -0,0 +1 @@ +CONFIG_TEGRA_BPMP_THERMAL=m diff --git a/baseconfig/arm/aarch64/CONFIG_TEGRA_HSP_MBOX b/baseconfig/arm/aarch64/CONFIG_TEGRA_HSP_MBOX new file mode 100644 index 000000000..3d46b7c93 --- /dev/null +++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_HSP_MBOX @@ -0,0 +1 @@ +CONFIG_TEGRA_HSP_MBOX=y diff --git a/baseconfig/arm/aarch64/CONFIG_TEGRA_IVC b/baseconfig/arm/aarch64/CONFIG_TEGRA_IVC deleted file mode 100644 index cdcacbec2..000000000 --- a/baseconfig/arm/aarch64/CONFIG_TEGRA_IVC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TEGRA_IVC=y diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC deleted file mode 100644 index cdcacbec2..000000000 --- a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TEGRA_IVC=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 6b55f3b4b..7d59f9fa2 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5734,7 +5734,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set +CONFIG_TEGRA_BPMP_THERMAL=m CONFIG_TEGRA_BPMP=y CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 8bde68a83..39620362f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5710,7 +5710,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set +CONFIG_TEGRA_BPMP_THERMAL=m CONFIG_TEGRA_BPMP=y CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 244d32fa6..d4614a17c 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6200,12 +6200,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 9ff2af940..43eeff34d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -5798,12 +5798,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set # CONFIG_TEGRA_IOMMU_GART is not set CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bd7d194bf..6ab71c576 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -5774,12 +5774,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set # CONFIG_TEGRA_IOMMU_GART is not set CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index c6c148407..6b8dd3924 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6176,12 +6176,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index ce6300276..2cc46ec73 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5372,7 +5372,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index a95ad4116..f3be57ae1 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5395,7 +5395,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 3d4eaa2b4..115c334f9 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5395,7 +5395,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-i686.config b/kernel-i686.config index 1f56ec555..7455010c9 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5372,7 +5372,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index c60de3905..79ffc9992 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5166,7 +5166,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index c05534927..ae3790c29 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -5141,7 +5141,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index e7246aafb..c25ac18e8 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5094,7 +5094,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 9cde8bee9..4d7851cbb 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5069,7 +5069,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d7a2712fe..14d5e6730 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -4988,7 +4988,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x.config b/kernel-s390x.config index d9d1d616b..31d739e19 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4963,7 +4963,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5201167d4..24876a0f2 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5486,7 +5486,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 53ff69190..a7d2e123d 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5463,7 +5463,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA_BPMP_THERMAL is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m |