Skip to content

Commit

Permalink
staging: android: ion: Remove old platform support
Browse files Browse the repository at this point in the history
Device specific platform support has been haphazard for Ion. There have
been several independent attempts and there are still objections to
what bindings exist right now. Just remove everything for a fresh start.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Laura Abbott authored and Greg Kroah-Hartman committed Apr 8, 2017
1 parent db70331 commit 9828282
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 999 deletions.
42 changes: 0 additions & 42 deletions drivers/staging/android/ion/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,3 @@ menuconfig ION
If you're not using Android its probably safe to
say N here.

config ION_TEST
tristate "Ion Test Device"
depends on ION
help
Choose this option to create a device that can be used to test the
kernel and device side ION functions.

config ION_DUMMY
bool "Dummy Ion driver"
depends on ION
help
Provides a dummy ION driver that registers the
/dev/ion device and some basic heaps. This can
be used for testing the ION infrastructure if
one doesn't have access to hardware drivers that
use ION.

config ION_TEGRA
tristate "Ion for Tegra"
depends on ARCH_TEGRA && ION
help
Choose this option if you wish to use ion on an nVidia Tegra.

config ION_HISI
tristate "Ion for Hisilicon"
depends on ARCH_HISI && ION
select ION_OF
help
Choose this option if you wish to use ion on Hisilicon Platform.

source "drivers/staging/android/ion/hisilicon/Kconfig"

config ION_OF
bool "Devicetree support for Ion"
depends on ION && OF_ADDRESS
help
Provides base support for defining Ion heaps in devicetree
and setting them up. Also includes functions for platforms
to parse the devicetree and expand for their own custom
extensions

If using Ion and devicetree, you should say Y here
7 changes: 0 additions & 7 deletions drivers/staging/android/ion/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o \
ion_page_pool.o ion_system_heap.o \
ion_carveout_heap.o ion_chunk_heap.o ion_cma_heap.o
obj-$(CONFIG_ION_TEST) += ion_test.o
ifdef CONFIG_COMPAT
obj-$(CONFIG_ION) += compat_ion.o
endif

obj-$(CONFIG_ION_DUMMY) += ion_dummy_driver.o
obj-$(CONFIG_ION_TEGRA) += tegra/
obj-$(CONFIG_ION_HISI) += hisilicon/
obj-$(CONFIG_ION_OF) += ion_of.o

5 changes: 0 additions & 5 deletions drivers/staging/android/ion/hisilicon/Kconfig

This file was deleted.

1 change: 0 additions & 1 deletion drivers/staging/android/ion/hisilicon/Makefile

This file was deleted.

113 changes: 0 additions & 113 deletions drivers/staging/android/ion/hisilicon/hi6220_ion.c

This file was deleted.

155 changes: 0 additions & 155 deletions drivers/staging/android/ion/ion_dummy_driver.c

This file was deleted.

Loading

0 comments on commit 9828282

Please sign in to comment.