Skip to content

L
linux
Commit 06d3d727 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'samsung-drivers-5.6' of... 

Merge tag 'samsung-drivers-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers

Samsung soc drivers changes for v5.6

1. Convert to managed (devm_x()) versions,
2. Cleanups (Samsung and Exynos names).

* tag 'samsung-drivers-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  memory: samsung: Rename Exynos to lowercase
  soc: samsung: Rename Samsung and Exynos to lowercase
  memory: samsung: exynos5422-dmc: Convert to devm_platform_ioremap_resource
  soc: samsung: exynos-pmu: Convert to devm_platform_ioremap_resource

Link: https://lore.kernel.org/r/20200110172334.4767-2-krzk@kernel.orgSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3abda7ca 05363093
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 27 deletions
drivers/memory/samsung/Kconfig
View file @ 06d3d727
...@@ -8,7 +8,7 @@ config SAMSUNG_MC ...@@ -8,7 +8,7 @@ config SAMSUNG_MC
if SAMSUNG_MC if SAMSUNG_MC
config EXYNOS5422_DMC config EXYNOS5422_DMC
tristate "EXYNOS5422 Dynamic Memory Controller driver" tristate "Exynos5422 Dynamic Memory Controller driver"
depends on ARCH_EXYNOS || (COMPILE_TEST && HAS_IOMEM) depends on ARCH_EXYNOS || (COMPILE_TEST && HAS_IOMEM)
select DDR select DDR
depends on DEVFREQ_GOV_SIMPLE_ONDEMAND depends on DEVFREQ_GOV_SIMPLE_ONDEMAND
......
drivers/memory/samsung/exynos-srom.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2015 Samsung Electronics Co., Ltd. // Copyright (c) 2015 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS - SROM Controller support // Exynos - SROM Controller support
// Author: Pankaj Dubey <pankaj.dubey@samsung.com> // Author: Pankaj Dubey <pankaj.dubey@samsung.com>
#include <linux/io.h> #include <linux/io.h>
......
drivers/memory/samsung/exynos5422-dmc.c
View file @ 06d3d727
...@@ -1374,7 +1374,6 @@ static int exynos5_dmc_probe(struct platform_device *pdev) ...@@ -1374,7 +1374,6 @@ static int exynos5_dmc_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct exynos5_dmc *dmc; struct exynos5_dmc *dmc;
struct resource *res;
int irq[2]; int irq[2];
dmc = devm_kzalloc(dev, sizeof(*dmc), GFP_KERNEL); dmc = devm_kzalloc(dev, sizeof(*dmc), GFP_KERNEL);
...@@ -1386,13 +1385,11 @@ static int exynos5_dmc_probe(struct platform_device *pdev) ...@@ -1386,13 +1385,11 @@ static int exynos5_dmc_probe(struct platform_device *pdev)
dmc->dev = dev; dmc->dev = dev;
platform_set_drvdata(pdev, dmc); platform_set_drvdata(pdev, dmc);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dmc->base_drexi0 = devm_platform_ioremap_resource(pdev, 0);
dmc->base_drexi0 = devm_ioremap_resource(dev, res);
if (IS_ERR(dmc->base_drexi0)) if (IS_ERR(dmc->base_drexi0))
return PTR_ERR(dmc->base_drexi0); return PTR_ERR(dmc->base_drexi0);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); dmc->base_drexi1 = devm_platform_ioremap_resource(pdev, 1);
dmc->base_drexi1 = devm_ioremap_resource(dev, res);
if (IS_ERR(dmc->base_drexi1)) if (IS_ERR(dmc->base_drexi1))
return PTR_ERR(dmc->base_drexi1); return PTR_ERR(dmc->base_drexi1);
......
drivers/soc/samsung/Kconfig
View file @ 06d3d727
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# #
# SAMSUNG SoC drivers # Samsung SoC drivers
# #
menuconfig SOC_SAMSUNG menuconfig SOC_SAMSUNG
bool "Samsung SoC driver support" if COMPILE_TEST bool "Samsung SoC driver support" if COMPILE_TEST
......
drivers/soc/samsung/exynos-chipid.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2019 Samsung Electronics Co., Ltd. * Copyright (c) 2019 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* EXYNOS - CHIP ID support * Exynos - CHIP ID support
* Author: Pankaj Dubey <pankaj.dubey@samsung.com> * Author: Pankaj Dubey <pankaj.dubey@samsung.com>
* Author: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> * Author: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
*/ */
......
drivers/soc/samsung/exynos-pmu.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS - CPU PMU(Power Management Unit) support // Exynos - CPU PMU(Power Management Unit) support
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
...@@ -110,10 +110,8 @@ EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap); ...@@ -110,10 +110,8 @@ EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap);
static int exynos_pmu_probe(struct platform_device *pdev) static int exynos_pmu_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); pmu_base_addr = devm_platform_ioremap_resource(pdev, 0);
pmu_base_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pmu_base_addr)) if (IS_ERR(pmu_base_addr))
return PTR_ERR(pmu_base_addr); return PTR_ERR(pmu_base_addr);
......
drivers/soc/samsung/exynos-pmu.h
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2015 Samsung Electronics Co., Ltd. * Copyright (c) 2015 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* Header for EXYNOS PMU Driver support * Header for Exynos PMU Driver support
*/ */
#ifndef __EXYNOS_PMU_H #ifndef __EXYNOS_PMU_H
......
drivers/soc/samsung/exynos3250-pmu.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2015 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2015 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS3250 - CPU PMU (Power Management Unit) support // Exynos3250 - CPU PMU (Power Management Unit) support
#include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-regs-pmu.h>
#include <linux/soc/samsung/exynos-pmu.h> #include <linux/soc/samsung/exynos-pmu.h>
......
drivers/soc/samsung/exynos4-pmu.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2015 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2015 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS4 - CPU PMU(Power Management Unit) support // Exynos4 - CPU PMU(Power Management Unit) support
#include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-regs-pmu.h>
#include <linux/soc/samsung/exynos-pmu.h> #include <linux/soc/samsung/exynos-pmu.h>
......
drivers/soc/samsung/exynos5250-pmu.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2015 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2015 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS5250 - CPU PMU (Power Management Unit) support // Exynos5250 - CPU PMU (Power Management Unit) support
#include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-regs-pmu.h>
#include <linux/soc/samsung/exynos-pmu.h> #include <linux/soc/samsung/exynos-pmu.h>
......
drivers/soc/samsung/exynos5420-pmu.c
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2015 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2015 Samsung Electronics Co., Ltd.
// http://www.samsung.com/ // http://www.samsung.com/
// //
// EXYNOS5420 - CPU PMU (Power Management Unit) support // Exynos5420 - CPU PMU (Power Management Unit) support
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/soc/samsung/exynos-regs-pmu.h> #include <linux/soc/samsung/exynos-regs-pmu.h>
......
include/linux/soc/samsung/exynos-pmu.h
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2014 Samsung Electronics Co., Ltd. * Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* Header for EXYNOS PMU Driver support * Header for Exynos PMU Driver support
*/ */
#ifndef __LINUX_SOC_EXYNOS_PMU_H #ifndef __LINUX_SOC_EXYNOS_PMU_H
......
include/linux/soc/samsung/exynos-regs-pmu.h
View file @ 06d3d727
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2010-2015 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2015 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* EXYNOS - Power management unit definition * Exynos - Power management unit definition
* *
* Notice: * Notice:
* This is not a list of all Exynos Power Management Unit SFRs. * This is not a list of all Exynos Power Management Unit SFRs.
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
/* Only for S5Pv210 */ /* Only for S5Pv210 */
#define S5PV210_EINT_WAKEUP_MASK 0xC004 #define S5PV210_EINT_WAKEUP_MASK 0xC004
/* Only for EXYNOS4210 */ /* Only for Exynos4210 */
#define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154 #define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154
#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174 #define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
#define S5P_MODIMIF_MEM_LOWPWR 0x11C4 #define S5P_MODIMIF_MEM_LOWPWR 0x11C4
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
#define S5P_SATA_MEM_LOWPWR 0x11E4 #define S5P_SATA_MEM_LOWPWR 0x11E4
#define S5P_LCD1_LOWPWR 0x1394 #define S5P_LCD1_LOWPWR 0x1394
/* Only for EXYNOS4x12 */ /* Only for Exynos4x12 */
#define S5P_ISP_ARM_LOWPWR 0x1050 #define S5P_ISP_ARM_LOWPWR 0x1050
#define S5P_DIS_IRQ_ISP_ARM_LOCAL_LOWPWR 0x1054 #define S5P_DIS_IRQ_ISP_ARM_LOCAL_LOWPWR 0x1054
#define S5P_DIS_IRQ_ISP_ARM_CENTRAL_LOWPWR 0x1058 #define S5P_DIS_IRQ_ISP_ARM_CENTRAL_LOWPWR 0x1058
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
#define S5P_SECSS_MEM_OPTION 0x2EC8 #define S5P_SECSS_MEM_OPTION 0x2EC8
#define S5P_ROTATOR_MEM_OPTION 0x2F48 #define S5P_ROTATOR_MEM_OPTION 0x2F48
/* Only for EXYNOS4412 */ /* Only for Exynos4412 */
#define S5P_ARM_CORE2_LOWPWR 0x1020 #define S5P_ARM_CORE2_LOWPWR 0x1020
#define S5P_DIS_IRQ_CORE2 0x1024 #define S5P_DIS_IRQ_CORE2 0x1024
#define S5P_DIS_IRQ_CENTRAL2 0x1028 #define S5P_DIS_IRQ_CENTRAL2 0x1028
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
#define S5P_DIS_IRQ_CORE3 0x1034 #define S5P_DIS_IRQ_CORE3 0x1034
#define S5P_DIS_IRQ_CENTRAL3 0x1038 #define S5P_DIS_IRQ_CENTRAL3 0x1038
/* Only for EXYNOS3XXX */ /* Only for Exynos3XXX */
#define EXYNOS3_ARM_CORE0_SYS_PWR_REG 0x1000 #define EXYNOS3_ARM_CORE0_SYS_PWR_REG 0x1000
#define EXYNOS3_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG 0x1004 #define EXYNOS3_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG 0x1004
#define EXYNOS3_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG 0x1008 #define EXYNOS3_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG 0x1008
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
#define EXYNOS3_OPTION_USE_SC_FEEDBACK (1 << 1) #define EXYNOS3_OPTION_USE_SC_FEEDBACK (1 << 1)
#define EXYNOS3_OPTION_SKIP_DEACTIVATE_ACEACP_IN_PWDN (1 << 7) #define EXYNOS3_OPTION_SKIP_DEACTIVATE_ACEACP_IN_PWDN (1 << 7)
/* For EXYNOS5 */ /* For Exynos5 */
#define EXYNOS5_AUTO_WDTRESET_DISABLE 0x0408 #define EXYNOS5_AUTO_WDTRESET_DISABLE 0x0408
#define EXYNOS5_MASK_WDTRESET_REQUEST 0x040C #define EXYNOS5_MASK_WDTRESET_REQUEST 0x040C
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
#define EXYNOS5420_SWRESET_KFC_SEL 0x3 #define EXYNOS5420_SWRESET_KFC_SEL 0x3
/* Only for EXYNOS5420 */ /* Only for Exynos5420 */
#define EXYNOS5420_L2RSTDISABLE_VALUE BIT(3) #define EXYNOS5420_L2RSTDISABLE_VALUE BIT(3)
#define EXYNOS5420_LPI_MASK 0x0004 #define EXYNOS5420_LPI_MASK 0x0004
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
| EXYNOS5420_KFC_USE_STANDBY_WFI2 \ | EXYNOS5420_KFC_USE_STANDBY_WFI2 \
| EXYNOS5420_KFC_USE_STANDBY_WFI3) | EXYNOS5420_KFC_USE_STANDBY_WFI3)
/* For EXYNOS5433 */ /* For Exynos5433 */
#define EXYNOS5433_EINT_WAKEUP_MASK (0x060C) #define EXYNOS5433_EINT_WAKEUP_MASK (0x060C)
#define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728) #define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
#define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028) #define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7