mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
281b05392f
These changes are all specific to an soc family or the code for one soc. Lots of work for Tegra3 this time, but also a lot of other platforms. There will be another (smaller) set of soc patches later in the merge window for stuff that has dependencies on external trees or that was sent just before the merge window opened. The asoc tree added a few devices to the i.mx platform, which conflict with other devices added in the same place here. The tegra Makefile conflicts between a number of branches, mostly because of changes regarding localtimer.c, which was removed in the end. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAT24+62CrR//JCVInAQLQBQ/8ClDSFYKTkh3XuzryyO3xkiuuj9wp3/av oEzro6HmSFDeWlqyQYYM9nKn6n3zFyyumG7oHt3OyRwrtV742rMOpTK+/Ntj2lFB xUVwKQfu2gEMHvwca3VoXia/pX7knvedEf9bNjeCznkKxQCKCArK2821/2UDGhwx L3/lD70AhpfK0DInNr6HusnZG2pzCdV1tLXUvgs08I68wL7Ps1TDPOLLyTo9dAgf k+E1cpRNLahyiVUBfnp+n3Dg0T+/7iD6zrR7bE9i/zhv6XUcLPt2K5XqYnPuQvzK sHIG8zROmNWzaIzgwYVpJAofi0SHq1OjvA7RtepOq/pGe5QvB9y1RISlpwzBr6Fh 4yuBkeN/Azk0xSHw5w++8L4y/oSSNhB9OWgIZGChZMW33bnHyiZW9mDFJ/PyWD0F kRl++tTuQqDvT5Wx4DXX8RGekIiFq48+MMx3yJjuGarmVsPEvShQCf8TkBbl/KQY /AEXMJTaVTED0R/q+NOY/r4oMFC4JtAVo1ZtTga+N5cYWQCwI9HVSgAKw84Yc1Hj h9r7XjDhmGYFWMfWe9V5NtFNmXl6tAo66fMzSG6+9k+UEXiF1WrhnzBuks5zFU7z z4WBRL0GmaNBdq58dJoM4lucnuhhQk2m7wz5Lt4o17enw0dAfSXQMstDMnbE7c51 65yZh8o9mxs= =WdYR -----END PGP SIGNATURE----- Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: SoC specific updates" from Arnd Bergmann: "These changes are all specific to an soc family or the code for one soc. Lots of work for Tegra3 this time, but also a lot of other platforms. There will be another (smaller) set of soc patches later in the merge window for stuff that has dependencies on external trees or that was sent just before the merge window opened. The asoc tree added a few devices to the i.mx platform, which conflict with other devices added in the same place here. The tegra Makefile conflicts between a number of branches, mostly because of changes regarding localtimer.c, which was removed in the end. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" Fix up some trivial conflicts, including the mentioned Tegra Makefile. * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits) ARM: EXYNOS: fix cycle count for periodic mode of clock event timers ARM: EXYNOS: add support JPEG ARM: EXYNOS: Add DMC1, allow PPMU access for DMC ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata() ARM: SAMSUNG: Add __init attribute to samsung_bl_set() ARM: S5PV210: Add usb otg phy control ARM: S3C64XX: Add usb otg phy control ARM: EXYNOS: Enable l2 configuration through device tree ARM: EXYNOS: remove useless code to save/restore L2 ARM: EXYNOS: save L2 settings during bootup ARM: S5P: add L2 early resume code ARM: EXYNOS: Add support AFTR mode on EXYNOS4210 ARM: mx35: Setup the AIPS registers ARM: mx5: Use common function for configuring AIPS ARM: mx3: Setup AIPS registers ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE ARM: imx: update imx_v6_v7_defconfig ARM: tegra: Demote EMC clock inconsistency BUG to WARN ...
263 lines
12 KiB
C
263 lines
12 KiB
C
/*
|
|
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
* Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
|
|
*
|
|
* 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
* MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __ARCH_ARM_MACH_MX3_CRM_REGS_H__
|
|
#define __ARCH_ARM_MACH_MX3_CRM_REGS_H__
|
|
|
|
#define CKIH_CLK_FREQ 26000000
|
|
#define CKIH_CLK_FREQ_27MHZ 27000000
|
|
#define CKIL_CLK_FREQ 32768
|
|
|
|
#define MXC_CCM_BASE (cpu_is_mx31() ? \
|
|
MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR) : MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR))
|
|
|
|
/* Register addresses */
|
|
#define MXC_CCM_CCMR (MXC_CCM_BASE + 0x00)
|
|
#define MXC_CCM_PDR0 (MXC_CCM_BASE + 0x04)
|
|
#define MXC_CCM_PDR1 (MXC_CCM_BASE + 0x08)
|
|
#define MX35_CCM_PDR2 (MXC_CCM_BASE + 0x0C)
|
|
#define MXC_CCM_RCSR (MXC_CCM_BASE + 0x0C)
|
|
#define MX35_CCM_PDR3 (MXC_CCM_BASE + 0x10)
|
|
#define MXC_CCM_MPCTL (MXC_CCM_BASE + 0x10)
|
|
#define MX35_CCM_PDR4 (MXC_CCM_BASE + 0x14)
|
|
#define MXC_CCM_UPCTL (MXC_CCM_BASE + 0x14)
|
|
#define MX35_CCM_RCSR (MXC_CCM_BASE + 0x18)
|
|
#define MXC_CCM_SRPCTL (MXC_CCM_BASE + 0x18)
|
|
#define MX35_CCM_MPCTL (MXC_CCM_BASE + 0x1C)
|
|
#define MXC_CCM_COSR (MXC_CCM_BASE + 0x1C)
|
|
#define MX35_CCM_PPCTL (MXC_CCM_BASE + 0x20)
|
|
#define MXC_CCM_CGR0 (MXC_CCM_BASE + 0x20)
|
|
#define MX35_CCM_ACMR (MXC_CCM_BASE + 0x24)
|
|
#define MXC_CCM_CGR1 (MXC_CCM_BASE + 0x24)
|
|
#define MX35_CCM_COSR (MXC_CCM_BASE + 0x28)
|
|
#define MXC_CCM_CGR2 (MXC_CCM_BASE + 0x28)
|
|
#define MX35_CCM_CGR0 (MXC_CCM_BASE + 0x2C)
|
|
#define MXC_CCM_WIMR (MXC_CCM_BASE + 0x2C)
|
|
#define MX35_CCM_CGR1 (MXC_CCM_BASE + 0x30)
|
|
#define MXC_CCM_LDC (MXC_CCM_BASE + 0x30)
|
|
#define MX35_CCM_CGR2 (MXC_CCM_BASE + 0x34)
|
|
#define MXC_CCM_DCVR0 (MXC_CCM_BASE + 0x34)
|
|
#define MX35_CCM_CGR3 (MXC_CCM_BASE + 0x38)
|
|
#define MXC_CCM_DCVR1 (MXC_CCM_BASE + 0x38)
|
|
#define MXC_CCM_DCVR2 (MXC_CCM_BASE + 0x3C)
|
|
#define MXC_CCM_DCVR3 (MXC_CCM_BASE + 0x40)
|
|
#define MXC_CCM_LTR0 (MXC_CCM_BASE + 0x44)
|
|
#define MXC_CCM_LTR1 (MXC_CCM_BASE + 0x48)
|
|
#define MXC_CCM_LTR2 (MXC_CCM_BASE + 0x4C)
|
|
#define MXC_CCM_LTR3 (MXC_CCM_BASE + 0x50)
|
|
#define MXC_CCM_LTBR0 (MXC_CCM_BASE + 0x54)
|
|
#define MXC_CCM_LTBR1 (MXC_CCM_BASE + 0x58)
|
|
#define MXC_CCM_PMCR0 (MXC_CCM_BASE + 0x5C)
|
|
#define MXC_CCM_PMCR1 (MXC_CCM_BASE + 0x60)
|
|
#define MXC_CCM_PDR2 (MXC_CCM_BASE + 0x64)
|
|
|
|
/* Register bit definitions */
|
|
#define MXC_CCM_CCMR_WBEN (1 << 27)
|
|
#define MXC_CCM_CCMR_CSCS (1 << 25)
|
|
#define MXC_CCM_CCMR_PERCS (1 << 24)
|
|
#define MXC_CCM_CCMR_SSI1S_OFFSET 18
|
|
#define MXC_CCM_CCMR_SSI1S_MASK (0x3 << 18)
|
|
#define MXC_CCM_CCMR_SSI2S_OFFSET 21
|
|
#define MXC_CCM_CCMR_SSI2S_MASK (0x3 << 21)
|
|
#define MXC_CCM_CCMR_LPM_OFFSET 14
|
|
#define MXC_CCM_CCMR_LPM_MASK (0x3 << 14)
|
|
#define MXC_CCM_CCMR_LPM_WAIT_MX35 (0x1 << 14)
|
|
#define MXC_CCM_CCMR_FIRS_OFFSET 11
|
|
#define MXC_CCM_CCMR_FIRS_MASK (0x3 << 11)
|
|
#define MXC_CCM_CCMR_UPE (1 << 9)
|
|
#define MXC_CCM_CCMR_SPE (1 << 8)
|
|
#define MXC_CCM_CCMR_MDS (1 << 7)
|
|
#define MXC_CCM_CCMR_SBYCS (1 << 4)
|
|
#define MXC_CCM_CCMR_MPE (1 << 3)
|
|
#define MXC_CCM_CCMR_PRCS_OFFSET 1
|
|
#define MXC_CCM_CCMR_PRCS_MASK (0x3 << 1)
|
|
|
|
#define MXC_CCM_PDR0_CSI_PODF_OFFSET 26
|
|
#define MXC_CCM_PDR0_CSI_PODF_MASK (0x3F << 26)
|
|
#define MXC_CCM_PDR0_CSI_PRDF_OFFSET 23
|
|
#define MXC_CCM_PDR0_CSI_PRDF_MASK (0x7 << 23)
|
|
#define MXC_CCM_PDR0_PER_PODF_OFFSET 16
|
|
#define MXC_CCM_PDR0_PER_PODF_MASK (0x1F << 16)
|
|
#define MXC_CCM_PDR0_HSP_PODF_OFFSET 11
|
|
#define MXC_CCM_PDR0_HSP_PODF_MASK (0x7 << 11)
|
|
#define MXC_CCM_PDR0_NFC_PODF_OFFSET 8
|
|
#define MXC_CCM_PDR0_NFC_PODF_MASK (0x7 << 8)
|
|
#define MXC_CCM_PDR0_IPG_PODF_OFFSET 6
|
|
#define MXC_CCM_PDR0_IPG_PODF_MASK (0x3 << 6)
|
|
#define MXC_CCM_PDR0_MAX_PODF_OFFSET 3
|
|
#define MXC_CCM_PDR0_MAX_PODF_MASK (0x7 << 3)
|
|
#define MXC_CCM_PDR0_MCU_PODF_OFFSET 0
|
|
#define MXC_CCM_PDR0_MCU_PODF_MASK 0x7
|
|
|
|
#define MXC_CCM_PDR1_USB_PRDF_OFFSET 30
|
|
#define MXC_CCM_PDR1_USB_PRDF_MASK (0x3 << 30)
|
|
#define MXC_CCM_PDR1_USB_PODF_OFFSET 27
|
|
#define MXC_CCM_PDR1_USB_PODF_MASK (0x7 << 27)
|
|
#define MXC_CCM_PDR1_FIRI_PRE_PODF_OFFSET 24
|
|
#define MXC_CCM_PDR1_FIRI_PRE_PODF_MASK (0x7 << 24)
|
|
#define MXC_CCM_PDR1_FIRI_PODF_OFFSET 18
|
|
#define MXC_CCM_PDR1_FIRI_PODF_MASK (0x3F << 18)
|
|
#define MXC_CCM_PDR1_SSI2_PRE_PODF_OFFSET 15
|
|
#define MXC_CCM_PDR1_SSI2_PRE_PODF_MASK (0x7 << 15)
|
|
#define MXC_CCM_PDR1_SSI2_PODF_OFFSET 9
|
|
#define MXC_CCM_PDR1_SSI2_PODF_MASK (0x3F << 9)
|
|
#define MXC_CCM_PDR1_SSI1_PRE_PODF_OFFSET 6
|
|
#define MXC_CCM_PDR1_SSI1_PRE_PODF_MASK (0x7 << 6)
|
|
#define MXC_CCM_PDR1_SSI1_PODF_OFFSET 0
|
|
#define MXC_CCM_PDR1_SSI1_PODF_MASK 0x3F
|
|
|
|
/* Bit definitions for RCSR */
|
|
#define MXC_CCM_RCSR_NF16B 0x80000000
|
|
|
|
/*
|
|
* LTR0 register offsets
|
|
*/
|
|
#define MXC_CCM_LTR0_DIV3CK_OFFSET 1
|
|
#define MXC_CCM_LTR0_DIV3CK_MASK (0x3 << 1)
|
|
#define MXC_CCM_LTR0_DNTHR_OFFSET 16
|
|
#define MXC_CCM_LTR0_DNTHR_MASK (0x3F << 16)
|
|
#define MXC_CCM_LTR0_UPTHR_OFFSET 22
|
|
#define MXC_CCM_LTR0_UPTHR_MASK (0x3F << 22)
|
|
|
|
/*
|
|
* LTR1 register offsets
|
|
*/
|
|
#define MXC_CCM_LTR1_PNCTHR_OFFSET 0
|
|
#define MXC_CCM_LTR1_PNCTHR_MASK 0x3F
|
|
#define MXC_CCM_LTR1_UPCNT_OFFSET 6
|
|
#define MXC_CCM_LTR1_UPCNT_MASK (0xFF << 6)
|
|
#define MXC_CCM_LTR1_DNCNT_OFFSET 14
|
|
#define MXC_CCM_LTR1_DNCNT_MASK (0xFF << 14)
|
|
#define MXC_CCM_LTR1_LTBRSR_MASK 0x400000
|
|
#define MXC_CCM_LTR1_LTBRSR_OFFSET 22
|
|
#define MXC_CCM_LTR1_LTBRSR 0x400000
|
|
#define MXC_CCM_LTR1_LTBRSH 0x800000
|
|
|
|
/*
|
|
* LTR2 bit definitions. x ranges from 0 for WSW9 to 6 for WSW15
|
|
*/
|
|
#define MXC_CCM_LTR2_WSW_OFFSET(x) (11 + (x) * 3)
|
|
#define MXC_CCM_LTR2_WSW_MASK(x) (0x7 << \
|
|
MXC_CCM_LTR2_WSW_OFFSET((x)))
|
|
#define MXC_CCM_LTR2_EMAC_OFFSET 0
|
|
#define MXC_CCM_LTR2_EMAC_MASK 0x1FF
|
|
|
|
/*
|
|
* LTR3 bit definitions. x ranges from 0 for WSW0 to 8 for WSW8
|
|
*/
|
|
#define MXC_CCM_LTR3_WSW_OFFSET(x) (5 + (x) * 3)
|
|
#define MXC_CCM_LTR3_WSW_MASK(x) (0x7 << \
|
|
MXC_CCM_LTR3_WSW_OFFSET((x)))
|
|
|
|
#define MXC_CCM_PMCR0_DFSUP1 0x80000000
|
|
#define MXC_CCM_PMCR0_DFSUP1_SPLL (0 << 31)
|
|
#define MXC_CCM_PMCR0_DFSUP1_MPLL (1 << 31)
|
|
#define MXC_CCM_PMCR0_DFSUP0 0x40000000
|
|
#define MXC_CCM_PMCR0_DFSUP0_PLL (0 << 30)
|
|
#define MXC_CCM_PMCR0_DFSUP0_PDR (1 << 30)
|
|
#define MXC_CCM_PMCR0_DFSUP_MASK (0x3 << 30)
|
|
|
|
#define DVSUP_TURBO 0
|
|
#define DVSUP_HIGH 1
|
|
#define DVSUP_MEDIUM 2
|
|
#define DVSUP_LOW 3
|
|
#define MXC_CCM_PMCR0_DVSUP_TURBO (DVSUP_TURBO << 28)
|
|
#define MXC_CCM_PMCR0_DVSUP_HIGH (DVSUP_HIGH << 28)
|
|
#define MXC_CCM_PMCR0_DVSUP_MEDIUM (DVSUP_MEDIUM << 28)
|
|
#define MXC_CCM_PMCR0_DVSUP_LOW (DVSUP_LOW << 28)
|
|
#define MXC_CCM_PMCR0_DVSUP_OFFSET 28
|
|
#define MXC_CCM_PMCR0_DVSUP_MASK (0x3 << 28)
|
|
#define MXC_CCM_PMCR0_UDSC 0x08000000
|
|
#define MXC_CCM_PMCR0_UDSC_MASK (1 << 27)
|
|
#define MXC_CCM_PMCR0_UDSC_UP (1 << 27)
|
|
#define MXC_CCM_PMCR0_UDSC_DOWN (0 << 27)
|
|
|
|
#define MXC_CCM_PMCR0_VSCNT_1 (0x0 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_2 (0x1 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_3 (0x2 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_4 (0x3 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_5 (0x4 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_6 (0x5 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_7 (0x6 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_8 (0x7 << 24)
|
|
#define MXC_CCM_PMCR0_VSCNT_OFFSET 24
|
|
#define MXC_CCM_PMCR0_VSCNT_MASK (0x7 << 24)
|
|
#define MXC_CCM_PMCR0_DVFEV 0x00800000
|
|
#define MXC_CCM_PMCR0_DVFIS 0x00400000
|
|
#define MXC_CCM_PMCR0_LBMI 0x00200000
|
|
#define MXC_CCM_PMCR0_LBFL 0x00100000
|
|
#define MXC_CCM_PMCR0_LBCF_4 (0x0 << 18)
|
|
#define MXC_CCM_PMCR0_LBCF_8 (0x1 << 18)
|
|
#define MXC_CCM_PMCR0_LBCF_12 (0x2 << 18)
|
|
#define MXC_CCM_PMCR0_LBCF_16 (0x3 << 18)
|
|
#define MXC_CCM_PMCR0_LBCF_OFFSET 18
|
|
#define MXC_CCM_PMCR0_LBCF_MASK (0x3 << 18)
|
|
#define MXC_CCM_PMCR0_PTVIS 0x00020000
|
|
#define MXC_CCM_PMCR0_UPDTEN 0x00010000
|
|
#define MXC_CCM_PMCR0_UPDTEN_MASK (0x1 << 16)
|
|
#define MXC_CCM_PMCR0_FSVAIM 0x00008000
|
|
#define MXC_CCM_PMCR0_FSVAI_OFFSET 13
|
|
#define MXC_CCM_PMCR0_FSVAI_MASK (0x3 << 13)
|
|
#define MXC_CCM_PMCR0_DPVCR 0x00001000
|
|
#define MXC_CCM_PMCR0_DPVV 0x00000800
|
|
#define MXC_CCM_PMCR0_WFIM 0x00000400
|
|
#define MXC_CCM_PMCR0_DRCE3 0x00000200
|
|
#define MXC_CCM_PMCR0_DRCE2 0x00000100
|
|
#define MXC_CCM_PMCR0_DRCE1 0x00000080
|
|
#define MXC_CCM_PMCR0_DRCE0 0x00000040
|
|
#define MXC_CCM_PMCR0_DCR 0x00000020
|
|
#define MXC_CCM_PMCR0_DVFEN 0x00000010
|
|
#define MXC_CCM_PMCR0_PTVAIM 0x00000008
|
|
#define MXC_CCM_PMCR0_PTVAI_OFFSET 1
|
|
#define MXC_CCM_PMCR0_PTVAI_MASK (0x3 << 1)
|
|
#define MXC_CCM_PMCR0_DPTEN 0x00000001
|
|
|
|
#define MXC_CCM_PMCR1_DVGP_OFFSET 0
|
|
#define MXC_CCM_PMCR1_DVGP_MASK (0xF)
|
|
|
|
#define MXC_CCM_PMCR1_PLLRDIS (0x1 << 7)
|
|
#define MXC_CCM_PMCR1_EMIRQ_EN (0x1 << 8)
|
|
|
|
#define MXC_CCM_DCVR_ULV_MASK (0x3FF << 22)
|
|
#define MXC_CCM_DCVR_ULV_OFFSET 22
|
|
#define MXC_CCM_DCVR_LLV_MASK (0x3FF << 12)
|
|
#define MXC_CCM_DCVR_LLV_OFFSET 12
|
|
#define MXC_CCM_DCVR_ELV_MASK (0x3FF << 2)
|
|
#define MXC_CCM_DCVR_ELV_OFFSET 2
|
|
|
|
#define MXC_CCM_PDR2_MST2_PDF_MASK (0x3F << 7)
|
|
#define MXC_CCM_PDR2_MST2_PDF_OFFSET 7
|
|
#define MXC_CCM_PDR2_MST1_PDF_MASK 0x3F
|
|
#define MXC_CCM_PDR2_MST1_PDF_OFFSET 0
|
|
|
|
#define MXC_CCM_COSR_CLKOSEL_MASK 0x0F
|
|
#define MXC_CCM_COSR_CLKOSEL_OFFSET 0
|
|
#define MXC_CCM_COSR_CLKOUTDIV_MASK (0x07 << 6)
|
|
#define MXC_CCM_COSR_CLKOUTDIV_OFFSET 6
|
|
#define MXC_CCM_COSR_CLKOEN (1 << 9)
|
|
|
|
/*
|
|
* PMCR0 register offsets
|
|
*/
|
|
#define MXC_CCM_PMCR0_LBFL_OFFSET 20
|
|
#define MXC_CCM_PMCR0_DFSUP0_OFFSET 30
|
|
#define MXC_CCM_PMCR0_DFSUP1_OFFSET 31
|
|
|
|
#endif /* __ARCH_ARM_MACH_MX3_CRM_REGS_H__ */
|