Commit ab274a7e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-5.9' of... 

Merge tag 'memory-controller-drv-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers

Memory controller drivers for v5.9

The drivers/memory directory with memory controller drivers, over the
last days grew in numbers but lacked any coordinated care.  The generic
part (device tree helpers) were pulled in through various trees,
depending on driver needs.

The patchset is a first try to improve code quality of memory controller
drivers.  Mostly these are non-intrusive fixes for GCC, checkpatch or
sparse warnings.  This also fixes missing SPDX tags or improves generic
code quality (whitespace, const correctness).

Last commit appoints also Krzysztof Kozlowski as a maintainer.

* tag 'memory-controller-drv-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (22 commits)
  MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory controllers
  memory: samsung: exynos-srom: Describe the Kconfig entry
  memory: Describe the MEMORY Kconfig entry
  memory: da8xx-ddrctl: Remove unused 'node' variable
  memory: fsl_ifc: Fix whitespace issues
  memory: pl172: Add GPLv2 SPDX license header
  memory: omap-gpmc: Fix whitespace issue
  memory: omap-gpmc: Include <linux/sizes.h> for SZ_16M
  memory: mtk-smi: Add argument to function pointer definition
  memory: brcmstb_dpfe: Remove unneeded braces
  memory: brcmstb_dpfe: Constify the contents of string
  memory: ti-emif-pm: Fix cast to iomem pointer
  memory: ti-aemif: Rename SS to SSTROBE to avoid name conflicts
  memory: emif: Silence platform_get_irq() error in driver
  memory: emif: Fix whitespace coding style violations
  memory: emif: Put constant in comparison on the right side
  memory: emif-asm-offsets: Add GPLv2 SPDX license header
  memory: of: Remove unneeded extern from function declarations
  memory: of: Correct indentation
  memory: of: Remove __func__ in device related messages
  ...

Link: https://lore.kernel.org/r/20200724160314.8543-1-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1d4eadaf 8a9ff875

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -11085,6 +11085,13 @@ F: Documentation/core-api/boot-time-mm.rst 
F:	include/linux/memblock.h

F:	mm/memblock.c













MEMORY CONTROLLER DRIVERS













M:	Krzysztof Kozlowski <krzk@kernel.org>













L:	linux-kernel@vger.kernel.org













S:	Maintained













F:	Documentation/devicetree/bindings/memory-controllers/













F:	drivers/memory/



























MEMORY MANAGEMENT















M:	Andrew Morton <akpm@linux-foundation.org>















L:	linux-mm@kvack.org

































drivers/memory/Kconfig



+6
−0






























Original line number
Diff line number
Diff line








@@ -5,6 +5,12 @@





























menuconfig MEMORY















	bool "Memory Controller drivers"













	help













	  This option allows to enable specific memory controller drivers,













	  useful mostly on embedded systems.  These could be controllers













	  for DRAM (SDR, DDR), ROM, SRAM and others.  The drivers features













	  vary from memory tuning and frequency scaling to enabling













	  access to attached peripherals through memory bus.































if MEMORY

















































drivers/memory/brcmstb_dpfe.c



+2
−3






























Original line number
Diff line number
Diff line








@@ -188,7 +188,7 @@ struct brcmstb_dpfe_priv {













	struct mutex lock;















};





























static const char *error_text[] = {













static const char * const error_text[] = {















	"Success", "Header code incorrect", "Unknown command or argument",















	"Incorrect checksum", "Malformed command", "Timed out",















};










@@ -379,9 +379,8 @@ static void __iomem *get_msg_ptr(struct brcmstb_dpfe_priv *priv, u32 response,













	void __iomem *ptr = NULL;































	/* There is no need to use this function for API v3 or later. */













	if (unlikely(priv->dpfe_api->version >= 3)) {













	if (unlikely(priv->dpfe_api->version >= 3))















		return NULL;













	}































	msg_type = (response >> DRAM_MSG_TYPE_OFFSET) & DRAM_MSG_TYPE_MASK;















	offset = (response >> DRAM_MSG_ADDR_OFFSET) & DRAM_MSG_ADDR_MASK;

































drivers/memory/da8xx-ddrctl.c



+0
−2






























Original line number
Diff line number
Diff line








@@ -102,14 +102,12 @@ static int da8xx_ddrctl_probe(struct platform_device *pdev)













{















	const struct da8xx_ddrctl_config_knob *knob;















	const struct da8xx_ddrctl_setting *setting;













	struct device_node *node;















	struct resource *res;















	void __iomem *ddrctl;















	struct device *dev;















	u32 reg;































	dev = &pdev->dev;













	node = dev->of_node;































	setting = da8xx_ddrctl_get_board_settings();















	if (!setting) {

































drivers/memory/emif-asm-offsets.c



+1
−9






























Original line number
Diff line number
Diff line













// SPDX-License-Identifier: GPL-2.0















/*















 * TI AM33XX EMIF PM Assembly Offsets















 *















 * Copyright (C) 2016-2017 Texas Instruments Inc.













 *













 * This program is free software; you can redistribute it and/or













 * modify it under the terms of the GNU General Public License as













 * published by the Free Software Foundation version 2.













 *













 * This program is distributed "as is" WITHOUT ANY WARRANTY of any













 * kind, whether express or implied; without even the implied warranty













 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the













 * GNU General Public License for more details.















 */















#include <linux/ti-emif-sram.h>

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE