Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

soc: samsung: chipid: Convert exynos-chipid driver to use the regmap API

Browse Source 
Convert the driver to use regmap API in order to allow other
drivers, like ASV, to access the CHIPID registers.

Add definition of selected CHIPID register offsets and register bit
fields for Exynos5422 SoC.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2019-08-13 17:08:20 +02:00 committed by Krzysztof Kozlowski
parent 3253b7b7cd
commit 40d8aff614
2 changed files with 65 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/soc/samsung/exynos-chipid.c
View File

@ -9,16 +9,13 @@
*/ */
#include <linux/io.h> #include <linux/io.h>
#include <linux/mfd/syscon.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/soc/samsung/exynos-chipid.h>
#include <linux/sys_soc.h> #include <linux/sys_soc.h>
#define EXYNOS_SUBREV_MASK (0xF << 4)
#define EXYNOS_MAINREV_MASK (0xF << 0)
#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK | EXYNOS_MAINREV_MASK)
#define EXYNOS_MASK 0xFFFFF000
static const struct exynos_soc_id { static const struct exynos_soc_id {
const char *name; const char *name;
unsigned int id; unsigned int id;
@ -51,29 +48,24 @@ static const char * __init product_id_to_soc_id(unsigned int product_id)
int __init exynos_chipid_early_init(void) int __init exynos_chipid_early_init(void)
{ {
struct soc_device_attribute *soc_dev_attr; struct soc_device_attribute *soc_dev_attr;
void __iomem *exynos_chipid_base;
struct soc_device *soc_dev; struct soc_device *soc_dev;
struct device_node *root; struct device_node *root;
struct device_node *np; struct regmap *regmap;
u32 product_id; u32 product_id;
u32 revision; u32 revision;
int ret;
/* look up for chipid node */ regmap = syscon_regmap_lookup_by_compatible("samsung,exynos4210-chipid");
np = of_find_compatible_node(NULL, NULL, "samsung,exynos4210-chipid"); if (IS_ERR(regmap)) {
if (!np) pr_err("Failed to get CHIPID regmap\n");
return -ENODEV; return PTR_ERR(regmap);
exynos_chipid_base = of_iomap(np, 0);
of_node_put(np);
if (!exynos_chipid_base) {
pr_err("Failed to map SoC chipid\n");
return -ENXIO;
} }
product_id = readl_relaxed(exynos_chipid_base); ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &product_id);
if (ret < 0)
return ret;
revision = product_id & EXYNOS_REV_MASK; revision = product_id & EXYNOS_REV_MASK;
iounmap(exynos_chipid_base);
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
if (!soc_dev_attr) if (!soc_dev_attr)

52
include/linux/soc/samsung/exynos-chipid.h Normal file
View File

@ -0,0 +1,52 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2018 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* Exynos - CHIPID support
*/
#ifndef __LINUX_SOC_EXYNOS_CHIPID_H
#define __LINUX_SOC_EXYNOS_CHIPID_H
#define EXYNOS_CHIPID_REG_PRO_ID 0x00
#define EXYNOS_SUBREV_MASK (0xf << 4)
#define EXYNOS_MAINREV_MASK (0xf << 0)
#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK | \
EXYNOS_MAINREV_MASK)
#define EXYNOS_MASK 0xfffff000
#define EXYNOS_CHIPID_REG_PKG_ID 0x04
/* Bit field definitions for EXYNOS_CHIPID_REG_PKG_ID register */
#define EXYNOS5422_IDS_OFFSET 24
#define EXYNOS5422_IDS_MASK 0xff
#define EXYNOS5422_USESG_OFFSET 3
#define EXYNOS5422_USESG_MASK 0x01
#define EXYNOS5422_SG_OFFSET 0
#define EXYNOS5422_SG_MASK 0x07
#define EXYNOS5422_TABLE_OFFSET 8
#define EXYNOS5422_TABLE_MASK 0x03
#define EXYNOS5422_SG_A_OFFSET 17
#define EXYNOS5422_SG_A_MASK 0x0f
#define EXYNOS5422_SG_B_OFFSET 21
#define EXYNOS5422_SG_B_MASK 0x03
#define EXYNOS5422_SG_BSIGN_OFFSET 23
#define EXYNOS5422_SG_BSIGN_MASK 0x01
#define EXYNOS5422_BIN2_OFFSET 12
#define EXYNOS5422_BIN2_MASK 0x01
#define EXYNOS_CHIPID_REG_LOT_ID 0x14
#define EXYNOS_CHIPID_REG_AUX_INFO 0x1c
/* Bit field definitions for EXYNOS_CHIPID_REG_AUX_INFO register */
#define EXYNOS5422_TMCB_OFFSET 0
#define EXYNOS5422_TMCB_MASK 0x7f
#define EXYNOS5422_ARM_UP_OFFSET 8
#define EXYNOS5422_ARM_UP_MASK 0x03
#define EXYNOS5422_ARM_DN_OFFSET 10
#define EXYNOS5422_ARM_DN_MASK 0x03
#define EXYNOS5422_KFC_UP_OFFSET 12
#define EXYNOS5422_KFC_UP_MASK 0x03
#define EXYNOS5422_KFC_DN_OFFSET 14
#define EXYNOS5422_KFC_DN_MASK 0x03
#endif /*__LINUX_SOC_EXYNOS_CHIPID_H */