Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+16
-2
+1
-2
MAINTAINERS
+1
-2
MAINTAINERS
···
2806
2806
T: git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git
2807
2807
F: Documentation/devicetree/bindings/firmware/fsl*
2808
2808
F: Documentation/devicetree/bindings/firmware/nxp*
2809
-
F: arch/arm/boot/dts/nxp/imx/
2810
-
F: arch/arm/boot/dts/nxp/mxs/
2809
+
F: arch/arm/boot/dts/nxp/
2811
2810
F: arch/arm64/boot/dts/freescale/
2812
2811
X: Documentation/devicetree/bindings/media/i2c/
2813
2812
X: arch/arm64/boot/dts/freescale/fsl-*
+15
drivers/bus/imx-aipstz.c
+15
drivers/bus/imx-aipstz.c
···
11
11
#include <linux/regmap.h>
12
12
13
13
#define IMX_AIPSTZ_MPR0 0x0
14
+
#define IMX_AIPSTZ_OPACR0 0x40
15
+
#define IMX_AIPSTZ_OPACR1 0x44
16
+
#define IMX_AIPSTZ_OPACR2 0x48
17
+
#define IMX_AIPSTZ_OPACR3 0x4c
18
+
#define IMX_AIPSTZ_OPACR4 0x50
14
19
15
20
struct imx_aipstz_config {
16
21
u32 mpr0;
22
+
u32 opacr0;
23
+
u32 opacr1;
24
+
u32 opacr2;
25
+
u32 opacr3;
26
+
u32 opacr4;
17
27
};
18
28
19
29
struct imx_aipstz_data {
···
34
24
static void imx_aipstz_apply_default(struct imx_aipstz_data *data)
35
25
{
36
26
writel(data->default_cfg->mpr0, data->base + IMX_AIPSTZ_MPR0);
27
+
writel(data->default_cfg->opacr0, data->base + IMX_AIPSTZ_OPACR0);
28
+
writel(data->default_cfg->opacr1, data->base + IMX_AIPSTZ_OPACR1);
29
+
writel(data->default_cfg->opacr2, data->base + IMX_AIPSTZ_OPACR2);
30
+
writel(data->default_cfg->opacr3, data->base + IMX_AIPSTZ_OPACR3);
31
+
writel(data->default_cfg->opacr4, data->base + IMX_AIPSTZ_OPACR4);
37
32
}
38
33
39
34
static const struct of_device_id imx_aipstz_match_table[] = {