diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:20 +0100 |
| commit | 034637fbd9dfc5cbcffca1f8f392c6ab0dd6f229 (patch) | |
| tree | 1dc12e89a43445f78dc5a0875f9e7603588cb0a9 /arch | |
| parent | 47f83fa0dad2f0d80b41806709c6c154adf3cf2a (diff) | |
| parent | 3f9c2b434cacd5b5380ad11d141723f513ebc976 (diff) | |
| download | barebox-034637fbd9dfc5cbcffca1f8f392c6ab0dd6f229.tar.gz barebox-034637fbd9dfc5cbcffca1f8f392c6ab0dd6f229.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx6.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx7-ccm-regs.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx7-regs.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/revision.h | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h index e0ced7edc6..288c7539ae 100644 --- a/arch/arm/mach-imx/include/mach/imx6.h +++ b/arch/arm/mach-imx/include/mach/imx6.h @@ -109,6 +109,8 @@ static inline int __imx6_cpu_revision(void) return IMX_CHIP_REV_1_4; case 0x05: return IMX_CHIP_REV_1_5; + case 0x06: + return IMX_CHIP_REV_1_6; case 0x100: return IMX_CHIP_REV_2_0; } diff --git a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h index a4217cca5d..97fe240fc4 100644 --- a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h +++ b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h @@ -6,6 +6,7 @@ #define CCM_CCGRn_CLR(n) (0x4008 + 16 * (n)) #define CCM_CCGR_UART1 148 +#define CCM_CCGR_UART2 149 #define CCM_CCGR_SETTINGn(n, s) ((s) << ((n) * 4)) #define CCM_CCGR_SETTINGn_NOT_NEEDED(n) CCM_CCGR_SETTINGn(n, 0b00) @@ -28,5 +29,7 @@ #define UART1_CLK_ROOT CLOCK_ROOT_INDEX(0xaf80) #define UART1_CLK_ROOT__OSC_24M CCM_TARGET_ROOTn_MUX(0b000) +#define UART2_CLK_ROOT CLOCK_ROOT_INDEX(0xb000) +#define UART2_CLK_ROOT__OSC_24M CCM_TARGET_ROOTn_MUX(0b000) #endif diff --git a/arch/arm/mach-imx/include/mach/imx7-regs.h b/arch/arm/mach-imx/include/mach/imx7-regs.h index 8774c32d73..8625d0b619 100644 --- a/arch/arm/mach-imx/include/mach/imx7-regs.h +++ b/arch/arm/mach-imx/include/mach/imx7-regs.h @@ -78,7 +78,7 @@ #define MX7_ECSPI2_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x30000) #define MX7_ECSPI3_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x40000) #define MX7_UART1_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x60000) -#define MX7_UART2_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x70000) +#define MX7_UART2_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x90000) #define MX7_UART3_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0x80000) #define MX7_SAI1_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0xA0000) #define MX7_SAI2_BASE_ADDR (MX7_AIPS3_BASE_ADDR + 0xB0000) diff --git a/arch/arm/mach-imx/include/mach/revision.h b/arch/arm/mach-imx/include/mach/revision.h index 908a0a1d74..d9495d967f 100644 --- a/arch/arm/mach-imx/include/mach/revision.h +++ b/arch/arm/mach-imx/include/mach/revision.h @@ -8,6 +8,7 @@ #define IMX_CHIP_REV_1_3 0x13 #define IMX_CHIP_REV_1_4 0x14 #define IMX_CHIP_REV_1_5 0x15 +#define IMX_CHIP_REV_1_6 0x16 #define IMX_CHIP_REV_2_0 0x20 #define IMX_CHIP_REV_2_1 0x21 #define IMX_CHIP_REV_2_2 0x22 |