mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 18:13:41 +02:00
i.MX SoC update for 7.1:
- Updates MAINTAINERS file to include i.MX team coverage for ARM NXP platforms - Sets default values for OPACR (Off-Platform Peripheral Access Control Register) in the i.MX AIPSTZ bus driver -----BEGIN PGP SIGNATURE----- iQHFBAABCgAvFiEEJS45w2QNr0ezLVaoNF3oRQ23YkwFAmnFk5URHGZyYW5rLmxp QG54cC5jb20ACgkQNF3oRQ23YkxWxgwAyKOXAFEb8nD9qGmOvd+dsopZ91ZZLCun lqBDWz0B+IpPFGwO7NzpWjEcyeMJWAPpKzmRtaSETrCEymoIISm87CgDlrTsRTKi THLFk3fh6vT0JDCu3RzqYW4KLdb29p7ejVqcCzqcyAP5IjX1AN7HuBLI7Qd1CaHO tfU6+STyFrkRrMQv2y6ce04vv4DNWbnDSv7Z3/1lsk7s4VuQMS7yDPsL7k75t+Wo fqRu3nKBMok+XWtxHHaE04zZNvnQcBbY7FSR8XGhNOlSDv2l9rRxh4rlcFvpum4Q gbzqXa4zEmczZtn1c7YcP5ieMHGPrEuM1xYXi6k9io5xhD/4UIG1Q4jNTeZMw/vZ pjqnqNFeqMyy8ZcclYTvcUN0Mwqt1h83NsgD4qsly9Ofl8Q59BA58ZYJvOUjJ7wn 25yKDB3WRClJFGhZnfAQG33yGt2xMOXjuV9bC7byWx263/WM0P5ll77YOneansj1 2DA9kjss2QrrRVryeVpuZpnc6iRDIwNl =/y4n -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmnNlIsACgkQmmx57+YA GNkf2BAAmExEqG510/98TAphhmDr2X65Gg4aORXfl1S4R3FUAvcU7ExCy05H7O1b PJmZqT0Wm8u9F/iGQjl8dOkO/kmCVBaNvrJOwr72yOwqxNsHJrKYFz872sjxM96s k1UMOq/aSe5xCz5bKWsXHPJMAMYald7Gbr97gsvwmnqngzTJzMSdAGLO9WCT2fn7 pR+Ombdrz57d2CQ1XBs2xadD3uRNok2uuh4M+dVQqDUf+UfRWuTyu/5XnpSO7vNr zd105nFar/b1eiJA0DPtibnhUNoVG7QA//AoKC1TpEq1yz2kgmVGjWSVzFZMnfKz KaAsB/tDE/2MwGLfJuDHsLR8DLlTYEK8F2ICb+lG6EWS3MlP4C2SjVhKS89iUNXj rzrptW3iC21c4KOAKZRDUL4GnRknST4Hv0kJb/O6FEzHy4bJxm9RNlbZf5xVXuad 2zlDVhg6gINZHNunIZPwjaR38KTIikzcvrwHnySWhRAQzbPguCpgzYTiZ8HotSkN b2iOTuFHQSAK492ECxJLCdVP9Od+7Wlh5V3+JW64KdKxtmTzCNw6DWv6OcZsZAyl OdkMgRWOwLzPBvDyiA9AlHZRCdUQz8d85bbaTnVePVOYfzMtJW2yzfRS/iqpDU4C ToXEtQFs9s9/7/vh92npAYaTP/ojxM2bGGgaDZgmeOAx3dSzDaU= =omNE -----END PGP SIGNATURE----- Merge tag 'imx-soc-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux into soc/drivers i.MX SoC update for 7.1: - Updates MAINTAINERS file to include i.MX team coverage for ARM NXP platforms - Sets default values for OPACR (Off-Platform Peripheral Access Control Register) in the i.MX AIPSTZ bus driver * tag 'imx-soc-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux: MAINTAINERS: Add i.MX team to all arm NXP platforms bus: imx-aipstz: set default value for opacr registers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
84a5fe2ee0
|
|
@ -2806,8 +2806,7 @@ S: Maintained
|
|||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git
|
||||
F: Documentation/devicetree/bindings/firmware/fsl*
|
||||
F: Documentation/devicetree/bindings/firmware/nxp*
|
||||
F: arch/arm/boot/dts/nxp/imx/
|
||||
F: arch/arm/boot/dts/nxp/mxs/
|
||||
F: arch/arm/boot/dts/nxp/
|
||||
F: arch/arm64/boot/dts/freescale/
|
||||
X: Documentation/devicetree/bindings/media/i2c/
|
||||
X: arch/arm64/boot/dts/freescale/fsl-*
|
||||
|
|
|
|||
|
|
@ -11,9 +11,19 @@
|
|||
#include <linux/regmap.h>
|
||||
|
||||
#define IMX_AIPSTZ_MPR0 0x0
|
||||
#define IMX_AIPSTZ_OPACR0 0x40
|
||||
#define IMX_AIPSTZ_OPACR1 0x44
|
||||
#define IMX_AIPSTZ_OPACR2 0x48
|
||||
#define IMX_AIPSTZ_OPACR3 0x4c
|
||||
#define IMX_AIPSTZ_OPACR4 0x50
|
||||
|
||||
struct imx_aipstz_config {
|
||||
u32 mpr0;
|
||||
u32 opacr0;
|
||||
u32 opacr1;
|
||||
u32 opacr2;
|
||||
u32 opacr3;
|
||||
u32 opacr4;
|
||||
};
|
||||
|
||||
struct imx_aipstz_data {
|
||||
|
|
@ -24,6 +34,11 @@ struct imx_aipstz_data {
|
|||
static void imx_aipstz_apply_default(struct imx_aipstz_data *data)
|
||||
{
|
||||
writel(data->default_cfg->mpr0, data->base + IMX_AIPSTZ_MPR0);
|
||||
writel(data->default_cfg->opacr0, data->base + IMX_AIPSTZ_OPACR0);
|
||||
writel(data->default_cfg->opacr1, data->base + IMX_AIPSTZ_OPACR1);
|
||||
writel(data->default_cfg->opacr2, data->base + IMX_AIPSTZ_OPACR2);
|
||||
writel(data->default_cfg->opacr3, data->base + IMX_AIPSTZ_OPACR3);
|
||||
writel(data->default_cfg->opacr4, data->base + IMX_AIPSTZ_OPACR4);
|
||||
}
|
||||
|
||||
static const struct of_device_id imx_aipstz_match_table[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user