@@ -1,5 +1,6 @@
include features/input/input.scc
include features/net/net.scc
+include features/usb/usb-base.scc
include features/bluetooth/bluetooth.scc
include cfg/timer/no_hz.scc
include cfg/usb-mass-storage.scc
@@ -13,7 +13,9 @@ CONFIG_MAILBOX=y
CONFIG_ARM_MHU=y
# SCMI support
+CONFIG_HWMON=y
CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
CONFIG_ARM_SCMI_POWER_DOMAIN=y
CONFIG_SENSORS_ARM_SCMI=y
CONFIG_COMMON_CLK_SCMI=y
@@ -28,7 +30,6 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_CPU_IDLE=y
-CONFIG_ARM_CPUIDLE=y
CONFIG_CPU_FREQ=y
CONFIG_ARM_SCPI_CPUFREQ=y
@@ -38,4 +39,4 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CONNECTOR=y
-CONFIG_ARM_TIMER_SP804=y
+CONFIG_PRINTK_TIME=y
@@ -1,2 +1,3 @@
+CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMSC911X=y
CONFIG_SMC91X=y
@@ -1,4 +1,5 @@
CONFIG_PCI=y
+CONFIG_PCI_IOV=y
CONFIG_PCI_MSI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCI_PRI=y
@@ -1,3 +1,2 @@
CONFIG_ATA=y
CONFIG_SATA_SIL24=y
-CONFIG_SKY2=y
@@ -1,4 +1,7 @@
CONFIG_THERMAL=y
+CONFIG_THERMAL_OF=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch
@@ -1,4 +1,4 @@
-From 59fb813f9742b349f48250bd7793279cafe2752c Mon Sep 17 00:00:00 2001
+From dc250cab31c6611cc7fa76bc8b2027dbd56dd65d Mon Sep 17 00:00:00 2001
From: Pierre Gondois <pierre.gondois@arm.com>
Date: Mon, 7 Nov 2022 16:56:58 +0100
Subject: [PATCH] arm64: dts: Update cache properties for Arm Ltd platforms
@@ -136,6 +136,3 @@ index 5b6d9d8e934d..796cd7d02eb5 100644
};
};
-2.30.2
-
deleted file mode 100644
@@ -1,60 +0,0 @@
-From c4a7b9b587ca1bb4678d48d8be7132492b23a81c Mon Sep 17 00:00:00 2001
-From: Cristian Marussi <cristian.marussi@arm.com>
-Date: Fri, 28 Oct 2022 15:08:33 +0100
-Subject: [PATCH] arm64: dts: juno: Add thermal critical trip points
-
-When thermnal zones are defined, trip points definitions are mandatory.
-Define a couple of critical trip points for monitoring of existing
-PMIC and SOC thermal zones.
-
-This was lost between txt to yaml conversion and was re-enforced recently
-via the commit 8c596324232d ("dt-bindings: thermal: Fix missing required property")
-
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
-Fixes: f7b636a8d83c ("arm64: dts: juno: add thermal zones for scpi sensors")
-Link: https://lore.kernel.org/r/20221028140833.280091-8-cristian.marussi@arm.com
-Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
-
-Signed-off-by: Jon Mason <jon.mason@arm.com>
-Upstream-Status: Backport
----
- arch/arm64/boot/dts/arm/juno-base.dtsi | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
-index 2f27619d8abd..8b4d280b1e7e 100644
---- a/arch/arm64/boot/dts/arm/juno-base.dtsi
-+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
-@@ -751,12 +751,26 @@ pmic {
- polling-delay = <1000>;
- polling-delay-passive = <100>;
- thermal-sensors = <&scpi_sensors0 0>;
-+ trips {
-+ pmic_crit0: trip0 {
-+ temperature = <90000>;
-+ hysteresis = <2000>;
-+ type = "critical";
-+ };
-+ };
- };
-
- soc {
- polling-delay = <1000>;
- polling-delay-passive = <100>;
- thermal-sensors = <&scpi_sensors0 3>;
-+ trips {
-+ soc_crit0: trip0 {
-+ temperature = <80000>;
-+ hysteresis = <2000>;
-+ type = "critical";
-+ };
-+ };
- };
-
- big_cluster_thermal_zone: big-cluster {
-2.30.2
-
similarity index 93%
rename from meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch
@@ -1,4 +1,4 @@
-From 3bd7a0219082c2c91570b81afc35f2aec57cade2 Mon Sep 17 00:00:00 2001
+From bd354219987dddbf8ab6fd11450b4046547aca1b Mon Sep 17 00:00:00 2001
From: James Clark <james.clark@arm.com>
Date: Thu, 17 Nov 2022 10:25:36 +0000
Subject: [PATCH] arm64: dts: fvp: Add SPE to Foundation FVP
@@ -33,6 +33,3 @@ index c8bd23b1a7ba..029578072d8f 100644
watchdog@2a440000 {
compatible = "arm,sbsa-gwdt";
reg = <0x0 0x2a440000 0 0x1000>,
-2.30.2
-
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch
@@ -1,4 +1,4 @@
-From b2d5025e129289d9b914c696646e64495a7453c0 Mon Sep 17 00:00:00 2001
+From 22e740d069e14875a64864bf86e0826a96560b44 Mon Sep 17 00:00:00 2001
From: Sudeep Holla <sudeep.holla@arm.com>
Date: Fri, 18 Nov 2022 15:10:17 +0000
Subject: [PATCH] arm64: dts: fvp: Add information about L1 and L2 caches
@@ -144,6 +144,3 @@ index 5f6f30c801a7..60472d65a355 100644
};
};
-2.30.2
-
similarity index 96%
rename from meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch
@@ -1,4 +1,4 @@
-From e15031539490733279c41ba87f4ef2b440a685f5 Mon Sep 17 00:00:00 2001
+From 4edb625e2256d5761312110e34cbc0164915d772 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Fri, 25 Nov 2022 15:41:12 +0100
Subject: [PATCH] ARM: dts: vexpress: align LED node names with dtschema
@@ -79,6 +79,3 @@ index f434fe5cf4a1..def538ce8769 100644
label = "v2m:green:user8";
gpios = <&v2m_led_gpios 7 0>;
linux,default-trigger = "cpu5";
-2.30.2
-
@@ -97,15 +97,14 @@ SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/a
# Juno KMACHINE
#
COMPATIBLE_MACHINE:juno = "juno"
-KBUILD_DEFCONFIG:juno = "defconfig"
-KCONFIG_MODE:juno = "--alldefconfig"
+#KBUILD_DEFCONFIG:juno = "defconfig"
+#KCONFIG_MODE:juno = "--alldefconfig"
FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}"
SRC_URI:append:juno = " \
- file://0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch \
- file://0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \
- file://0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \
- file://0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \
- file://0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \
+ file://0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \
+ file://0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \
+ file://0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \
+ file://0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \
"
#
Update kernel patches and configs for the v6.1 kernel. Previously, it was using the linux defconfig as a starting point. It is now using the local kernel metadata. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../bsp/arm-platforms/juno.scc | 1 + .../bsp/arm-platforms/juno/juno-board.cfg | 5 +- .../bsp/arm-platforms/juno/juno-net.cfg | 1 + .../bsp/arm-platforms/juno/juno-pci.cfg | 1 + .../bsp/arm-platforms/juno/juno-sata.cfg | 1 - .../bsp/arm-platforms/juno/juno-thermal.cfg | 3 + ...cache-properties-for-Arm-Ltd-platfo.patch} | 5 +- ...uno-Add-thermal-critical-trip-points.patch | 60 ------------------- ...4-dts-fvp-Add-SPE-to-Foundation-FVP.patch} | 5 +- ...-information-about-L1-and-L2-caches.patch} | 5 +- ...-align-LED-node-names-with-dtschema.patch} | 5 +- .../linux/linux-arm-platforms.inc | 13 ++-- 12 files changed, 19 insertions(+), 86 deletions(-) rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch => 0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch} (98%) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch => 0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch} (93%) rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch => 0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch} (98%) rename meta-arm-bsp/recipes-kernel/linux/files/juno/{0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch => 0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch} (96%)