topology2: Remove lifetime and shared -bytes_requirement widget attributes

Remove tokens lifetime_heap_bytes_requirement and shared_bytes_requirement
and turn interim_bytes_requirement back into heap_bytes_requirement.

These new types are not after all needed. The vregions code can handle
the division between lifetime linear allocs and traditional interim
heap autonomously. And shared memory does not need to be separately
configured, vregion_alloc_coherent_align() can allocate shared memory
from the same heap.

Fixes: 83390bd ("topology2: Add lifetime and shared -bytes_requirement widget attributes")

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

tools/topology/topology2/include/common/tokens.conf

@@ -28,9 +28,7 @@ Object.Base.VendorToken {
 		scheduler_domain	418
 		domain_id		419
 		stack_bytes_requirement	420
-		interim_heap_bytes_requirement	421
-		lifetime_heap_bytes_requirement 422
-		shared_bytes_requirement 423
+		heap_bytes_requirement	421
 	}
 
 	"2" {
@@ -68,7 +66,7 @@ Object.Base.VendorToken {
 	}
 
 	"7" {
-		name "asrc"
+	name "asrc"
 		rate_out		321
 		operation_mode		323
 	}

tools/topology/topology2/include/components/widget-common.conf

@@ -149,33 +149,12 @@ DefineAttribute."stack_bytes_requirement" {
 	token_ref	"comp.word"
 }
 
-## Interim Heap size requirement in bytes for this component.
-## Used for resources that may change in size or be freed during the lifetime of the component.
-## In practice this means anything allocated outside module's init() call-back.
-DefineAttribute."interim_heap_bytes_requirement" {
-	# Token set reference name and type
-	token_ref	"comp.word"
-}
-
-## Lifetime heap memory allocation requirement in bytes for this component.
-## This token's value indicates the amount of allocated memory needed at component init phase
-## and used over the lifetime of the component until the component is destroyed.
-## In practice this means anything allocated in init() call-back.
-DefineAttribute."lifetime_heap_bytes_requirement" {
-	# Token set reference name and type
-	token_ref	"comp.word"
-}
-
-## Shared memory allocation requirement in bytes for this component.
-## This token's value indicates the amount of shared memory the component may need to allocated.
-## Shared memory may be shared to other components.
-DefineAttribute."shared_bytes_requirement" {
+## Heap size requirement in bytes for this component.
+DefineAttribute."heap_bytes_requirement" {
 	# Token set reference name and type
 	token_ref	"comp.word"
 }
 
 # These default values are here until we have measured module specific numbers
 stack_bytes_requirement		8192
-interim_heap_bytes_requirement	8192
-lifetime_heap_bytes_requirement	16384
-shared_bytes_requirement	4096
+heap_bytes_requirement		24576