aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gerlach2015-11-24 11:57:43 -0600
committerTero Kristo2015-11-25 03:36:30 -0600
commit3f484525d49fe6120db1b4b2bfa4bdc1bf0b2356 (patch)
tree1b496243de61edcd23b63c744a2257f7facd039c /drivers/firmware/ti_sci.c
parent7c301a67b8916d1ff8e3da04ebc2086235f550fc (diff)
downloadti-linux-kernel-3f484525d49fe6120db1b4b2bfa4bdc1bf0b2356.tar.gz
ti-linux-kernel-3f484525d49fe6120db1b4b2bfa4bdc1bf0b2356.tar.xz
ti-linux-kernel-3f484525d49fe6120db1b4b2bfa4bdc1bf0b2356.zip
firmware: ti_sci: Drop resets field from ti_sci_set_device_state calls
TI_SCI_MSG_SET_DEVICE_STATE no longer will control resets as this has been moved to a new separate ABI as of ABI 2.3 so drop the resets field from the message request and update ti_sci_set_device_state and all functions using it to no longer set the resets field. Also update ti_sci_pm_domains to avoid build breakage as it uses the get_device op which used to take resets as a parameter. Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Diffstat (limited to 'drivers/firmware/ti_sci.c')
-rw-r--r--drivers/firmware/ti_sci.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 51194b3cbbaf..a48a703c61dc 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -513,13 +513,12 @@ static inline bool tis_sci_is_response_ack(void *r)
513 * @handle: pointer to TI SCI handle 513 * @handle: pointer to TI SCI handle
514 * @id: Device identifier 514 * @id: Device identifier
515 * @flags: flags to setup for the device 515 * @flags: flags to setup for the device
516 * @resets: resets to setup for the device
517 * @state: State to move the device to 516 * @state: State to move the device to
518 * 517 *
519 * Return: 0 if all went well, else returns appropriate error value. 518 * Return: 0 if all went well, else returns appropriate error value.
520 */ 519 */
521static int ti_sci_set_device_state(const struct ti_sci_handle *handle, 520static int ti_sci_set_device_state(const struct ti_sci_handle *handle,
522 u32 id, u32 flags, u32 resets, u8 state) 521 u32 id, u32 flags, u8 state)
523{ 522{
524 struct ti_sci_info *info; 523 struct ti_sci_info *info;
525 struct ti_sci_msg_req_set_device_state *req; 524 struct ti_sci_msg_req_set_device_state *req;
@@ -547,7 +546,6 @@ static int ti_sci_set_device_state(const struct ti_sci_handle *handle,
547 req = (struct ti_sci_msg_req_set_device_state *)xfer->xfer_buf; 546 req = (struct ti_sci_msg_req_set_device_state *)xfer->xfer_buf;
548 req->id = id; 547 req->id = id;
549 req->state = state; 548 req->state = state;
550 req->resets = resets;
551 549
552 ret = ti_sci_do_xfer(info, xfer); 550 ret = ti_sci_do_xfer(info, xfer);
553 if (ret) { 551 if (ret) {
@@ -639,7 +637,6 @@ fail:
639 * ti_sci_cmd_get_device() - command to request for device managed by TISCI 637 * ti_sci_cmd_get_device() - command to request for device managed by TISCI
640 * @handle: Pointer to TISCI handle as retrieved by *ti_sci_get_handle 638 * @handle: Pointer to TISCI handle as retrieved by *ti_sci_get_handle
641 * @id: Device Identifier 639 * @id: Device Identifier
642 * @reset_state: Device specific reset bit field
643 * 640 *
644 * Request for the device - NOTE: the client MUST maintain integrity of 641 * Request for the device - NOTE: the client MUST maintain integrity of
645 * usage count by balancing get_device with put_device. No refcounting is 642 * usage count by balancing get_device with put_device. No refcounting is
@@ -649,12 +646,11 @@ fail:
649 * 646 *
650 * Return: 0 if all went fine, else return appropriate error. 647 * Return: 0 if all went fine, else return appropriate error.
651 */ 648 */
652static int ti_sci_cmd_get_device(const struct ti_sci_handle *handle, u32 id, 649static int ti_sci_cmd_get_device(const struct ti_sci_handle *handle, u32 id)
653 u32 reset_state)
654{ 650{
655 return ti_sci_set_device_state(handle, id, 651 return ti_sci_set_device_state(handle, id,
656 MSG_FLAG_DEVICE_EXCLUSIVE, 652 MSG_FLAG_DEVICE_EXCLUSIVE,
657 reset_state, MSG_DEVICE_SW_STATE_ON); 653 MSG_DEVICE_SW_STATE_ON);
658} 654}
659 655
660/** 656/**
@@ -672,7 +668,7 @@ static int ti_sci_cmd_idle_device(const struct ti_sci_handle *handle, u32 id)
672{ 668{
673 return ti_sci_set_device_state(handle, id, 669 return ti_sci_set_device_state(handle, id,
674 MSG_FLAG_DEVICE_EXCLUSIVE, 670 MSG_FLAG_DEVICE_EXCLUSIVE,
675 0, MSG_DEVICE_SW_STATE_RETENTION); 671 MSG_DEVICE_SW_STATE_RETENTION);
676} 672}
677 673
678/** 674/**
@@ -689,7 +685,7 @@ static int ti_sci_cmd_idle_device(const struct ti_sci_handle *handle, u32 id)
689static int ti_sci_cmd_put_device(const struct ti_sci_handle *handle, u32 id) 685static int ti_sci_cmd_put_device(const struct ti_sci_handle *handle, u32 id)
690{ 686{
691 return ti_sci_set_device_state(handle, id, 687 return ti_sci_set_device_state(handle, id,
692 0, 0, MSG_DEVICE_SW_STATE_AUTO_OFF); 688 0, MSG_DEVICE_SW_STATE_AUTO_OFF);
693} 689}
694 690
695/** 691/**