diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 17:13:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 17:13:56 -0700 |
commit | 8362fd64f07eaef7155c94fca8dee91c4f99a666 (patch) | |
tree | 2d16af7d7b8cbb5765727493f796d453580fc107 /lib | |
parent | 24e44913aa746098349370a0f279733c0cadcba7 (diff) | |
parent | 8c0993621c3e5fa52e5425ef2a0f67a0cde07092 (diff) | |
download | linux-stable-8362fd64f07eaef7155c94fca8dee91c4f99a666.tar.gz linux-stable-8362fd64f07eaef7155c94fca8dee91c4f99a666.tar.bz2 linux-stable-8362fd64f07eaef7155c94fca8dee91c4f99a666.zip |
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC-related driver updates from Olof Johansson:
"Various driver updates for platforms and a couple of the small driver
subsystems we merge through our tree:
- A driver for SCU (system control) on NXP i.MX8QXP
- Qualcomm Always-on Subsystem messaging driver (AOSS QMP)
- Qualcomm PM support for MSM8998
- Support for a newer version of DRAM PHY driver for Broadcom (DPFE)
- Reset controller support for Bitmain BM1880
- TI SCI (System Control Interface) support for CPU control on AM654
processors
- More TI sysc refactoring and rework"
* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (84 commits)
reset: remove redundant null check on pointer dev
soc: rockchip: work around clang warning
dt-bindings: reset: imx7: Fix the spelling of 'indices'
soc: imx: Add i.MX8MN SoC driver support
soc: aspeed: lpc-ctrl: Fix probe error handling
soc: qcom: geni: Add support for ACPI
firmware: ti_sci: Fix gcc unused-but-set-variable warning
firmware: ti_sci: Use the correct style for SPDX License Identifier
soc: imx8: Use existing of_root directly
soc: imx8: Fix potential kernel dump in error path
firmware/psci: psci_checker: Park kthreads before stopping them
memory: move jedec_ddr.h from include/memory to drivers/memory/
memory: move jedec_ddr_data.c from lib/ to drivers/memory/
MAINTAINERS: Remove myself as qcom maintainer
soc: aspeed: lpc-ctrl: make parameter optional
soc: qcom: apr: Don't use reg for domain id
soc: qcom: fix QCOM_AOSS_QMP dependency and build errors
memory: tegra: Fix -Wunused-const-variable
firmware: tegra: Early resume BPMP
soc/tegra: Select pinctrl for Tegra194
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 8 | ||||
-rw-r--r-- | lib/Makefile | 2 | ||||
-rw-r--r-- | lib/jedec_ddr_data.c | 132 |
3 files changed, 0 insertions, 142 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 52a7b2e6fb74..f33d66fc0e86 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -531,14 +531,6 @@ config LRU_CACHE config CLZ_TAB bool -config DDR - bool "JEDEC DDR data" - help - Data from JEDEC specs for DDR SDRAM memories, - particularly the AC timing parameters and addressing - information. This data is useful for drivers handling - DDR SDRAM controllers. - config IRQ_POLL bool "IRQ polling library" help diff --git a/lib/Makefile b/lib/Makefile index 59067f51f3ab..095601ce371d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -209,8 +209,6 @@ obj-$(CONFIG_SIGNATURE) += digsig.o lib-$(CONFIG_CLZ_TAB) += clz_tab.o -obj-$(CONFIG_DDR) += jedec_ddr_data.o - obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o diff --git a/lib/jedec_ddr_data.c b/lib/jedec_ddr_data.c deleted file mode 100644 index d0b312e28d36..000000000000 --- a/lib/jedec_ddr_data.c +++ /dev/null @@ -1,132 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * DDR addressing details and AC timing parameters from JEDEC specs - * - * Copyright (C) 2012 Texas Instruments, Inc. - * - * Aneesh V <aneesh@ti.com> - */ - -#include <memory/jedec_ddr.h> -#include <linux/module.h> - -/* LPDDR2 addressing details from JESD209-2 section 2.4 */ -const struct lpddr2_addressing - lpddr2_jedec_addressing_table[NUM_DDR_ADDR_TABLE_ENTRIES] = { - {B4, T_REFI_15_6, T_RFC_90}, /* 64M */ - {B4, T_REFI_15_6, T_RFC_90}, /* 128M */ - {B4, T_REFI_7_8, T_RFC_90}, /* 256M */ - {B4, T_REFI_7_8, T_RFC_90}, /* 512M */ - {B8, T_REFI_7_8, T_RFC_130}, /* 1GS4 */ - {B8, T_REFI_3_9, T_RFC_130}, /* 2GS4 */ - {B8, T_REFI_3_9, T_RFC_130}, /* 4G */ - {B8, T_REFI_3_9, T_RFC_210}, /* 8G */ - {B4, T_REFI_7_8, T_RFC_130}, /* 1GS2 */ - {B4, T_REFI_3_9, T_RFC_130}, /* 2GS2 */ -}; -EXPORT_SYMBOL_GPL(lpddr2_jedec_addressing_table); - -/* LPDDR2 AC timing parameters from JESD209-2 section 12 */ -const struct lpddr2_timings - lpddr2_jedec_timings[NUM_DDR_TIMING_TABLE_ENTRIES] = { - /* Speed bin 400(200 MHz) */ - [0] = { - .max_freq = 200000000, - .min_freq = 10000000, - .tRPab = 21000, - .tRCD = 18000, - .tWR = 15000, - .tRAS_min = 42000, - .tRRD = 10000, - .tWTR = 10000, - .tXP = 7500, - .tRTP = 7500, - .tCKESR = 15000, - .tDQSCK_max = 5500, - .tFAW = 50000, - .tZQCS = 90000, - .tZQCL = 360000, - .tZQinit = 1000000, - .tRAS_max_ns = 70000, - .tDQSCK_max_derated = 6000, - }, - /* Speed bin 533(266 MHz) */ - [1] = { - .max_freq = 266666666, - .min_freq = 10000000, - .tRPab = 21000, - .tRCD = 18000, - .tWR = 15000, - .tRAS_min = 42000, - .tRRD = 10000, - .tWTR = 7500, - .tXP = 7500, - .tRTP = 7500, - .tCKESR = 15000, - .tDQSCK_max = 5500, - .tFAW = 50000, - .tZQCS = 90000, - .tZQCL = 360000, - .tZQinit = 1000000, - .tRAS_max_ns = 70000, - .tDQSCK_max_derated = 6000, - }, - /* Speed bin 800(400 MHz) */ - [2] = { - .max_freq = 400000000, - .min_freq = 10000000, - .tRPab = 21000, - .tRCD = 18000, - .tWR = 15000, - .tRAS_min = 42000, - .tRRD = 10000, - .tWTR = 7500, - .tXP = 7500, - .tRTP = 7500, - .tCKESR = 15000, - .tDQSCK_max = 5500, - .tFAW = 50000, - .tZQCS = 90000, - .tZQCL = 360000, - .tZQinit = 1000000, - .tRAS_max_ns = 70000, - .tDQSCK_max_derated = 6000, - }, - /* Speed bin 1066(533 MHz) */ - [3] = { - .max_freq = 533333333, - .min_freq = 10000000, - .tRPab = 21000, - .tRCD = 18000, - .tWR = 15000, - .tRAS_min = 42000, - .tRRD = 10000, - .tWTR = 7500, - .tXP = 7500, - .tRTP = 7500, - .tCKESR = 15000, - .tDQSCK_max = 5500, - .tFAW = 50000, - .tZQCS = 90000, - .tZQCL = 360000, - .tZQinit = 1000000, - .tRAS_max_ns = 70000, - .tDQSCK_max_derated = 5620, - }, -}; -EXPORT_SYMBOL_GPL(lpddr2_jedec_timings); - -const struct lpddr2_min_tck lpddr2_jedec_min_tck = { - .tRPab = 3, - .tRCD = 3, - .tWR = 3, - .tRASmin = 3, - .tRRD = 2, - .tWTR = 2, - .tXP = 2, - .tRTP = 2, - .tCKE = 3, - .tCKESR = 3, - .tFAW = 8 -}; -EXPORT_SYMBOL_GPL(lpddr2_jedec_min_tck); |