From patchwork Thu Sep 10 10:29:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 516224 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C580F14010F for ; Thu, 10 Sep 2015 20:30:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DED34B765; Thu, 10 Sep 2015 12:30:41 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0kt9ngi1398d; Thu, 10 Sep 2015 12:30:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FEAA4B76A; Thu, 10 Sep 2015 12:30:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9021F4B6F3 for ; Thu, 10 Sep 2015 12:30:07 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B_c7Mowpy-TD for ; Thu, 10 Sep 2015 12:30:07 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0119.outbound.protection.outlook.com [207.46.100.119]) by theia.denx.de (Postfix) with ESMTPS id A1AEF4B6E7 for ; Thu, 10 Sep 2015 12:30:02 +0200 (CEST) Received: from BN3PR0301CA0012.namprd03.prod.outlook.com (10.160.180.150) by DM2PR0301MB0687.namprd03.prod.outlook.com (10.160.96.25) with Microsoft SMTP Server (TLS) id 15.1.262.15; Thu, 10 Sep 2015 10:29:59 +0000 Received: from BL2FFO11FD039.protection.gbl (2a01:111:f400:7c09::178) by BN3PR0301CA0012.outlook.office365.com (2a01:111:e400:4000::22) with Microsoft SMTP Server (TLS) id 15.1.268.17 via Frontend Transport; Thu, 10 Sep 2015 10:29:59 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD039.mail.protection.outlook.com (10.173.161.135) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Thu, 10 Sep 2015 10:29:59 +0000 Received: from linux-jyl1.ap.freescale.net (b51431-11.ap.freescale.net [10.193.102.108]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8AATPbq029949; Thu, 10 Sep 2015 03:29:57 -0700 From: Peng Fan To: Date: Thu, 10 Sep 2015 18:29:03 +0800 Message-ID: <1441880948-18201-7-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1441880948-18201-1-git-send-email-Peng.Fan@freescale.com> References: <1441880948-18201-1-git-send-email-Peng.Fan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD039; 1:dzAjk278EcCjEEWA7ac5djRNAqevFDYK9yNS4oG5FJxrKW/t93kxLlZZJa/cOAHQR0LtyfpVSTfywAGpZCbTj0xZHuUskAapYa69PPh4G93gIMWRgLhneTqGHwhfGA/5tMs2mdc0SF9JvNgd4acQPWia7/uz+RsOqDLqRyRbb33vPU9UzslZOVv81lRmpzBzwjzoG4GvxN5TkaaPhHhlAqPB/W8UzIVjSOgdwKM27e+OlLVotxKB+73yZnJWQdpJiczWQ013AyVuJcuS8hzjwnUkXQ1hOP4kcmx/KILPYmRkTfK2Zi2tYGYZd42LhsMiX4Wwz9YnU+g8Uc09uQ+Qe+Jwa6QA2OubwSyuBqrBOaK57cIujWL5RcgRFkwNRCF74RAgRWN6wFaujvoXt4lL0g== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(19580405001)(62966003)(77096005)(6806004)(19580395003)(50466002)(85426001)(69596002)(50226001)(87936001)(48376002)(5007970100001)(68736005)(76176999)(50986999)(2950100001)(92566002)(47776003)(5001860100001)(110136002)(4001540100001)(64706001)(5001960100002)(97736004)(86362001)(189998001)(46102003)(5001920100001)(5001830100001)(36756003)(81156007)(77156002)(5003940100001)(106466001)(11100500001)(2351001)(229853001)(104016003)(575784001)(105606002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0687; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 2:ch/Xj85mYl1tGSUDlkHtxzNU13F/oWmvyD4w73RnAYjRgE3XrMSUouNIoffq50xIx0uSfLi+tytsAChkBcKERhZarV13yUa/MssemkNEQncBlRIropCeZDE4Uujpc+rrT0HbylOAgy1E+4uC8dlEqmS3zb2om03kUhlKsj/tTlA=; 3:155Vj14oJ4Iapsb/sRojTedkNQM4rUboUy9QvMoQuPgHvnIeCWKTo7ijAAZ20qgU42bWzMAPosptzYU+FqXTq9OdCSkvG+P5PhXadO2lHQ4qc81fSYbtJCVd/6S43u4aHLIIUD2thEwBzQZvtV/b56HgDjM1X5ku/NNQrmm7p9Njw9roFnwyOOB3xTib7T5iSf9mqb1C7rk2vB10Rp4AerXHRVFjNCAEjsrDjGH71jI=; 25:7pFDx0nA52pJW/1/RShvNovyvgpIzKsbTOOSdtNZcUybWCYp1kOZc1W4Z6pK3s3IHfXRvJOyM8Twth1Pgg8HUGveAMo61w29J7z6jsUhy5iCbz9yXXeZssNFwK6RPeiAFdZ5MeQA+sG30amJ6ems8VtwZDfIOoFq/gNHKQW51FhY+mpdZITS1xNZbcUVV4XtCRUsoTYusNiYcm2mU/pBX3Bh5rLib5wjf+dROlRJ3A0/B1xP9d/5UAQHiVQLmvs5p6TVyGBoVih3ZnlfUj/5Jg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0687; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 20:qgzoFCMH2QbEDZKUnTZpIPj7ilC91MetpiiYFSKdOWRskuzvBx1QvQhE9MAIps0N7Im1mfOygck0HvpB9pMt5GFLTJO+2Lp+F6+zFadr5NB1g9/PcLDfhYtSwhgo0k+mawXFLHEX45u+A6vrA5oyjcCzDdUchiQbUau4r4Az/HVVkzD868OrzinpuX8jZsstKtQ8l34wPNO0Hr3Y3/qsYzagIZ2rn5GTQU91WrPNjx8AROLuf5raplT0FV86BMRjea7/OPWKmNCF0g+ap0lef/g1ZpYFrGAwm9XWyu2Ym13MM7SIE7m0nkw0bLoxytTO8D6fjxSZb89/uCHk/VC5WagDq2aLZrbg627snw11fjg=; 4:Q4Sog+KlukUEzC87OOrbN2CkB92aZ9uxmfJmmMVXo27WTte/iCmJLPlaMEeCZLwRdqd8JUm+PapziU65Q1RXpdoOCnXs+x5TO6OSzi+cDCfXVYQ5j5RdvoKvztUroZ4yQ41GnJgpXzgTHXAC3363982Uk2aoX0cRCB1UgYwmIwTU+EtNq+kp+IS7wQz8tsssJGRUIqYjiHtX1T0tkLqUm2xc8Ddp7EegsQr5hMfRyoGUPpS3/f83POdlNS2I3ijMg6Qr4+baGkusFsrXpCIZm8aUWQXHxWEPGE99AWj87YSGFLuLpcM2JG8Qp0ZWrigY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:DM2PR0301MB0687; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0687; X-Forefront-PRVS: 06952FC175 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0687; 23:Xa7dBnXOfjakWE8WN4qjTqsK5kC1JhyfIMIGJvJ?= =?us-ascii?Q?VvEnT2Zxz0TIu2F0GojGHaPs8V6Y0v7Gx1MUTgmHrt3xESeDBxo8Xf1BwWrR?= =?us-ascii?Q?ZK0FFZZmWLUzGJN81vpCgpEPrH08Nug6RiIUU8cDXwnt4Pw6Ck09kmHF43Yk?= =?us-ascii?Q?TbEMTC1eprkzzL2isRq1z74fNaqUYEDMPoXDy+3BoL0QDdA4ixy2+WgWJPMN?= =?us-ascii?Q?BWafQr3yR5i146oDz/vEwSPEgfyh/Zxro/O5BcCVAdlMCVkI2znhMdwNPeyz?= =?us-ascii?Q?M/RXKSDblnTukBYL//fp9G02IiV9oP6J3TIRcemDsjXhTlsC4pWtRexAcizy?= =?us-ascii?Q?8I6jovhxZZ8fGizp+QmEHObK7Uxmklyi8PMvgz/Lld/+VKyoPjM5XLK2cypI?= =?us-ascii?Q?iA9rqcNaA+pZs26rCnojLFSdXIOCUR8ppHQCSVaS/jmPWD4uiowgg7loF9At?= =?us-ascii?Q?nJkbQpaaIN6ykZ1qBAkjgwJfrKYgjU0TSckluaLJ29LZFcpm4YQiqWKM9hHR?= =?us-ascii?Q?4wwy20WjtHRvHhK2DnbfJcjVvPnYRrdtlFKYU1NiqYZvrM2A3lXHcA0LxwW0?= =?us-ascii?Q?RO1M2ExgH30HZD0pWECvkGE6ahh19jpRNukAegEhwEKiVgosKC+AmFtsP601?= =?us-ascii?Q?C13dz4oXFt5S2CoiiA9+n/jCnMUkZ/llBL2sz4Y6MNugZBlyvO+qMSmoc6uV?= =?us-ascii?Q?OM0olvGH3dCH+xPwJVQLp4qKQptFPnUu5jXEO47ivuZ4s8NuLAQU8flxZB56?= =?us-ascii?Q?KwG7zccaJZ+qx4wyKf+L504uBTnFNcJOcXn4FkIlNOmag9adddOcJ1LeWuMm?= =?us-ascii?Q?BBHtwmjW/SmWoNXoyUbr7OdDTS7oMzjEftd/2uB9vIw78kgOgotfLS9HkXDt?= =?us-ascii?Q?0R3ox/7ng/H6Px5Z0Hwf9wr72WPxOypV/PvvsXnViALUyZnqgMnMlOhaKzsJ?= =?us-ascii?Q?A6z5du6xlSbDInpFO2An/AXRWTiwNMK/Whr6AvbEs67qPpc58yiR/Oi8MvGv?= =?us-ascii?Q?PGd25ugXMqZN2piKTEl6shngWI8qX1l/fLi9EH5H6DkHPkA+m5pzGgCSMuqT?= =?us-ascii?Q?5s3xutpppmUx+Lzs+Bm/t3LhHNdEUluXkJu823niq4LGTDMXk7In5LzrsJ1p?= =?us-ascii?Q?Sb4HcURW4pL5nDwAy4+VwvH9m5/i8gL5JrsmEreDGWtdIZfIFovUINXFo1Vj?= =?us-ascii?Q?LLrfda7eeffuM4vpF7ECtwohpkKvEAf2TuJu+SwBYyOE7WcDY11F7q5AMaPm?= =?us-ascii?Q?c4yC2Y6hVGzZsGkxGs/vfVr8sCG2zlTYQTmyTsqJQCVHEelyyhmRnsP/Q14N?= =?us-ascii?Q?obQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 5:zHdw3FrtB8zuxkKo6cRSsjbdpwskzGYgtySFdZl3/UnZ6k4+GlGIrQgyhIaYWCtpCq4p6q8Ou79ZwtyR9oBPbtd/A8M+FiIffdNfUxvYi9r5vgxP0Qre2dX9g6W7wlmSchqnWUUTbf3a6JkXc1ZWQA==; 24:lkyiHrWig24B1AR7ynVO3DlTTODGB16qo/iygenChNpXK7qS2cPTg4/vUuI58DdMBa4KwTfwC7DVXivDckumfnzL4Z5cSQyiXR1jN2nksHw=; 20:C4zqC1yPZLS3FEejKIxlMDL1EqsWfuWz05x3PI2O6HSlCq5UEfD4fOCcc1YmndwVTVam4O+lE7AdC6/q1OMR/Q== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2015 10:29:59.1217 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0687 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 06/11] imx: mx6: crm_reg: add LCDIF related macros X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add i.MX6UL/SX LCDIF related macros. Discard uneccessary '#ifdef xxx'. Signed-off-by: Peng Fan Cc: Stefano Babic --- arch/arm/include/asm/arch-mx6/crm_regs.h | 34 ++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h index 10306cd..13e0a3d 100644 --- a/arch/arm/include/asm/arch-mx6/crm_regs.h +++ b/arch/arm/include/asm/arch-mx6/crm_regs.h @@ -174,6 +174,9 @@ struct mxc_ccm_reg { #define MXC_CCM_CBCMR_GPU3D_SHADER_PODF_OFFSET 29 #define MXC_CCM_CBCMR_GPU3D_CORE_PODF_MASK (0x7 << 26) #define MXC_CCM_CBCMR_GPU3D_CORE_PODF_OFFSET 26 +/* LCDIF on i.MX6SX/UL */ +#define MXC_CCM_CBCMR_LCDIF1_PODF_MASK (0x7 << 23) +#define MXC_CCM_CBCMR_LCDIF1_PODF_OFFSET 23 #define MXC_CCM_CBCMR_GPU2D_CORE_PODF_MASK (0x7 << 23) #define MXC_CCM_CBCMR_GPU2D_CORE_PODF_OFFSET 23 #define MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_MASK (0x3 << 21) @@ -210,7 +213,10 @@ struct mxc_ccm_reg { #define MXC_CCM_CSCMR1_ACLK_EMI_OFFSET 27 #define MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK (0x7 << 23) #define MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_OFFSET 23 -/* ACLK_EMI_PODF is LCFIF2_PODF on MX6SX */ +/* LCFIF2_PODF on i.MX6SX */ +#define MXC_CCM_CSCMR1_LCDIF2_PODF_MASK (0x7 << 20) +#define MXC_CCM_CSCMR1_LCDIF2_PODF_OFFSET 20 +/* ACLK_EMI on i.MX6DQ/SDL/DQP */ #define MXC_CCM_CSCMR1_ACLK_EMI_PODF_MASK (0x7 << 20) #define MXC_CCM_CSCMR1_ACLK_EMI_PODF_OFFSET 20 /* CSCMR1_GPMI/BCH exist on i.MX6UL */ @@ -400,6 +406,20 @@ struct mxc_ccm_reg { #define MXC_CCM_CSCDR2_ECSPI_CLK_PODF_OFFSET 19 /* ECSPI_CLK_SEL exists on i.MX6SX/SL/QP */ #define MXC_CCM_CSCDR2_ECSPI_CLK_SEL_MASK (0x1 << 18) +/* LCDIF1 on i.MX6SX/UL */ +#define MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_MASK (0x7 << 15) +#define MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_OFFSET 15 +#define MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_MASK (0x7 << 12) +#define MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_OFFSET 12 +#define MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK (0x7 << 9) +#define MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_OFFSET 9 +/* LCDIF2 on i.MX6SX */ +#define MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_MASK (0x7 << 6) +#define MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_OFFSET 6 +#define MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_MASK (0x7 << 3) +#define MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_OFFSET 3 +#define MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_MASK (0x7 << 0) +#define MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_OFFSET 0 /* All IPU2_DI1 are LCDIF1 on MX6SX */ #define MXC_CCM_CHSCCDR_IPU2_DI1_PRE_CLK_SEL_MASK (0x7 << 15) @@ -622,17 +642,16 @@ struct mxc_ccm_reg { #define MXC_CCM_CCGR2_IPMUX3_MASK (3 << MXC_CCM_CCGR2_IPMUX3_OFFSET) #define MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC1_IPGS_OFFSET 22 #define MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC1_IPGS_MASK (3 << MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC1_IPGS_OFFSET) -#ifdef CONFIG_MX6SX +/* i.MX6SX/UL LCD and PXP */ #define MXC_CCM_CCGR2_LCD_OFFSET 28 #define MXC_CCM_CCGR2_LCD_MASK (3 << MXC_CCM_CCGR2_LCD_OFFSET) #define MXC_CCM_CCGR2_PXP_OFFSET 30 #define MXC_CCM_CCGR2_PXP_MASK (3 << MXC_CCM_CCGR2_PXP_OFFSET) -#else + #define MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC2_IPG_OFFSET 24 #define MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC2_IPG_MASK (3 << MXC_CCM_CCGR2_IPSYNC_IP2APB_TZASC2_IPG_OFFSET) #define MXC_CCM_CCGR2_IPSYNC_VDOA_IPG_MASTER_CLK_OFFSET 26 #define MXC_CCM_CCGR2_IPSYNC_VDOA_IPG_MASTER_CLK_MASK (3 << MXC_CCM_CCGR2_IPSYNC_VDOA_IPG_MASTER_CLK_OFFSET) -#endif /* Exist on i.MX6SX */ #define MXC_CCM_CCGR3_M4_OFFSET 2 @@ -685,6 +704,13 @@ struct mxc_ccm_reg { #define MXC_CCM_CCGR3_MMDC_CORE_IPG_CLK_P0_MASK (3 << MXC_CCM_CCGR3_MMDC_CORE_IPG_CLK_P0_OFFSET) #define MXC_CCM_CCGR3_MMDC_CORE_IPG_CLK_P1_OFFSET 26 #define MXC_CCM_CCGR3_MMDC_CORE_IPG_CLK_P1_MASK (3 << MXC_CCM_CCGR3_MMDC_CORE_IPG_CLK_P1_OFFSET) + +#define MXC_CCM_CCGR3_DISP_AXI_OFFSET 6 +#define MXC_CCM_CCGR3_DISP_AXI_MASK (3 << MXC_CCM_CCGR3_DISP_AXI_OFFSET) +#define MXC_CCM_CCGR3_LCDIF2_PIX_OFFSET 8 +#define MXC_CCM_CCGR3_LCDIF2_PIX_MASK (3 << MXC_CCM_CCGR3_LCDIF2_PIX_OFFSET) +#define MXC_CCM_CCGR3_LCDIF1_PIX_OFFSET 10 +#define MXC_CCM_CCGR3_LCDIF1_PIX_MASK (3 << MXC_CCM_CCGR3_LCDIF1_PIX_OFFSET) /* AXI on i.MX6UL */ #define MXC_CCM_CCGR3_AXI_CLK_OFFSET 28 #define MXC_CCM_CCGR3_AXI_CLK_MASK (3 << MXC_CCM_CCGR3_AXI_CLK_OFFSET)