From efaa22e42686ce24fe0304d2e5f2cbb91c5558e9 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 27 Oct 2016 23:47:03 +0900 Subject: ARM: uniphier: rename ddrphy-ld20-regs.h to ddruqphy-regs.h This PHY might be used for other SoCs in the future. Avoid including the SoC name in the header name. Signed-off-by: Masahiro Yamada diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h b/arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h deleted file mode 100644 index 268ba7f..0000000 --- a/arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2016 Socionext Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _DDRPHY_LD20_REGS_H -#define _DDRPHY_LD20_REGS_H - -#include - -#define PHY_REG_SHIFT 2 -#define PHY_SLV_DLY_WIDTH 6 -#define PHY_BITLVL_DLY_WIDTH 6 -#define PHY_MAS_DLY_WIDTH 8 - -#define PHY_SCL_START (0x40 << (PHY_REG_SHIFT)) -#define PHY_SCL_START_GO_DONE BIT(28) -#define PHY_SCL_DATA_0 (0x41 << (PHY_REG_SHIFT)) -#define PHY_SCL_DATA_1 (0x42 << (PHY_REG_SHIFT)) -#define PHY_SCL_LATENCY (0x43 << (PHY_REG_SHIFT)) -#define PHY_SCL_CONFIG_1 (0x46 << (PHY_REG_SHIFT)) -#define PHY_SCL_CONFIG_2 (0x47 << (PHY_REG_SHIFT)) -#define PHY_PAD_CTRL (0x48 << (PHY_REG_SHIFT)) -#define PHY_DLL_RECALIB (0x49 << (PHY_REG_SHIFT)) -#define PHY_DLL_RECALIB_TRIM_MASK GENMASK(PHY_SLV_DLY_WIDTH - 1, 0) -#define PHY_DLL_RECALIB_INCR BIT(27) -#define PHY_DLL_ADRCTRL (0x4A << (PHY_REG_SHIFT)) -#define PHY_DLL_ADRCTRL_TRIM_MASK GENMASK(PHY_SLV_DLY_WIDTH - 1, 0) -#define PHY_DLL_ADRCTRL_INCR BIT(9) -#define PHY_DLL_ADRCTRL_MDL_SHIFT 24 -#define PHY_DLL_ADRCTRL_MDL_MASK (GENMASK(PHY_MAS_DLY_WIDTH - 1, 0) << \ - PHY_DLL_ADRCTRL_MDL_SHIFT) -#define PHY_LANE_SEL (0x4B << (PHY_REG_SHIFT)) -#define PHY_LANE_SEL_LANE_SHIFT 0 -#define PHY_LANE_SEL_LANE_WIDTH 8 -#define PHY_LANE_SEL_BIT_SHIFT 8 -#define PHY_LANE_SEL_BIT_WIDTH 4 -#define PHY_DLL_TRIM_1 (0x4C << (PHY_REG_SHIFT)) -#define PHY_DLL_TRIM_2 (0x4D << (PHY_REG_SHIFT)) -#define PHY_DLL_TRIM_3 (0x4E << (PHY_REG_SHIFT)) -#define PHY_SCL_MAIN_CLK_DELTA (0x50 << (PHY_REG_SHIFT)) -#define PHY_WRLVL_AUTOINC_TRIM (0x53 << (PHY_REG_SHIFT)) -#define PHY_WRLVL_DYN_ODT (0x54 << (PHY_REG_SHIFT)) -#define PHY_WRLVL_ON_OFF (0x55 << (PHY_REG_SHIFT)) -#define PHY_UNQ_ANALOG_DLL_1 (0x57 << (PHY_REG_SHIFT)) -#define PHY_UNQ_ANALOG_DLL_2 (0x58 << (PHY_REG_SHIFT)) -#define PHY_DLL_INCR_TRIM_1 (0x59 << (PHY_REG_SHIFT)) -#define PHY_DLL_INCR_TRIM_3 (0x5A << (PHY_REG_SHIFT)) -#define PHY_SCL_CONFIG_3 (0x5B << (PHY_REG_SHIFT)) -#define PHY_UNIQUIFY_TSMC_IO_1 (0x5C << (PHY_REG_SHIFT)) -#define PHY_SCL_START_ADDR (0x62 << (PHY_REG_SHIFT)) -#define PHY_IP_DQ_DQS_BITWISE_TRIM (0x65 << (PHY_REG_SHIFT)) -#define PHY_IP_DQ_DQS_BITWISE_TRIM_MASK \ - GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0) -#define PHY_IP_DQ_DQS_BITWISE_TRIM_INC \ - BIT(PHY_BITLVL_DLY_WIDTH) -#define PHY_IP_DQ_DQS_BITWISE_TRIM_OVERRIDE \ - BIT(PHY_BITLVL_DLY_WIDTH + 1) -#define PHY_DSCL_CNT (0x67 << (PHY_REG_SHIFT)) -#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM (0x68 << (PHY_REG_SHIFT)) -#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_MASK \ - GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0) -#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_INC \ - BIT(PHY_BITLVL_DLY_WIDTH) -#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_OVERRIDE \ - BIT(PHY_BITLVL_DLY_WIDTH + 1) -#define PHY_DLL_TRIM_CLK (0x69 << (PHY_REG_SHIFT)) -#define PHY_DLL_TRIM_CLK_MASK GENMASK(PHY_SLV_DLY_WIDTH, 0) -#define PHY_DLL_TRIM_CLK_INCR BIT(PHY_SLV_DLY_WIDTH + 1) -#define PHY_DYNAMIC_BIT_LVL (0x6B << (PHY_REG_SHIFT)) -#define PHY_SCL_WINDOW_TRIM (0x6D << (PHY_REG_SHIFT)) -#define PHY_DISABLE_GATING_FOR_SCL (0x6E << (PHY_REG_SHIFT)) -#define PHY_SCL_CONFIG_4 (0x6F << (PHY_REG_SHIFT)) -#define PHY_DYNAMIC_WRITE_BIT_LVL (0x70 << (PHY_REG_SHIFT)) -#define PHY_VREF_TRAINING (0x72 << (PHY_REG_SHIFT)) -#define PHY_SCL_GATE_TIMING (0x78 << (PHY_REG_SHIFT)) - -#endif /* _DDRPHY_LD20_REGS_H */ diff --git a/arch/arm/mach-uniphier/dram/ddruqphy-regs.h b/arch/arm/mach-uniphier/dram/ddruqphy-regs.h new file mode 100644 index 0000000..e496af5 --- /dev/null +++ b/arch/arm/mach-uniphier/dram/ddruqphy-regs.h @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2016 Socionext Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DDRUQPHY_REGS_H +#define _DDRUQPHY_REGS_H + +#include + +#define PHY_REG_SHIFT 2 +#define PHY_SLV_DLY_WIDTH 6 +#define PHY_BITLVL_DLY_WIDTH 6 +#define PHY_MAS_DLY_WIDTH 8 + +#define PHY_SCL_START (0x40 << (PHY_REG_SHIFT)) +#define PHY_SCL_START_GO_DONE BIT(28) +#define PHY_SCL_DATA_0 (0x41 << (PHY_REG_SHIFT)) +#define PHY_SCL_DATA_1 (0x42 << (PHY_REG_SHIFT)) +#define PHY_SCL_LATENCY (0x43 << (PHY_REG_SHIFT)) +#define PHY_SCL_CONFIG_1 (0x46 << (PHY_REG_SHIFT)) +#define PHY_SCL_CONFIG_2 (0x47 << (PHY_REG_SHIFT)) +#define PHY_PAD_CTRL (0x48 << (PHY_REG_SHIFT)) +#define PHY_DLL_RECALIB (0x49 << (PHY_REG_SHIFT)) +#define PHY_DLL_RECALIB_TRIM_MASK GENMASK(PHY_SLV_DLY_WIDTH - 1, 0) +#define PHY_DLL_RECALIB_INCR BIT(27) +#define PHY_DLL_ADRCTRL (0x4A << (PHY_REG_SHIFT)) +#define PHY_DLL_ADRCTRL_TRIM_MASK GENMASK(PHY_SLV_DLY_WIDTH - 1, 0) +#define PHY_DLL_ADRCTRL_INCR BIT(9) +#define PHY_DLL_ADRCTRL_MDL_SHIFT 24 +#define PHY_DLL_ADRCTRL_MDL_MASK (GENMASK(PHY_MAS_DLY_WIDTH - 1, 0) << \ + PHY_DLL_ADRCTRL_MDL_SHIFT) +#define PHY_LANE_SEL (0x4B << (PHY_REG_SHIFT)) +#define PHY_LANE_SEL_LANE_SHIFT 0 +#define PHY_LANE_SEL_LANE_WIDTH 8 +#define PHY_LANE_SEL_BIT_SHIFT 8 +#define PHY_LANE_SEL_BIT_WIDTH 4 +#define PHY_DLL_TRIM_1 (0x4C << (PHY_REG_SHIFT)) +#define PHY_DLL_TRIM_2 (0x4D << (PHY_REG_SHIFT)) +#define PHY_DLL_TRIM_3 (0x4E << (PHY_REG_SHIFT)) +#define PHY_SCL_MAIN_CLK_DELTA (0x50 << (PHY_REG_SHIFT)) +#define PHY_WRLVL_AUTOINC_TRIM (0x53 << (PHY_REG_SHIFT)) +#define PHY_WRLVL_DYN_ODT (0x54 << (PHY_REG_SHIFT)) +#define PHY_WRLVL_ON_OFF (0x55 << (PHY_REG_SHIFT)) +#define PHY_UNQ_ANALOG_DLL_1 (0x57 << (PHY_REG_SHIFT)) +#define PHY_UNQ_ANALOG_DLL_2 (0x58 << (PHY_REG_SHIFT)) +#define PHY_DLL_INCR_TRIM_1 (0x59 << (PHY_REG_SHIFT)) +#define PHY_DLL_INCR_TRIM_3 (0x5A << (PHY_REG_SHIFT)) +#define PHY_SCL_CONFIG_3 (0x5B << (PHY_REG_SHIFT)) +#define PHY_UNIQUIFY_TSMC_IO_1 (0x5C << (PHY_REG_SHIFT)) +#define PHY_SCL_START_ADDR (0x62 << (PHY_REG_SHIFT)) +#define PHY_IP_DQ_DQS_BITWISE_TRIM (0x65 << (PHY_REG_SHIFT)) +#define PHY_IP_DQ_DQS_BITWISE_TRIM_MASK \ + GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0) +#define PHY_IP_DQ_DQS_BITWISE_TRIM_INC \ + BIT(PHY_BITLVL_DLY_WIDTH) +#define PHY_IP_DQ_DQS_BITWISE_TRIM_OVERRIDE \ + BIT(PHY_BITLVL_DLY_WIDTH + 1) +#define PHY_DSCL_CNT (0x67 << (PHY_REG_SHIFT)) +#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM (0x68 << (PHY_REG_SHIFT)) +#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_MASK \ + GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0) +#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_INC \ + BIT(PHY_BITLVL_DLY_WIDTH) +#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM_OVERRIDE \ + BIT(PHY_BITLVL_DLY_WIDTH + 1) +#define PHY_DLL_TRIM_CLK (0x69 << (PHY_REG_SHIFT)) +#define PHY_DLL_TRIM_CLK_MASK GENMASK(PHY_SLV_DLY_WIDTH, 0) +#define PHY_DLL_TRIM_CLK_INCR BIT(PHY_SLV_DLY_WIDTH + 1) +#define PHY_DYNAMIC_BIT_LVL (0x6B << (PHY_REG_SHIFT)) +#define PHY_SCL_WINDOW_TRIM (0x6D << (PHY_REG_SHIFT)) +#define PHY_DISABLE_GATING_FOR_SCL (0x6E << (PHY_REG_SHIFT)) +#define PHY_SCL_CONFIG_4 (0x6F << (PHY_REG_SHIFT)) +#define PHY_DYNAMIC_WRITE_BIT_LVL (0x70 << (PHY_REG_SHIFT)) +#define PHY_VREF_TRAINING (0x72 << (PHY_REG_SHIFT)) +#define PHY_SCL_GATE_TIMING (0x78 << (PHY_REG_SHIFT)) + +#endif /* _DDRUQPHY_REGS_H */ diff --git a/arch/arm/mach-uniphier/dram/umc-ld20.c b/arch/arm/mach-uniphier/dram/umc-ld20.c index ea933fe..b8c0f59 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld20.c +++ b/arch/arm/mach-uniphier/dram/umc-ld20.c @@ -14,7 +14,7 @@ #include #include "../init.h" -#include "ddrphy-ld20-regs.h" +#include "ddruqphy-regs.h" #include "umc64-regs.h" #define DRAM_CH_NR 3 -- cgit v0.10.2