From patchwork Mon Jan 5 09:29:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 5566101 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9EF1BBF6C3 for ; Mon, 5 Jan 2015 09:36:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96E3220172 for ; Mon, 5 Jan 2015 09:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 368852015A for ; Mon, 5 Jan 2015 09:36:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbbAEJgk (ORCPT ); Mon, 5 Jan 2015 04:36:40 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:35977 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133AbbAEJgj (ORCPT ); Mon, 5 Jan 2015 04:36:39 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NHP00D216P23R10@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 05 Jan 2015 18:36:38 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 82.29.19034.62B5AA45; Mon, 05 Jan 2015 18:36:38 +0900 (KST) X-AuditID: cbfee691-f79b86d000004a5a-bf-54aa5b263f3d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 97.1B.09430.62B5AA45; Mon, 05 Jan 2015 18:36:38 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NHP001LS6OOIH90@mmp2.samsung.com>; Mon, 05 Jan 2015 18:36:37 +0900 (KST) From: Pankaj Dubey To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kgene@kernel.org, linux@arm.linux.org.uk, b.zolnierkie@samsung.com, thomas.ab@samsung.com, Pankaj Dubey Subject: [RESEND PATCH v6] ARM: EXYNOS: Remove i2c sys configuration related code Date: Mon, 05 Jan 2015 14:59:06 +0530 Message-id: <1420450146-27112-1-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.2.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRsSkTlctelWIwe6TkhYbZ6xnteh//JrZ YtPja6wWM87vY7K4fZnXYtHWL+wWHcsYHdg9Wpp72Dw2repk89i8pN6jb8sqRo/Pm+QCWKO4 bFJSczLLUov07RK4Ms7u3sFcsEG3YvKcvAbGmypdjJwcEgImEl1PH7JA2GISF+6tZ+ti5OIQ EljKKHHoTC97FyMHWNH9ZYIQ8emMEjPe7YUqmsAkMePkajaQbjYBXYkn7+cygzSICHhLLL+m CFLDLNDBKHHs4T5WkBphgWCJvZPOsYPYLAKqEovX7WcCsXkFPCS+TjzBBnGFnMSWW4/YQZol BP6zSeyb2cMI0SAg8W3yIRaIi2QlNh1ghqiXlDi44gbLBEbBBYwMqxhFUwuSC4qT0otM9YoT c4tL89L1kvNzNzECw/X0v2cTdzDeP2B9iFGAg1GJh9fjxMoQIdbEsuLK3EOMpkAbJjJLiSbn A6MiryTe0NjMyMLUxNTYyNzSTEmcV0f6Z7CQQHpiSWp2ampBalF8UWlOavEhRiYOTqkGRrtC 3dqni96pZx11zr2kHHZPRsH85IZSKQPtXPb8El2nzdXv9i0LiWWzY97s4xg9j/n4S38ty4DL zBPez2N5oyNx6WuKbM/0tNbk+BVfNycem/U088CR2QtvVClK2ih3qXWoB//0Tmt2vvCswvZZ OWv3nZ+XXl+SavBefkM4KDV9frqCvmCXEktxRqKhFnNRcSIANufi4FICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoK5a9KoQgwUzBCw2zljPatH/+DWz xabH11gtZpzfx2Rx+zKvxaKtX9gtOpYxOrB7tDT3sHlsWtXJ5rF5Sb1H35ZVjB6fN8kFsEY1 MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAB2hpFCW mFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcw4u3sHc8EG3YrJc/IaGG+qdDFy cEgImEjcXybYxcgJZIpJXLi3nq2LkYtDSGA6o8SMd3uhnAlMEjNOrmYDqWIT0JV48n4uM0iz iIC3xPJriiA1zAIdjBLHHu5jBakRFgiW2DvpHDuIzSKgKrF43X4mEJtXwEPi68QTbBDb5CS2 3HrEPoGRewEjwypG0dSC5ILipPRcI73ixNzi0rx0veT83E2M4Gh4Jr2DcVWDxSFGAQ5GJR5e jxMrQ4RYE8uKK3MPMUpwMCuJ8K67BRTiTUmsrEotyo8vKs1JLT7EaAq0fSKzlGhyPjBS80ri DY1NzE2NTS1NLEzMLJXEeZXs20KEBNITS1KzU1MLUotg+pg4OKUaGLfcf7wkVd1hcpF++IuK NwnVT56apJ12WSKxUT2u+8CxmZE7HO6dbH5qYPPyvdvqx94KdTNWn07aIP7uxSFG0St7dn+a LCYh2nxzts+WxPDL3dHT0yxleiokPt/QCpSqnHkp6L71Wu2HU06omMzdNStr5rMHJzUuHTrL /DJo90vmmqYJCyyzVcWVWIozEg21mIuKEwFje+sHnAIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As all these code has been moved into i2c driver, now we can safely remove them from machine files. CC: Russell King Signed-off-by: Pankaj Dubey --- This patch is leftover patch from patch series [1], resending it after rebasing. It can be cleanly applied on kgene/for-next and linux-next/next-20150103. [1]: http://www.spinics.net/lists/linux-samsung-soc/msg39440.html arch/arm/mach-exynos/exynos.c | 39 ++------------------------------- arch/arm/mach-exynos/include/mach/map.h | 3 --- arch/arm/mach-exynos/pm.c | 3 ++- arch/arm/mach-exynos/regs-sys.h | 22 ------------------- arch/arm/mach-exynos/suspend.c | 7 ------ 5 files changed, 4 insertions(+), 70 deletions(-) delete mode 100644 arch/arm/mach-exynos/regs-sys.h diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index c13d083..2c84439 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -27,20 +27,16 @@ #include #include +#include + #include "common.h" #include "mfc.h" #include "regs-pmu.h" -#include "regs-sys.h" void __iomem *pmu_base_addr; static struct map_desc exynos4_iodesc[] __initdata = { { - .virtual = (unsigned long)S3C_VA_SYS, - .pfn = __phys_to_pfn(EXYNOS4_PA_SYSCON), - .length = SZ_64K, - .type = MT_DEVICE, - }, { .virtual = (unsigned long)S5P_VA_SROMC, .pfn = __phys_to_pfn(EXYNOS4_PA_SROMC), .length = SZ_4K, @@ -70,11 +66,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { static struct map_desc exynos5_iodesc[] __initdata = { { - .virtual = (unsigned long)S3C_VA_SYS, - .pfn = __phys_to_pfn(EXYNOS5_PA_SYSCON), - .length = SZ_64K, - .type = MT_DEVICE, - }, { .virtual = (unsigned long)S5P_VA_SROMC, .pfn = __phys_to_pfn(EXYNOS5_PA_SROMC), .length = SZ_4K, @@ -213,32 +204,6 @@ static void __init exynos_init_irq(void) static void __init exynos_dt_machine_init(void) { - struct device_node *i2c_np; - const char *i2c_compat = "samsung,s3c2440-i2c"; - unsigned int tmp; - int id; - - /* - * Exynos5's legacy i2c controller and new high speed i2c - * controller have muxed interrupt sources. By default the - * interrupts for 4-channel HS-I2C controller are enabled. - * If node for first four channels of legacy i2c controller - * are available then re-configure the interrupts via the - * system register. - */ - if (soc_is_exynos5()) { - for_each_compatible_node(i2c_np, NULL, i2c_compat) { - if (of_device_is_available(i2c_np)) { - id = of_alias_get_id(i2c_np, "i2c"); - if (id < 4) { - tmp = readl(EXYNOS5_SYS_I2C_CFG); - writel(tmp & ~(0x1 << id), - EXYNOS5_SYS_I2C_CFG); - } - } - } - } - /* * This is called from smp_prepare_cpus if we've built for SMP, but * we still need to set it up for PM and firmware ops if not. diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 1ad3f49..de3ae59 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -24,9 +24,6 @@ #define EXYNOS_PA_CHIPID 0x10000000 -#define EXYNOS4_PA_SYSCON 0x10010000 -#define EXYNOS5_PA_SYSCON 0x10050100 - #define EXYNOS4_PA_CMU 0x10030000 #define EXYNOS5_PA_CMU 0x10010000 diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 86f3ecd..dfc8594 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -23,12 +23,13 @@ #include #include +#include + #include #include "common.h" #include "exynos-pmu.h" #include "regs-pmu.h" -#include "regs-sys.h" static inline void __iomem *exynos_boot_vector_addr(void) { diff --git a/arch/arm/mach-exynos/regs-sys.h b/arch/arm/mach-exynos/regs-sys.h deleted file mode 100644 index 84332b0..0000000 --- a/arch/arm/mach-exynos/regs-sys.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS - system register definition - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_REGS_SYS_H -#define __ASM_ARCH_REGS_SYS_H __FILE__ - -#include - -#define S5P_SYSREG(x) (S3C_VA_SYS + (x)) - -/* For EXYNOS5 */ -#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234) - -#endif /* __ASM_ARCH_REGS_SYS_H */ diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index f8e7dcd..342797b 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -34,7 +34,6 @@ #include "common.h" #include "regs-pmu.h" -#include "regs-sys.h" #include "exynos-pmu.h" #define S5P_CHECK_SLEEP 0x00000BAD @@ -53,10 +52,6 @@ struct exynos_wkup_irq { u32 mask; }; -static struct sleep_save exynos5_sys_save[] = { - SAVE_ITEM(EXYNOS5_SYS_I2C_CFG), -}; - static struct sleep_save exynos_core_save[] = { /* SROM side */ SAVE_ITEM(S5P_SROM_BW), @@ -497,8 +492,6 @@ static const struct exynos_pm_data exynos5250_pm_data = { .wkup_irq = exynos5250_wkup_irq, .wake_disable_mask = ((0xFF << 8) | (0x1F << 1)), .release_ret_regs = exynos_release_ret_regs, - .extra_save = exynos5_sys_save, - .num_extra_save = ARRAY_SIZE(exynos5_sys_save), .pm_suspend = exynos_pm_suspend, .pm_resume = exynos_pm_resume, .pm_prepare = exynos_pm_prepare,