From patchwork Thu Aug 24 13:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 805475 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xdPWJ3zLBz9s8V for ; Thu, 24 Aug 2017 22:59:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EB0ACC21E5A; Thu, 24 Aug 2017 12:59:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 15637C21DA9; Thu, 24 Aug 2017 12:58:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C53D8C21DA9; Thu, 24 Aug 2017 12:58:54 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0082.outbound.protection.outlook.com [104.47.42.82]) by lists.denx.de (Postfix) with ESMTPS id B2C12C21D79 for ; Thu, 24 Aug 2017 12:58:52 +0000 (UTC) Received: from BN6PR03CA0012.namprd03.prod.outlook.com (10.168.230.150) by CY4PR03MB3318.namprd03.prod.outlook.com (10.171.246.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18; Thu, 24 Aug 2017 12:58:49 +0000 Received: from BY2FFO11OLC003.protection.gbl (2a01:111:f400:7c0c::189) by BN6PR03CA0012.outlook.office365.com (2603:10b6:404:23::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.8 via Frontend Transport; Thu, 24 Aug 2017 12:58:49 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11OLC003.mail.protection.outlook.com (10.1.15.183) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Thu, 24 Aug 2017 12:58:48 +0000 Received: from b58964-3.am.freescale.net (b58964-3.am.freescale.net [10.29.240.157]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7OCwgH3001086; Thu, 24 Aug 2017 05:58:43 -0700 From: Breno Lima To: , Date: Thu, 24 Aug 2017 10:00:16 -0300 Message-ID: <1503579616-32426-1-git-send-email-breno.lima@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131480531287418234; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(356003)(33646002)(81166006)(626005)(105606002)(8676002)(4326008)(106466001)(68736007)(305945005)(8936002)(5003940100001)(81156014)(50226002)(36756003)(8656003)(6636002)(77096006)(85426001)(498600001)(50986999)(6666003)(47776003)(189998001)(5660300001)(104016004)(97736004)(50466002)(2906002)(48376002)(86362001)(39060400002)(54906002)(53936002)(7416002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB3318; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC003; 1:/B0dV51GUMs9jhM4WLW2/USqvJMjuve983JAwjxWAFL3nstDAxQvdKVoOfk5DC/QgYs7N5eG3ZBpMqm/UU0hFTj94C/txmay/PijosbbeXo8wOXNhHzbgs1SW3XtoAq5 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d6440cc-e93b-4706-257a-08d4eaefdcbb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR03MB3318; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 3:Lr+HblHjvX+fKaEUByIfVAB89tOyXbNdxMS6qLkudNE4U+Wj3Yb1JUx1xztky4ur8qvN3TF3jmZwXfUDn1O7EBEafzMCM9C29880v6XHS7NQ55CraUE+WQBKwYHf7KwvhB3DNmqEQrIU1e54regmuKIarxc1Pjnm2hEtFWOdWy4GPyIswtgMIUlTh4pF3UBKxi/29TB3b6arn7YBjju6Jz63IOS610ny/QesHzPQXDLzQSopl1o63IYfn/DelQlubE4/BYeu07ZIMAMcAoA0j2Jx/dwRY0ZeXj9UDYFpq9E63Nb7IplLia+691Jt+NJnesh1++ZKtqwpaoKu69Qf5wzAq6H/4o8QW7E/15XBqz8=; 25:sdtKXJg8ms3xsQgQsjxPJrYhGSPX698MfUMwrMoNpMDAknE/rIDwLr9WqjbcMpqoEILmVntcimr0NFt1Izz/NrmXhcWZxwzWDYcpKKXwhK+vrrtXg87wRLasssA8AA7kAaXToyK0nnqDx6cRHdX1FzJjE/vFyESpgU4pLLPDS8mITTvJvoeR91PKTIcyWH6VE0H73B+7S7dijzhUEEEjbzIjalgn3vZ+AZ5IuO5L2MetOpY/iYWp3PtMqJ7eK+TmLTnggE0aMG2md1UBS9+CcczWM2qzYWPCHoH+m+iJLUzQMvqK+VyZWVPI0G7jEZe5h/isDWGQS25ve/icnKvIqw== X-MS-TrafficTypeDiagnostic: CY4PR03MB3318: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 31:PDp5fSrhHCIgUNI/Do/RIzHoxd+gJ8gqT/pz7Ofn5UIFnMaDqb+ai2i2t95r3QshxpufyZHLkJpSkYB5zoCmKbJHG2ZQiJPQn+2H8RCtAJe6rckCT6JNDtUOeMwfHHd0VmcKJ1DgCFV32RCmLK9R2B3H5I/5385/7m4Hf1YcxnFNMW0MXs6eExymWFL8YDe9hJN/tN3hJ/iumISo5M6I8OKzbihkeGl2/vVF0OxDrO0=; 4:iTzFcULYtiwOcT3GV4PQHqnlDXVrZ3N08eaC1uwq7IxYnmVPQSpX0T8SomCS5efiZpPAkjv5T/Dm/w2aRs88vvR7f8PDoNXigCY/3Q5b7atjo8iLCBRZ6AEn6P3KKWYPMoZYmL5iZyF8TjHGJ7CzYX8NPVEBp2E4gO42/rAmTh/1EiIyPZAsfJKQasJjByvUnpbByCRb15RNKV5yfcQTDHsOSE8oAzQsGM7NrsqD1gpMxQumuBH2hUjAAOjYI/rpK/By/5zsLVzZHsLQoV+s/sx0CB313j+SHWFwf1d0MSU= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(5005006)(13016025)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123565025)(20161123561025)(20161123563025)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB3318; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB3318; X-Forefront-PRVS: 04097B7F7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB3318; 23:O32yj1kHzja9+f7sA2sMQwSRuaLQeb8VFLd4UFG9P?= =?us-ascii?Q?DziXbglQ5PbkCPEEeyq8S5R/MU109f/uIo7QrRgIpXa7v8XghFVIuU7yuNrO?= =?us-ascii?Q?Kuy9glBYLr3ghWUmVDCv+X3DR+ySJbdfUcSKGsTaBN8JRdUjVLpQjftKJ0ny?= =?us-ascii?Q?YNqXfu9FTyHZX/uFviWaXZj7CbaU4cSPsIz6MzapkmJrwXmeYMdGgwRbSPEK?= =?us-ascii?Q?GcJXzQrSt+f/XiSOCMVxupVaLHnP+lzWEI/qf9PFzk07MxkWHhRsIh1cVG43?= =?us-ascii?Q?AoLKPfbFpjMnFvy8kXNThMwX2Rx6ez/eYQ8yk4RT4i3WAPU700iJ2IBnvqs1?= =?us-ascii?Q?LMBKsrNLGjBuvGhn71Cnh4XGZ9vXXKzhSPucmrRCCC2dtS9c5xOoUemRtnc/?= =?us-ascii?Q?iNJOOuTZfhhD3e+ylJqceVv4JgKatFqjEoJ2CHTdpkNG40wE72vlEC/kQ2LR?= =?us-ascii?Q?KCwfyrIWsu0SaPUuqUioPlNUrg5Ur92DcmzjNsy0e3EpDFnWrgudFTbYoXfH?= =?us-ascii?Q?g+4VIft2qIQEY/GGWhOQar4pANWIStBF4q6GXAjKz+bBqA0IkHobuxqBIm+4?= =?us-ascii?Q?GcKo8/bw3CYfxx76P3zbHaIIJ3iHOPgCdyPebhpF29jsplZOJAajzhOXSUlw?= =?us-ascii?Q?ek/8OzeSQzr/u9GiaNv+5yLoBbsdMI78nMnOCHiSqz3hZo2r+revzuwQ44Bv?= =?us-ascii?Q?0yrixu4hM4SPxp4mk9/KIv0wNVlmCi7zmHyhJmDmn4W7YE+7w5aSEAa9/lGN?= =?us-ascii?Q?7ygg6x7OFkUf6rBkDvr6KJuLvHMpBM951lB+dmKy3yIcMHRihEauoIOFBjge?= =?us-ascii?Q?cIlfSHwfgGGQi9+UsbPi0Vw3+xmVsCJ0oF/ZL8vBChp+BvbzJJl6Qbg4UJZd?= =?us-ascii?Q?viqgTaq0zfswjpzDzxxd0BwsEHU1w+YqMTijQqcwqZuV9WmFI9JlWj2AKvGp?= =?us-ascii?Q?hGXEVhw6QSMR0hlDauNVDAIyMqxebObmKugcU8owauRSgaNBB+vrH3Qk7JFM?= =?us-ascii?Q?aEByD/5Nao2QUU94izopjVPDYXXlvYMg1LGxT39bKqraPtcV5DgYufe68H0T?= =?us-ascii?Q?cQYaw0/QSMuEacGfE6jywhQwM3GQuN6N58nDCFSrpk5O3mNHg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 6:fYhp2yl+izCe8yJD+yf4jUhsUea/pqU0eorgc+F0HDKE+tnd3egJmXARZZICmdAz1wTc+POvbMRHIxmpRjDimJPrJ5tY5VFcWVeKJOlZgCLioPGSPNnf2HyKjSsFPYoTUbGp8HNmA0+8MI0tQNB21zcCnHjcuMB7R1NUk1Txf2PZXkUNwmUX8O8xLn1ZNeqoLe8xZXhp7BowxDEM2LiQnbwR82ZyGpkJ8eM+2bSMYaX1u5KOSp+Rq0qY3saQr/cKX2NqWFgj1JPrdld6s6KS44JaKDIZM+6eLr/eA7CkafGeMwqL62rg5Gu5DqehR4cx1N1yGqYATUopt3jLk87AuQ==; 5:IKnknLzmpuhDpe2aVOPDQ2Y0kYvreREJmt1s3DcmMc4Z7JtRFaXPzH8FQv/a3AMno25ysUXHIlrX9jg4QzyLnYGOrs1ouHhQ3qrJU2e0KYRRBdssyd7eYqj2iOYwoH/33EvPTRrSr7JkuygU5iIoqrzCFvx+fD73INisXG7zYaE=; 24:Lhz6Lw4ebX6uzEwbYC2ExTO6UxxFlCX0znoOV/OgCXLYnUKnMWxxc7WaUiJ1U/b6KNxMX4GPAkhs2FTNMpbxxYzugSpUUBcbsBcCkUXKTcY=; 7:RZKPOuVyGQN9tl/wRBseBzyjZLkQCiJIeqh5KvG+ol0laMoqU0sbyXrEohh8kNV7HXLeKT/8oqtooCbnyNlDOCYgTAGxXzLWPc3Qfm65EmkX9B7GpE4jjI7Z5SLkqOU2JBBkjDG7yp8nxDM4FH0L6AurX2ZBUIAckaRVyT3RfvqM+MKrBMaUlO3URXOZ3AaKth6qrMYHeKWGmqjP4SEh/naH3WJ4q+eR4FnjaVFNH04= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2017 12:58:48.5390 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB3318 Cc: marex@denx.de, albert.u.boot@aribaud.net, Breno Lima , ping.bai@nxp.com, otavio@ossystems.com.br, stefan.agner@toradex.com, u-boot@lists.denx.de, max.krummenacher@toradex.com, sr@denx.de Subject: [U-Boot] [PATCH] imx: imx6: Move gpr_init() function to soc.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Since the gpr_init() function is common for boards using MX6S, MX6DL, MX6D, MX6Q and MX6QP processors move it to the soc.c file. Signed-off-by: Breno Lima Acked-by: Stefano Babic Reviewed-by: Lukasz Majewski Reviewed-by: Fabio Estevam --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 ++ arch/arm/mach-imx/mx6/soc.c | 17 +++++++++++++++++ board/bachmann/ot1200/ot1200.c | 11 ----------- board/barco/platinum/platinum.h | 11 ----------- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 11 ----------- board/el/el6x/el6x.c | 11 ----------- board/engicam/common/spl.c | 11 ----------- board/freescale/mx6sabreauto/mx6sabreauto.c | 17 ----------------- board/freescale/mx6sabresd/mx6sabresd.c | 17 ----------------- board/gateworks/gw_ventana/gw_ventana_spl.c | 11 ----------- board/kosagi/novena/novena_spl.c | 11 ----------- board/liebherr/mccmon6/spl.c | 11 ----------- board/phytec/pcm058/pcm058.c | 12 ------------ board/phytec/pfla02/pfla02.c | 11 ----------- board/solidrun/mx6cuboxi/mx6cuboxi.c | 11 ----------- board/toradex/apalis_imx6/apalis_imx6.c | 11 ----------- board/toradex/colibri_imx6/colibri_imx6.c | 11 ----------- board/udoo/udoo_spl.c | 11 ----------- board/wandboard/spl.c | 11 ----------- 19 files changed, 19 insertions(+), 200 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 046df62..436ba9a 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -85,6 +85,8 @@ static inline u8 imx6_is_bmode_from_gpr9(void) } u32 imx6_src_get_boot_mode(void); +void gpr_init(void); + #endif /* CONFIG_MX6 */ u32 get_nr_cpus(void); diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index 9ede1f5..f8bc05e 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -681,6 +681,23 @@ void imx_setup_hdmi(void) } #endif +void gpr_init(void) +{ + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; + + /* enable AXI cache for VDOA/VPU/IPU */ + writel(0xF00000CF, &iomux->gpr[4]); + if (is_mx6dqp()) { + /* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */ + writel(0x77177717, &iomux->gpr[6]); + writel(0x77177717, &iomux->gpr[7]); + } else { + /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ + writel(0x007F007F, &iomux->gpr[6]); + writel(0x007F007F, &iomux->gpr[7]); + } +} + #ifdef CONFIG_IMX_BOOTAUX int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) { diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index df10d6a..9465cea 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -169,17 +169,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - int board_early_init_f(void) { ccgr_init(); diff --git a/board/barco/platinum/platinum.h b/board/barco/platinum/platinum.h index d3ea8bd..3013ed9 100644 --- a/board/barco/platinum/platinum.h +++ b/board/barco/platinum/platinum.h @@ -75,15 +75,4 @@ static inline void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static inline void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - #endif /* _PLATINUM_H_ */ diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 8cd0090..2ed66d3 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -955,17 +955,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - /* Define a minimal structure so that the part number can be read via SPL */ struct mfgdata { unsigned char tsize; diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index 6b98b5c..fb128f5 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -570,17 +570,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - /* * This section requires the differentiation between iMX6 Sabre boards, but * for now, it will configure only for the mx6q variant. diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index a8a7cf3..29a27ce 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -332,17 +332,6 @@ static void ccgr_init(void) #endif } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(void) { #ifdef CONFIG_MX6QDL diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index f8f77f6..15ca029 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -798,23 +798,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - if (is_mx6dqp()) { - /* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */ - writel(0x77177717, &iomux->gpr[6]); - writel(0x77177717, &iomux->gpr[7]); - } else { - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); - } -} - static int mx6q_dcd_table[] = { 0x020e0798, 0x000C0000, 0x020e0758, 0x00000000, diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 9a562b3..5b50bc8 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -747,23 +747,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - if (is_mx6dqp()) { - /* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */ - writel(0x77177717, &iomux->gpr[6]); - writel(0x77177717, &iomux->gpr[7]); - } else { - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); - } -} - static int mx6q_dcd_table[] = { 0x020e0798, 0x000C0000, 0x020e0758, 0x00000000, diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index 9524da7..c2e370b 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -583,17 +583,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - /* * called from C runtime startup code (arch/arm/lib/crt0.S:_main) * - we have a stack and a place to store GD, both in SRAM diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c index 3645b75..512f06d 100644 --- a/board/kosagi/novena/novena_spl.c +++ b/board/kosagi/novena/novena_spl.c @@ -550,17 +550,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - /* * called from C runtime startup code (arch/arm/lib/crt0.S:_main) * - we have a stack and a place to store GD, both in SRAM diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c index 15844ef..a2f804d 100644 --- a/board/liebherr/mccmon6/spl.c +++ b/board/liebherr/mccmon6/spl.c @@ -260,17 +260,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(void) { if (is_cpu_type(MXC_CPU_MX6SOLO)) { diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c index 4257fbc..1538158 100644 --- a/board/phytec/pcm058/pcm058.c +++ b/board/phytec/pcm058/pcm058.c @@ -487,18 +487,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - - static void spl_dram_init(void) { struct mx6_ddr_sysinfo sysinfo = { diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index 8d2ce63..ec9264d 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -550,17 +550,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(struct mx6_ddr3_cfg *mem_ddr) { struct mx6_ddr_sysinfo sysinfo = { diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index 7e59fb2..986abc5 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -581,17 +581,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(int width) { struct mx6_ddr_sysinfo sysinfo = { diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 2fd9623..ebc6c12 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1160,17 +1160,6 @@ static void ccgr_init(void) writel(0x000000FB, &ccm->ccosr); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void ddr_init(int *table, int size) { int i; diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index d30391f..669d912 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1037,17 +1037,6 @@ static void ccgr_init(void) writel(0x000000FB, &ccm->ccosr); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void ddr_init(int *table, int size) { int i; diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c index e83e7c3..3645969 100644 --- a/board/udoo/udoo_spl.c +++ b/board/udoo/udoo_spl.c @@ -211,17 +211,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000FF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(void) { if (is_cpu_type(MXC_CPU_MX6DL)) { diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c index 47082a8..99a0286 100644 --- a/board/wandboard/spl.c +++ b/board/wandboard/spl.c @@ -266,17 +266,6 @@ static void ccgr_init(void) writel(0x000003FF, &ccm->CCGR6); } -static void gpr_init(void) -{ - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - - /* enable AXI cache for VDOA/VPU/IPU */ - writel(0xF00000CF, &iomux->gpr[4]); - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ - writel(0x007F007F, &iomux->gpr[6]); - writel(0x007F007F, &iomux->gpr[7]); -} - static void spl_dram_init(void) { if (is_cpu_type(MXC_CPU_MX6SOLO)) {