Skip to contentSkip to conversation

linux-ti-staging: update with latest merges, first 4 SGX patches upstreamed

PATCH Superseded Denys Dmytriyenko 1 participant 1 message Sep 3, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-ti-staging: update with latest merges, first 4 SGX patches upstreamed

From: Denys Dmytriyenko <[email protected]>

---
 ...0001-DT-gpu-add-binding-for-TI-SGX-driver.patch |  52 --
 ...-dts-DRA7xx-add-device-tree-entry-for-SGX.patch |  37 --
 .../0003-arm-dra7xx-Add-gpu-hwmod-data.patch       |  85 ---
 .../0004-drm-omap-Add-omapdrm-plugin-API.patch     | 585 ---------------------
 recipes-kernel/linux/linux-ti-staging_4.1.bb       |  10 +-
 5 files changed, 3 insertions(+), 766 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch
 delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch
recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch deleted +0 -52
deleted file mode 100644
index 00628a6..0000000
@@ -1,52 +0,0 @@
-From 4b375ae644830ea38d8bfc1c78da6d83628527ea Mon Sep 17 00:00:00 2001
-From: Anand Balagopalakrishnan <[email protected]>
-Date: Wed, 26 Aug 2015 09:34:49 +0000
-Subject: [PATCH 1/8] DT: gpu: add binding for TI SGX driver
-
-This patch adds the devicetree binding for TI SGX device driver.
-
-Signed-off-by: Anand Balagopalakrishnan <[email protected]>
----
- Documentation/devicetree/bindings/gpu/ti-sgx.txt | 30 ++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/gpu/ti-sgx.txt
-
-diff --git a/Documentation/devicetree/bindings/gpu/ti-sgx.txt b/Documentation/devicetree/bindings/gpu/ti-sgx.txt
-new file mode 100644
-index 0000000..6b7886a
---- /dev/null
-+++ b/Documentation/devicetree/bindings/gpu/ti-sgx.txt
-@@ -0,0 +1,30 @@
-+TI SGX 3D Graphics Accelerator
-+
-+Required properties:
-+ - compatible : value should take the following format:
-+	"ti,<soc>-<gpuversion>", "img,<gpuversion>"
-+
-+   accepted values:
-+	(a) "ti,dra7-sgx544", "img,sgx544" for TI DRA7xx / AM57x
-+	(b) "ti,am4-sgx530", "img,sgx530" for TI AM43x
-+	(c) "ti,am3-sgx530", "img,sgx530" for TI AM33x
-+ - reg: base address and length of the SGX registers
-+ - interrupts : SGX interrupt number
-+
-+Optional properties:
-+ - ti,hwmods: Name of the hwmod associated with the SGX
-+ - clocks : from SoC clock binding
-+ - clock-names : names of clocks listed in clocks property in the same order
-+ - reg-names : names of registers listed in reg property in same order
-+
-+Example:
-+	sgx@0x56000000 {
-+		compatible = "ti,dra7-sgx544", "img,sgx544";
-+		reg = <0x5600fe00 0x200>;
-+		reg-names = "gpu_wrapper";
-+		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-+		ti,hwmods = "gpu";
-+		clocks = <&l3_iclk_div>, <&gpu_core_gclk_mux>,
-+			 <&gpu_hyd_gclk_mux>;
-+		clock-names = "gpu_iclk", "gpu_fclk1", "gpu_fclk2";
-+	};
--- 
-2.2.0
-
recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch deleted +0 -37
deleted file mode 100644
index ca84e27..0000000
@@ -1,37 +0,0 @@
-From f3a4651fef3c51a0ec30f321352dc26273eb56d4 Mon Sep 17 00:00:00 2001
-From: Anand Balagopalakrishnan <[email protected]>
-Date: Wed, 26 Aug 2015 09:34:50 +0000
-Subject: [PATCH 2/8] ARM: dts: DRA7xx: add device tree entry for SGX
-
-Addition of SGX to DRA7xx DTS to enable graphics support.
-
-Signed-off-by: Anand Balagopalakrishnan <[email protected]>
----
- arch/arm/boot/dts/dra7.dtsi | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
-index ce10ce3..c117ed0 100644
---- a/arch/arm/boot/dts/dra7.dtsi
-+++ b/arch/arm/boot/dts/dra7.dtsi
-@@ -889,6 +889,17 @@
- 			status = "disabled";
- 		};
- 
-+		sgx: sgx@0x56000000 {
-+			compatible = "ti,dra7-sgx544", "img,sgx544";
-+			reg = <0x5600fe00 0x200>;
-+			reg-names = "gpu_wrapper";
-+			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-+			ti,hwmods = "gpu";
-+			clocks = <&l3_iclk_div>, <&gpu_core_gclk_mux>,
-+				 <&gpu_hyd_gclk_mux>;
-+			clock-names = "gpu_iclk", "gpu_fclk1", "gpu_fclk2";
-+		};
-+
- 		i2c1: i2c@48070000 {
- 			compatible = "ti,omap4-i2c";
- 			reg = <0x48070000 0x100>;
--- 
-2.2.0
-
recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch deleted +0 -85

85 lines not on this page · raw message

recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch deleted +0 -585

585 lines not on this page · raw message

recipes-kernel/linux/linux-ti-staging_4.1.bb +3 -7
index 36f0323..3ee123b 100644
@@ -50,11 +50,11 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-lsk-linux-4.1.y"
 
-SRCREV = "babcc95b3b74f099c63cae31abf403edf6154c0b"
+SRCREV = "1d476946dc0c881868ffd78cd2be30740ce0dea1"
 PV = "4.1.6+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "f"
+MACHINE_KERNEL_PR_append = "g"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
@@ -70,11 +70,7 @@ KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
             file://defconfig"
 
-GFX_PATCHES =  "file://0001-DT-gpu-add-binding-for-TI-SGX-driver.patch \
-                file://0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch \
-                file://0003-arm-dra7xx-Add-gpu-hwmod-data.patch \
-                file://0004-drm-omap-Add-omapdrm-plugin-API.patch \
-                file://0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
+GFX_PATCHES =  "file://0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
                 file://0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch \
                 file://0007-ARM-dts-am437x-add-DT-node-for-gpu.patch \
                 file://0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch"
Signature · 1 line
2.2.0