Here are a number of staging driver fixes for 4.12-rc2 Most of them are typec driver fixes found by reviewers and users of the code. There are also some removals of files no longer needed in the tree due to the ion driver rewrite in 4.12-rc1, as well as some wifi driver fixes. And to round it out, a MAINTAINERS file update. All have been in linux-next with no reported issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWSBHOg8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ylDFACdGF2LnZiSfD4H708tz+o2557r0aUAoNAG4q/c 8syw0G7T1oMIr/gPss1k =M0sb -----END PGP SIGNATURE----- Merge tag 'staging-4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg KH: "Here are a number of staging driver fixes for 4.12-rc2 Most of them are typec driver fixes found by reviewers and users of the code. There are also some removals of files no longer needed in the tree due to the ion driver rewrite in 4.12-rc1, as well as some wifi driver fixes. And to round it out, a MAINTAINERS file update. All have been in linux-next with no reported issues" * tag 'staging-4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (22 commits) MAINTAINERS: greybus-dev list is members-only staging: fsl-dpaa2/eth: add ETHERNET dependency staging: typec: fusb302: refactor resume retry mechanism staging: typec: fusb302: reset i2c_busy state in error staging: rtl8723bs: remove re-positioned call to kfree in os_dep/ioctl_cfg80211.c staging: rtl8192e: GetTs Fix invalid TID 7 warning. staging: rtl8192e: rtl92e_get_eeprom_size Fix read size of EPROM_CMD. staging: rtl8192e: fix 2 byte alignment of register BSSIDR. staging: rtl8192e: rtl92e_fill_tx_desc fix write to mapped out memory. staging: vc04_services: Fix bulk cache maintenance staging: ccree: remove extraneous spin_unlock_bh() in error handler staging: typec: Fix sparse warnings about incorrect types staging: typec: fusb302: do not free gpio from managed resource staging: typec: tcpm: Fix Port Power Role field in PS_RDY messages staging: typec: tcpm: Respond to Discover Identity commands staging: typec: tcpm: Set correct flags in PD request messages staging: typec: tcpm: Drop duplicate PD messages staging: typec: fusb302: Fix chip->vbus_present init value staging: typec: fusb302: Fix module autoload staging: typec: tcpci: declare private structure as static ...tirimbino
Linus Torvalds
8 years ago
commit
ef82f1ad2e
@ -1,31 +0,0 @@ |
|||||||
Hi6220 SoC ION |
|
||||||
=================================================================== |
|
||||||
Required properties: |
|
||||||
- compatible : "hisilicon,hi6220-ion" |
|
||||||
- list of the ION heaps |
|
||||||
- heap name : maybe heap_sys_user@0 |
|
||||||
- heap id : id should be unique in the system. |
|
||||||
- heap base : base ddr address of the heap,0 means that |
|
||||||
it is dynamic. |
|
||||||
- heap size : memory size and 0 means it is dynamic. |
|
||||||
- heap type : the heap type of the heap, please also |
|
||||||
see the define in ion.h(drivers/staging/android/uapi/ion.h) |
|
||||||
------------------------------------------------------------------- |
|
||||||
Example: |
|
||||||
hi6220-ion { |
|
||||||
compatible = "hisilicon,hi6220-ion"; |
|
||||||
heap_sys_user@0 { |
|
||||||
heap-name = "sys_user"; |
|
||||||
heap-id = <0x0>; |
|
||||||
heap-base = <0x0>; |
|
||||||
heap-size = <0x0>; |
|
||||||
heap-type = "ion_system"; |
|
||||||
}; |
|
||||||
heap_sys_contig@0 { |
|
||||||
heap-name = "sys_contig"; |
|
||||||
heap-id = <0x1>; |
|
||||||
heap-base = <0x0>; |
|
||||||
heap-size = <0x0>; |
|
||||||
heap-type = "ion_system_contig"; |
|
||||||
}; |
|
||||||
}; |
|
||||||
@ -1,51 +0,0 @@ |
|||||||
Ion Memory Manager |
|
||||||
|
|
||||||
Ion is a memory manager that allows for sharing of buffers via dma-buf. |
|
||||||
Ion allows for different types of allocation via an abstraction called |
|
||||||
a 'heap'. A heap represents a specific type of memory. Each heap has |
|
||||||
a different type. There can be multiple instances of the same heap |
|
||||||
type. |
|
||||||
|
|
||||||
Specific heap instances are tied to heap IDs. Heap IDs are not to be specified |
|
||||||
in the devicetree. |
|
||||||
|
|
||||||
Required properties for Ion |
|
||||||
|
|
||||||
- compatible: "linux,ion" PLUS a compatible property for the device |
|
||||||
|
|
||||||
All child nodes of a linux,ion node are interpreted as heaps |
|
||||||
|
|
||||||
required properties for heaps |
|
||||||
|
|
||||||
- compatible: compatible string for a heap type PLUS a compatible property |
|
||||||
for the specific instance of the heap. Current heap types |
|
||||||
-- linux,ion-heap-system |
|
||||||
-- linux,ion-heap-system-contig |
|
||||||
-- linux,ion-heap-carveout |
|
||||||
-- linux,ion-heap-chunk |
|
||||||
-- linux,ion-heap-dma |
|
||||||
-- linux,ion-heap-custom |
|
||||||
|
|
||||||
Optional properties |
|
||||||
- memory-region: A phandle to a memory region. Required for DMA heap type |
|
||||||
(see reserved-memory.txt for details on the reservation) |
|
||||||
|
|
||||||
Example: |
|
||||||
|
|
||||||
ion { |
|
||||||
compatbile = "hisilicon,ion", "linux,ion"; |
|
||||||
|
|
||||||
ion-system-heap { |
|
||||||
compatbile = "hisilicon,system-heap", "linux,ion-heap-system" |
|
||||||
}; |
|
||||||
|
|
||||||
ion-camera-region { |
|
||||||
compatible = "hisilicon,camera-heap", "linux,ion-heap-dma" |
|
||||||
memory-region = <&camera_region>; |
|
||||||
}; |
|
||||||
|
|
||||||
ion-fb-region { |
|
||||||
compatbile = "hisilicon,fb-heap", "linux,ion-heap-dma" |
|
||||||
memory-region = <&fb_region>; |
|
||||||
}; |
|
||||||
} |
|
||||||
Loading…
Reference in new issue