Unverified Commit 84a5fe2e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-7.1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 78b06e0a 1b7c834d

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -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-*

drivers/bus/imx-aipstz.c

+15 −0
Original line number Diff line number Diff line
@@ -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[] = {