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

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.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3abda7ca 05363093

drivers/memory/samsung/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config SAMSUNG_MC 
if SAMSUNG_MC



config EXYNOS5422_DMC

	tristate "EXYNOS5422 Dynamic Memory Controller driver"

	tristate "Exynos5422 Dynamic Memory Controller driver"

	depends on ARCH_EXYNOS || (COMPILE_TEST && HAS_IOMEM)

	select DDR

	depends on DEVFREQ_GOV_SIMPLE_ONDEMAND

drivers/memory/samsung/exynos-srom.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
// Copyright (c) 2015 Samsung Electronics Co., Ltd.

//	      http://www.samsung.com/

//

// EXYNOS - SROM Controller support

// Exynos - SROM Controller support

// Author: Pankaj Dubey <pankaj.dubey@samsung.com>



#include <linux/io.h>

drivers/memory/samsung/exynos5422-dmc.c

+2 −5
Original line number Diff line number Diff line
@@ -1374,7 +1374,6 @@ static int exynos5_dmc_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct exynos5_dmc *dmc;

	struct resource *res;

	int irq[2];



	dmc = devm_kzalloc(dev, sizeof(*dmc), GFP_KERNEL);
@@ -1386,13 +1385,11 @@ static int exynos5_dmc_probe(struct platform_device *pdev) 
	dmc->dev = dev;

	platform_set_drvdata(pdev, dmc);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dmc->base_drexi0 = devm_ioremap_resource(dev, res);

	dmc->base_drexi0 = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dmc->base_drexi0))

		return PTR_ERR(dmc->base_drexi0);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	dmc->base_drexi1 = devm_ioremap_resource(dev, res);

	dmc->base_drexi1 = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(dmc->base_drexi1))

		return PTR_ERR(dmc->base_drexi1);

drivers/soc/samsung/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# SAMSUNG SoC drivers

# Samsung SoC drivers

#

menuconfig SOC_SAMSUNG

	bool "Samsung SoC driver support" if COMPILE_TEST

drivers/soc/samsung/exynos-chipid.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2019 Samsung Electronics Co., Ltd.

 *	      http://www.samsung.com/

 *

 * EXYNOS - CHIP ID support

 * Exynos - CHIP ID support

 * Author: Pankaj Dubey <pankaj.dubey@samsung.com>

 * Author: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE