From 33baa1e33c9e31cce3965ca13289b282eb22178d Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 11 Feb 2019 12:55:25 -0600 Subject: [PATCH] ti: k3: drivers: ti_sci: Internalize raw get/set state functions The raw get and set state functions for both devices and clocks are only meant for use internal to the TI-SCI driver, the same functionality is available from the other API that call into these. Remove them from the external interface and make them static scope to the driver. Signed-off-by: Andrew F. Davis --- plat/ti/k3/common/drivers/ti_sci/ti_sci.c | 7 ++++--- plat/ti/k3/common/drivers/ti_sci/ti_sci.h | 21 --------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c index 4a33d344..00382f02 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c @@ -236,7 +236,7 @@ static inline bool ti_sci_is_response_ack(void *r) * * Return: 0 if all goes well, else appropriate error message */ -int ti_sci_device_set_state(uint32_t id, uint32_t flags, uint8_t state) +static int ti_sci_device_set_state(uint32_t id, uint32_t flags, uint8_t state) { struct ti_sci_msg_req_set_device_state req; struct ti_sci_msg_hdr resp; @@ -280,8 +280,9 @@ int ti_sci_device_set_state(uint32_t id, uint32_t flags, uint8_t state) * * Return: 0 if all goes well, else appropriate error message */ -int ti_sci_device_get_state(uint32_t id, uint32_t *clcnt, uint32_t *resets, - uint8_t *p_state, uint8_t *c_state) +static int ti_sci_device_get_state(uint32_t id, uint32_t *clcnt, + uint32_t *resets, uint8_t *p_state, + uint8_t *c_state) { struct ti_sci_msg_req_get_device_state req; struct ti_sci_msg_resp_get_device_state resp; diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h index d07ee61d..1288a665 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h @@ -16,14 +16,6 @@ /** * Device control operations * - * - ti_sci_device_set_state - Set device state helper - * @flags: flags to setup for the device - * @state: State to move the device to - * - ti_sci_device_get_state - Get device state helper - * @clcnt: Pointer to Context Loss Count - * @resets: pointer to resets - * @p_state: pointer to p_state - * @c_state: pointer to c_state * - ti_sci_device_get - command to request for device managed by TISCI * - ti_sci_device_idle - Command to idle a device managed by TISCI * - ti_sci_device_put - command to release a device managed by TISCI @@ -54,9 +46,6 @@ * usage count by balancing get_device with put_device. No refcounting is * managed by driver for that purpose. */ -int ti_sci_device_set_state(uint32_t id, uint32_t flags, uint8_t state); -int ti_sci_device_get_state(uint32_t id, uint32_t *clcnt, uint32_t *resets, - uint8_t *p_state, uint8_t *c_state); int ti_sci_device_get(uint32_t id); int ti_sci_device_idle(uint32_t id); int ti_sci_device_put(uint32_t id); @@ -72,12 +61,6 @@ int ti_sci_device_get_resets(uint32_t id, uint32_t *reset_state); /** * Clock control operations * - * - ti_sci_clock_set_state - Set clock state helper - * @flags: Header flags as needed - * @state: State to request for the clock. - * - ti_sci_clock_get_state - Get clock state helper - * @programmed_state: State requested for clock to move to - * @current_state: State that the clock is currently in * - ti_sci_clock_get - Get control of a clock from TI SCI * @needs_ssc: 'true' iff Spread Spectrum clock is desired * @can_change_freq: 'true' iff frequency change is desired @@ -123,10 +106,6 @@ int ti_sci_device_get_resets(uint32_t id, uint32_t *reset_state); * usage count by balancing get_clock with put_clock. No refcounting is * managed by driver for that purpose. */ -int ti_sci_clock_set_state(uint32_t dev_id, uint8_t clk_id, - uint32_t flags, uint8_t state); -int ti_sci_clock_get_state(uint32_t dev_id, uint8_t clk_id, - uint8_t *programmed_state, uint8_t *current_state); int ti_sci_clock_get(uint32_t dev_id, uint8_t clk_id, bool needs_ssc, bool can_change_freq, bool enable_input_term); -- 2.30.2