mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-08 12:52:40 -04:00
Merge tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.8, part 3" from Philipp Zabel: - change request API to be more explicit about the difference between exclusive and shared resets (the former guarantee the reset line is asserted immediately when reset_control_assert is called, the latter are refcounted and do not guarantee this). - add Hisilicon hi6220 media subsystem reset controller support - add TI SYSCON based reset controller support * tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux: reset: add TI SYSCON based reset driver Documentation: dt: reset: Add TI syscon reset binding reset: hisilicon: Add hi6220 media subsystem reset support reset: hisilicon: Change to syscon register access arm64: dts: hi6220: Add media subsystem reset dts reset: hisilicon: Add media reset controller binding reset: TRIVIAL: Add line break at same place for similar APIs reset: Supply *_shared variant calls when using *_optional APIs reset: Supply *_shared variant calls when using of_* API reset: Ensure drivers are explicit when requesting reset lines reset: Reorder inline reset_control_get*() wrappers
This commit is contained in:
Arnd Bergmann
@@ -64,4 +64,12 @@
|
||||
#define PERIPH_RSDIST9_CARM_SOCDBG 0x507
|
||||
#define PERIPH_RSDIST9_CARM_ETM 0x508
|
||||
|
||||
#define MEDIA_G3D 0
|
||||
#define MEDIA_CODEC_VPU 2
|
||||
#define MEDIA_CODEC_JPEG 3
|
||||
#define MEDIA_ISP 4
|
||||
#define MEDIA_ADE 5
|
||||
#define MEDIA_MMU 6
|
||||
#define MEDIA_XG2RAM1 7
|
||||
|
||||
#endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/
|
||||
|
||||
38
include/dt-bindings/reset/ti-syscon.h
Normal file
38
include/dt-bindings/reset/ti-syscon.h
Normal file
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* TI Syscon Reset definitions
|
||||
*
|
||||
* Copyright (C) 2015-2016 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef __DT_BINDINGS_RESET_TI_SYSCON_H__
|
||||
#define __DT_BINDINGS_RESET_TI_SYSCON_H__
|
||||
|
||||
/*
|
||||
* The reset does not support the feature and corresponding
|
||||
* values are not valid
|
||||
*/
|
||||
#define ASSERT_NONE (1 << 0)
|
||||
#define DEASSERT_NONE (1 << 1)
|
||||
#define STATUS_NONE (1 << 2)
|
||||
|
||||
/* When set this function is activated by setting(vs clearing) this bit */
|
||||
#define ASSERT_SET (1 << 3)
|
||||
#define DEASSERT_SET (1 << 4)
|
||||
#define STATUS_SET (1 << 5)
|
||||
|
||||
/* The following are the inverse of the above and are added for consistency */
|
||||
#define ASSERT_CLEAR (0 << 3)
|
||||
#define DEASSERT_CLEAR (0 << 4)
|
||||
#define STATUS_CLEAR (0 << 5)
|
||||
|
||||
#endif
|
||||
@@ -84,8 +84,8 @@ static inline struct reset_control *__devm_reset_control_get(
|
||||
#endif /* CONFIG_RESET_CONTROLLER */
|
||||
|
||||
/**
|
||||
* reset_control_get - Lookup and obtain an exclusive reference to a
|
||||
* reset controller.
|
||||
* reset_control_get_exclusive - Lookup and obtain an exclusive reference
|
||||
* to a reset controller.
|
||||
* @dev: device to be reset by the controller
|
||||
* @id: reset line name
|
||||
*
|
||||
@@ -98,8 +98,8 @@ static inline struct reset_control *__devm_reset_control_get(
|
||||
*
|
||||
* Use of id names is optional.
|
||||
*/
|
||||
static inline struct reset_control *__must_check reset_control_get(
|
||||
struct device *dev, const char *id)
|
||||
static inline struct reset_control *
|
||||
__must_check reset_control_get_exclusive(struct device *dev, const char *id)
|
||||
{
|
||||
#ifndef CONFIG_RESET_CONTROLLER
|
||||
WARN_ON(1);
|
||||
@@ -107,12 +107,6 @@ static inline struct reset_control *__must_check reset_control_get(
|
||||
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);
|
||||
}
|
||||
|
||||
static inline struct reset_control *reset_control_get_optional(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* reset_control_get_shared - Lookup and obtain a shared reference to a
|
||||
* reset controller.
|
||||
@@ -141,9 +135,21 @@ static inline struct reset_control *reset_control_get_shared(
|
||||
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);
|
||||
}
|
||||
|
||||
static inline struct reset_control *reset_control_get_optional_exclusive(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);
|
||||
}
|
||||
|
||||
static inline struct reset_control *reset_control_get_optional_shared(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* of_reset_control_get - Lookup and obtain an exclusive reference to a
|
||||
* reset controller.
|
||||
* of_reset_control_get_exclusive - Lookup and obtain an exclusive reference
|
||||
* to a reset controller.
|
||||
* @node: device to be reset by the controller
|
||||
* @id: reset line name
|
||||
*
|
||||
@@ -151,15 +157,41 @@ static inline struct reset_control *reset_control_get_shared(
|
||||
*
|
||||
* Use of id names is optional.
|
||||
*/
|
||||
static inline struct reset_control *of_reset_control_get(
|
||||
static inline struct reset_control *of_reset_control_get_exclusive(
|
||||
struct device_node *node, const char *id)
|
||||
{
|
||||
return __of_reset_control_get(node, id, 0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* of_reset_control_get_by_index - Lookup and obtain an exclusive reference to
|
||||
* a reset controller by index.
|
||||
* of_reset_control_get_shared - Lookup and obtain an shared reference
|
||||
* to a reset controller.
|
||||
* @node: device to be reset by the controller
|
||||
* @id: reset line name
|
||||
*
|
||||
* When a reset-control is shared, the behavior of reset_control_assert /
|
||||
* deassert is changed, the reset-core will keep track of a deassert_count
|
||||
* and only (re-)assert the reset after reset_control_assert has been called
|
||||
* as many times as reset_control_deassert was called. Also see the remark
|
||||
* about shared reset-controls in the reset_control_assert docs.
|
||||
*
|
||||
* Calling reset_control_assert without first calling reset_control_deassert
|
||||
* is not allowed on a shared reset control. Calling reset_control_reset is
|
||||
* also not allowed on a shared reset control.
|
||||
* Returns a struct reset_control or IS_ERR() condition containing errno.
|
||||
*
|
||||
* Use of id names is optional.
|
||||
*/
|
||||
static inline struct reset_control *of_reset_control_get_shared(
|
||||
struct device_node *node, const char *id)
|
||||
{
|
||||
return __of_reset_control_get(node, id, 0, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* of_reset_control_get_exclusive_by_index - Lookup and obtain an exclusive
|
||||
* reference to a reset controller
|
||||
* by index.
|
||||
* @node: device to be reset by the controller
|
||||
* @index: index of the reset controller
|
||||
*
|
||||
@@ -167,23 +199,55 @@ static inline struct reset_control *of_reset_control_get(
|
||||
* in whatever order. Returns a struct reset_control or IS_ERR() condition
|
||||
* containing errno.
|
||||
*/
|
||||
static inline struct reset_control *of_reset_control_get_by_index(
|
||||
static inline struct reset_control *of_reset_control_get_exclusive_by_index(
|
||||
struct device_node *node, int index)
|
||||
{
|
||||
return __of_reset_control_get(node, NULL, index, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get - resource managed reset_control_get()
|
||||
* of_reset_control_get_shared_by_index - Lookup and obtain an shared
|
||||
* reference to a reset controller
|
||||
* by index.
|
||||
* @node: device to be reset by the controller
|
||||
* @index: index of the reset controller
|
||||
*
|
||||
* When a reset-control is shared, the behavior of reset_control_assert /
|
||||
* deassert is changed, the reset-core will keep track of a deassert_count
|
||||
* and only (re-)assert the reset after reset_control_assert has been called
|
||||
* as many times as reset_control_deassert was called. Also see the remark
|
||||
* about shared reset-controls in the reset_control_assert docs.
|
||||
*
|
||||
* Calling reset_control_assert without first calling reset_control_deassert
|
||||
* is not allowed on a shared reset control. Calling reset_control_reset is
|
||||
* also not allowed on a shared reset control.
|
||||
* Returns a struct reset_control or IS_ERR() condition containing errno.
|
||||
*
|
||||
* This is to be used to perform a list of resets for a device or power domain
|
||||
* in whatever order. Returns a struct reset_control or IS_ERR() condition
|
||||
* containing errno.
|
||||
*/
|
||||
static inline struct reset_control *of_reset_control_get_shared_by_index(
|
||||
struct device_node *node, int index)
|
||||
{
|
||||
return __of_reset_control_get(node, NULL, index, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get_exclusive - resource managed
|
||||
* reset_control_get_exclusive()
|
||||
* @dev: device to be reset by the controller
|
||||
* @id: reset line name
|
||||
*
|
||||
* Managed reset_control_get(). For reset controllers returned from this
|
||||
* function, reset_control_put() is called automatically on driver detach.
|
||||
* See reset_control_get() for more information.
|
||||
* Managed reset_control_get_exclusive(). For reset controllers returned
|
||||
* from this function, reset_control_put() is called automatically on driver
|
||||
* detach.
|
||||
*
|
||||
* See reset_control_get_exclusive() for more information.
|
||||
*/
|
||||
static inline struct reset_control *__must_check devm_reset_control_get(
|
||||
struct device *dev, const char *id)
|
||||
static inline struct reset_control *
|
||||
__must_check devm_reset_control_get_exclusive(struct device *dev,
|
||||
const char *id)
|
||||
{
|
||||
#ifndef CONFIG_RESET_CONTROLLER
|
||||
WARN_ON(1);
|
||||
@@ -191,27 +255,6 @@ static inline struct reset_control *__must_check devm_reset_control_get(
|
||||
return __devm_reset_control_get(dev, id, 0, 0);
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get_optional(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __devm_reset_control_get(dev, id, 0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get_by_index - resource managed reset_control_get
|
||||
* @dev: device to be reset by the controller
|
||||
* @index: index of the reset controller
|
||||
*
|
||||
* Managed reset_control_get(). For reset controllers returned from this
|
||||
* function, reset_control_put() is called automatically on driver detach.
|
||||
* See reset_control_get() for more information.
|
||||
*/
|
||||
static inline struct reset_control *devm_reset_control_get_by_index(
|
||||
struct device *dev, int index)
|
||||
{
|
||||
return __devm_reset_control_get(dev, NULL, index, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get_shared - resource managed reset_control_get_shared()
|
||||
* @dev: device to be reset by the controller
|
||||
@@ -227,6 +270,36 @@ static inline struct reset_control *devm_reset_control_get_shared(
|
||||
return __devm_reset_control_get(dev, id, 0, 1);
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get_optional_exclusive(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __devm_reset_control_get(dev, id, 0, 0);
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get_optional_shared(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return __devm_reset_control_get(dev, id, 0, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get_exclusive_by_index - resource managed
|
||||
* reset_control_get_exclusive()
|
||||
* @dev: device to be reset by the controller
|
||||
* @index: index of the reset controller
|
||||
*
|
||||
* Managed reset_control_get_exclusive(). For reset controllers returned from
|
||||
* this function, reset_control_put() is called automatically on driver
|
||||
* detach.
|
||||
*
|
||||
* See reset_control_get_exclusive() for more information.
|
||||
*/
|
||||
static inline struct reset_control *
|
||||
devm_reset_control_get_exclusive_by_index(struct device *dev, int index)
|
||||
{
|
||||
return __devm_reset_control_get(dev, NULL, index, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_reset_control_get_shared_by_index - resource managed
|
||||
* reset_control_get_shared
|
||||
@@ -237,10 +310,60 @@ static inline struct reset_control *devm_reset_control_get_shared(
|
||||
* this function, reset_control_put() is called automatically on driver detach.
|
||||
* See reset_control_get_shared() for more information.
|
||||
*/
|
||||
static inline struct reset_control *devm_reset_control_get_shared_by_index(
|
||||
struct device *dev, int index)
|
||||
static inline struct reset_control *
|
||||
devm_reset_control_get_shared_by_index(struct device *dev, int index)
|
||||
{
|
||||
return __devm_reset_control_get(dev, NULL, index, 1);
|
||||
}
|
||||
|
||||
/*
|
||||
* TEMPORARY calls to use during transition:
|
||||
*
|
||||
* of_reset_control_get() => of_reset_control_get_exclusive()
|
||||
*
|
||||
* These inline function calls will be removed once all consumers
|
||||
* have been moved over to the new explicit API.
|
||||
*/
|
||||
static inline struct reset_control *reset_control_get(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return reset_control_get_exclusive(dev, id);
|
||||
}
|
||||
|
||||
static inline struct reset_control *reset_control_get_optional(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return reset_control_get_optional_exclusive(dev, id);
|
||||
}
|
||||
|
||||
static inline struct reset_control *of_reset_control_get(
|
||||
struct device_node *node, const char *id)
|
||||
{
|
||||
return of_reset_control_get_exclusive(node, id);
|
||||
}
|
||||
|
||||
static inline struct reset_control *of_reset_control_get_by_index(
|
||||
struct device_node *node, int index)
|
||||
{
|
||||
return of_reset_control_get_exclusive_by_index(node, index);
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return devm_reset_control_get_exclusive(dev, id);
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get_optional(
|
||||
struct device *dev, const char *id)
|
||||
{
|
||||
return devm_reset_control_get_optional_exclusive(dev, id);
|
||||
|
||||
}
|
||||
|
||||
static inline struct reset_control *devm_reset_control_get_by_index(
|
||||
struct device *dev, int index)
|
||||
{
|
||||
return devm_reset_control_get_exclusive_by_index(dev, index);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user