summaryrefslogtreecommitdiffstats
path: root/drivers/misc/ti-st/st_ll.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-07-22 13:17:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-05 13:24:12 -0700
commitc0bd1b9e58959c51a4c939505f89721dfbc73c44 (patch)
treed61102db755e553fa308b321faa8c83302d3bb5b /drivers/misc/ti-st/st_ll.c
parenteb79100fe6a696bfbad21aaf8e373d72763c7462 (diff)
downloadop-kernel-dev-c0bd1b9e58959c51a4c939505f89721dfbc73c44.zip
op-kernel-dev-c0bd1b9e58959c51a4c939505f89721dfbc73c44.tar.gz
Revert "ti-st: add device tree support"
This reverts commit 46d0d33350e9b32642d745a8b46a954910196b4d. This binding is horrible and never should have been merged. It is not documented nor are there any in tree users, so reverting it will not break anything we care about. Lets revert it before we do have users. The problems with it are: - It is not documented. - The GPIO connection is described with a custom property and uses Linux GPIO numbering. - The UART connection is described using the Linux tty device name. Cc: Gigi Joseph <gigi.joseph@ti.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/ti-st/st_ll.c')
-rw-r--r--drivers/misc/ti-st/st_ll.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/misc/ti-st/st_ll.c b/drivers/misc/ti-st/st_ll.c
index 518e1b7..93b4d67 100644
--- a/drivers/misc/ti-st/st_ll.c
+++ b/drivers/misc/ti-st/st_ll.c
@@ -26,7 +26,6 @@
#include <linux/ti_wilink_st.h>
/**********************************************************************/
-
/* internal functions */
static void send_ll_cmd(struct st_data_s *st_data,
unsigned char cmd)
@@ -54,13 +53,7 @@ static void ll_device_want_to_sleep(struct st_data_s *st_data)
/* communicate to platform about chip asleep */
kim_data = st_data->kim_data;
- if (kim_data->kim_pdev->dev.of_node) {
- pr_debug("use device tree data");
- pdata = dt_pdata;
- } else {
- pdata = kim_data->kim_pdev->dev.platform_data;
- }
-
+ pdata = kim_data->kim_pdev->dev.platform_data;
if (pdata->chip_asleep)
pdata->chip_asleep(NULL);
}
@@ -93,13 +86,7 @@ static void ll_device_want_to_wakeup(struct st_data_s *st_data)
/* communicate to platform about chip wakeup */
kim_data = st_data->kim_data;
- if (kim_data->kim_pdev->dev.of_node) {
- pr_debug("use device tree data");
- pdata = dt_pdata;
- } else {
- pdata = kim_data->kim_pdev->dev.platform_data;
- }
-
+ pdata = kim_data->kim_pdev->dev.platform_data;
if (pdata->chip_awake)
pdata->chip_awake(NULL);
}
OpenPOWER on IntegriCloud