diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c index 6e3ed4b85..464cda390 100644 --- a/drivers/char/hw_random/rockchip-rng.c +++ b/drivers/char/hw_random/rockchip-rng.c @@ -468,6 +468,14 @@ static const struct of_device_id rk_rng_dt_match[] = { { .compatible = "rockchip,rk3568-rng", .data = (void *)&rk3568_soc_data }, { .compatible = "rockchip,rk3576-rng", .data = (void *)&rk3576_soc_data }, { .compatible = "rockchip,rk3588-rng", .data = (void *)&rk3588_soc_data }, + /* + * RV1106 has the same standalone TRNG_V1 IP as RK3588 (identical + * register map: CTRL 0x00, STAT 0x04, MODE 0x08, ISTAT 0x14, + * RAND0-7 0x20-0x3c). Reuse rk3588_soc_data; the driver grabs clocks + * via clk_bulk_get_all and treats the reset as optional, so the + * rv1106 clock/reset names need no special handling. + */ + { .compatible = "rockchip,rv1106-rng", .data = (void *)&rk3588_soc_data }, { /* sentinel */ }, }; diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c index 6721da0ed..cbd992cf4 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -348,8 +348,25 @@ static const struct rockchip_saradc_data rk3588_saradc_data = { .read = rockchip_saradc_read_v2, }; +/* RV1106: a 2-channel v2 SARADC (ported from the vendor driver). */ +static const struct iio_chan_spec rockchip_rv1106_saradc_iio_channels[] = { + SARADC_CHANNEL(0, "adc0", 10), + SARADC_CHANNEL(1, "adc1", 10), +}; + +static const struct rockchip_saradc_data rv1106_saradc_data = { + .channels = rockchip_rv1106_saradc_iio_channels, + .num_channels = ARRAY_SIZE(rockchip_rv1106_saradc_iio_channels), + .clk_rate = 1000000, + .start = rockchip_saradc_start_v2, + .read = rockchip_saradc_read_v2, +}; + static const struct of_device_id rockchip_saradc_match[] = { { + .compatible = "rockchip,rv1106-saradc", + .data = &rv1106_saradc_data, + }, { .compatible = "rockchip,saradc", .data = &saradc_data, }, { diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 643578266..c4823ba07 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1374,6 +1374,62 @@ static const struct rk_gmac_ops rv1126_ops = { .set_speed = rk_set_clk_mac_speed, }; +/* + * RV1106: single RMII MAC wired to the on-die 10/100 FEPHY. RMII mode and the + * RMII reference-clock divider live in the VO GRF (offsets within the big + * grf syscon@ff000000, size 0x68000). Ported from the vendor 5.10 dwmac-rk.c. + * The vendor also programmed a bandgap trim (from OTP) into MACPHY_CON1; that + * is an analog optimisation the FEPHY runs without, and mainline's fephy + * powerup helper doesn't carry it — omitted here (see rng-otp/ for the OTP + * cell). CON0 powerup is enough to bring the PHY up. + */ +#define RV1106_VOGRF_GMAC_CLK_CON 0x60004 +#define RV1106_VOGRF_MACPHY_RMII_MODE GRF_BIT(0) +#define RV1106_VOGRF_GMAC_CLK_RMII_DIV2 GRF_BIT(2) +#define RV1106_VOGRF_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(2) +#define RV1106_VOGRF_MACPHY_CON0 0x60028 + +static void rv1106_set_to_rmii(struct rk_priv_data *bsp_priv) +{ + regmap_write(bsp_priv->grf, RV1106_VOGRF_GMAC_CLK_CON, + RV1106_VOGRF_MACPHY_RMII_MODE | + RV1106_VOGRF_GMAC_CLK_RMII_DIV2); +} + +static int rv1106_set_speed(struct rk_priv_data *bsp_priv, + phy_interface_t interface, int speed) +{ + unsigned int val; + + if (speed == 10) + val = RV1106_VOGRF_GMAC_CLK_RMII_DIV20; + else if (speed == 100) + val = RV1106_VOGRF_GMAC_CLK_RMII_DIV2; + else + return -EINVAL; + + regmap_write(bsp_priv->grf, RV1106_VOGRF_GMAC_CLK_CON, val); + + return 0; +} + +static void rv1106_integrated_phy_powerup(struct rk_priv_data *bsp_priv) +{ + rk_gmac_integrated_fephy_powerup(bsp_priv, RV1106_VOGRF_MACPHY_CON0); +} + +static void rv1106_integrated_phy_powerdown(struct rk_priv_data *bsp_priv) +{ + rk_gmac_integrated_fephy_powerdown(bsp_priv, RV1106_VOGRF_MACPHY_CON0); +} + +static const struct rk_gmac_ops rv1106_ops = { + .set_to_rmii = rv1106_set_to_rmii, + .set_speed = rv1106_set_speed, + .integrated_phy_powerup = rv1106_integrated_phy_powerup, + .integrated_phy_powerdown = rv1106_integrated_phy_powerdown, +}; + static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat) { struct rk_priv_data *bsp_priv = plat->bsp_priv; @@ -1813,6 +1869,7 @@ static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,rk3568-gmac", .data = &rk3568_ops }, { .compatible = "rockchip,rk3576-gmac", .data = &rk3576_ops }, { .compatible = "rockchip,rk3588-gmac", .data = &rk3588_ops }, + { .compatible = "rockchip,rv1106-gmac", .data = &rv1106_ops }, { .compatible = "rockchip,rv1108-gmac", .data = &rv1108_ops }, { .compatible = "rockchip,rv1126-gmac", .data = &rv1126_ops }, { } diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c index d88f12c53..073a5724a 100644 --- a/drivers/nvmem/rockchip-otp.c +++ b/drivers/nvmem/rockchip-otp.c @@ -294,6 +294,29 @@ static const struct rockchip_data rk3588_data = { .reg_read = rk3588_otp_read, }; +/* + * RV1106 uses the same SBPI-protocol OTP controller as the rk3568/rk3588 + * family (the vendor 5.10 driver selected rk3568_otp_read, which is the same + * SBPI sequence as mainline's rk3588_otp_read). Six clocks, matching the DT + * clock-names usr/sbpi/apb/phy/arb/pmc. 0x80 bytes of user OTP. + */ +static const char * const rv1106_otp_clocks[] = { + "usr", "sbpi", "apb", "phy", "arb", "pmc", +}; + +static const struct rockchip_data rv1106_data = { + .size = 0x80, + .clks = rv1106_otp_clocks, + .num_clks = ARRAY_SIZE(rv1106_otp_clocks), + /* + * User-mode OTPC_USER read (rockchip_otp_reset -> ecc_enable -> + * per-byte FSM), same sequence the vendor 5.10 driver used for + * rv1106 (its rk3568_otp_read). rk3588_otp_read uses a different + * addressing path and times out on this controller. + */ + .reg_read = px30_otp_read, +}; + static const struct of_device_id rockchip_otp_match[] = { { .compatible = "rockchip,px30-otp", @@ -311,6 +334,10 @@ static const struct of_device_id rockchip_otp_match[] = { .compatible = "rockchip,rk3588-otp", .data = &rk3588_data, }, + { + .compatible = "rockchip,rv1106-otp", + .data = &rv1106_data, + }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, rockchip_otp_match); diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 2933c41c7..fb389789a 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -1400,6 +1400,12 @@ config RTC_DRV_NTXEC original design manufacturer Netronix. comment "on-CPU RTC drivers" +config RTC_DRV_ROCKCHIP + tristate "Rockchip RV1106 RTC" + depends on ARCH_ROCKCHIP || COMPILE_TEST + help + The RV1106 internal RTC (rockchip,rv1106-rtc). Ported from the vendor. + config RTC_DRV_ASM9260 tristate "Alphascale asm9260 RTC" diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 8221bda6e..e1bff733a 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -197,3 +197,4 @@ obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o obj-$(CONFIG_RTC_DRV_XGENE) += rtc-xgene.o obj-$(CONFIG_RTC_DRV_ZYNQMP) += rtc-zynqmp.o +obj-$(CONFIG_RTC_DRV_ROCKCHIP) += rtc-rockchip.o diff --git a/drivers/rtc/rtc-rockchip.c b/drivers/rtc/rtc-rockchip.c new file mode 100644 index 000000000..5c088a9cf --- /dev/null +++ b/drivers/rtc/rtc-rockchip.c @@ -0,0 +1,824 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Rockchip Electronics Co., Ltd + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* RTC_CTRL_REG bitfields */ + +#define RTC_REG(x) ((x)) +#define RTC_SET_SECONDS RTC_REG(0x0) +#define RTC_SET_MINUTES RTC_REG(0x4) +#define RTC_SET_HOURS RTC_REG(0x8) +#define RTC_SET_DAYS RTC_REG(0xc) +#define RTC_SET_MONTHS RTC_REG(0x10) +#define RTC_SET_YEARL RTC_REG(0x14) +#define RTC_SET_YEARH RTC_REG(0x18) +#define RTC_SET_WEEKS RTC_REG(0x1c) +#define RTC_ALARM_SECONDS RTC_REG(0x20) +#define RTC_ALARM_MINUTES RTC_REG(0x24) +#define RTC_ALARM_HOURS RTC_REG(0x28) +#define RTC_ALARM_DAYS RTC_REG(0x2c) +#define RTC_ALARM_MONTHS RTC_REG(0x30) +#define RTC_ALARM_YEARL RTC_REG(0x34) +#define RTC_ALARM_YEARH RTC_REG(0x38) +#define RTC_CTRL RTC_REG(0x3C) +#define RTC_STATUS0 RTC_REG(0x40) +#define RTC_STATUS1 RTC_REG(0x44) +#define RTC_INT0_EN RTC_REG(0x48) +#define RTC_INT1_EN RTC_REG(0x4c) +#define RTC_MSEC_CTRL RTC_REG(0x50) +#define RTC_MSEC_CNT RTC_REG(0x54) +#define RTC_COMP_H RTC_REG(0x58) +#define RTC_COMP_D RTC_REG(0x5c) +#define RTC_COMP_M RTC_REG(0x60) +#define RTC_ANALOG_CTRL RTC_REG(0x64) +#define RTC_ANALOG_TEST RTC_REG(0x68) +#define RTC_LDO_CTRL RTC_REG(0x6c) +#define RTC_XO_TRIM0 RTC_REG(0x70) +#define RTC_XO_TRIM1 RTC_REG(0x74) +#define RTC_VPTAT_TRIM RTC_REG(0x78) +#define RTC_ANALOG_EN RTC_REG(0x7c) +#define RTC_CLK32K_TEST RTC_REG(0x80) +#define RTC_TEST_ST RTC_REG(0x84) +#define RTC_TEST_LEN RTC_REG(0x88) +#define RTC_CNT_0 RTC_REG(0x8c) +#define RTC_CNT_1 RTC_REG(0x90) +#define RTC_CNT_2 RTC_REG(0x94) +#define RTC_CNT_3 RTC_REG(0x98) +#define RTC_MAX_REGISTER RTC_CNT_3 + +#define VI_GRF_VI_MISC_CON0 0x50000 +#define RTC_CLAMP_EN BIT(6) + +/* RTC_CTRL_REG bitfields */ +#define RTC_CTRL_REG_START_RTC BIT(0) +#define RTC_TIMEOUT (3000 * 1000) + +/* RK630 has a shadowed register for saving a "frozen" RTC time. + * When user setting "GET_TIME" to 1, the time will save in this shadowed + * register. If set "READSEL" to 1, user read rtc time register, actually + * get the time of that moment. If we need the real time, clr this bit. + */ +#define RTC_CTRL_REG_RTC_GET_TIME BIT(6) +#define RTC_CTRL_REG_RTC_READSEL_M BIT(7) +#define RTC_INT_REG_ALARM_EN BIT(7) +#define RTC_D2A_XO_EN BIT(0) +#define RTC_D2A_CLK_OUT_EN BIT(5) + +#define RTC_STATUS_MASK 0xFF + +#define SECONDS_REG_MSK 0x7F +#define MINUTES_REG_MAK 0x7F +#define HOURS_REG_MSK 0x3F +#define DAYS_REG_MSK 0x3F +#define MONTHS_REG_MSK 0x1F +#define YEARS_REG_MSK 0xFF +#define WEEKS_REG_MSK 0x7 + +#define RTC_VREF_INIT 0x40 + +#define CLK_32K_ENABLE BIT(5) +#define D2A_POR_REG_SEL1 BIT(4) +#define D2A_POR_REG_SEL0 BIT(1) + +#define NUM_TIME_REGS 8 +#define NUM_ALARM_REGS 7 + +#define DISABLE_ALARM_INT 0x3F +#define ENABLE_ALARM_INT 0xFF +#define ALARM_INT_STATUS BIT(4) + +#define CLK32K_TEST_EN BIT(0) +#define CLK32K_TEST_START BIT(0) +#define CLK32K_TEST_STATUS BIT(1) +#define CLK32K_TEST_DONE BIT(2) +#define CLK32K_TEST_LEN 1 + +#define CLK32K_COMP_DIR_ADD BIT(7) +#define CLK32K_COMP_EN BIT(2) +#define CLK32K_NO_COMP 0x1 + +#define CLK32K_TEST_REF_CLK 24000000 + +#define RTC_WRITE_MASK 0xc4522900 + +enum { + ROCKCHIP_RV1106_RTC = 1, +}; + +struct rockchip_rtc { + struct regmap *regmap; + struct rtc_device *rtc; + struct regmap *grf; + struct clk_bulk_data *clks; + int num_clks; + int irq; + unsigned int flag; + unsigned int mode; + struct delayed_work trim_work; + bool suspend_bypass; +}; + +static unsigned int rockchip_rtc_write(struct regmap *map, + u32 offset, u32 val) +{ + return regmap_write(map, offset, val | RTC_WRITE_MASK); +} + +static unsigned int rockchip_rtc_update_bits(struct regmap *map, + u32 offset, u32 mask, + u32 set) +{ + unsigned int val; + + regmap_read(map, offset, &val); + return regmap_write(map, offset, (val & ~mask) | set | RTC_WRITE_MASK); +} + +/* Read current time and date in RTC */ +static int rockchip_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ + struct rockchip_rtc *rtc = dev_get_drvdata(dev); + u32 rtc_data[NUM_TIME_REGS]; + int ret; + int yearl, yearh; + + /* No shadowed registers, need read time three time to update time */ + ret = regmap_bulk_read(rtc->regmap, RTC_SET_SECONDS, + rtc_data, NUM_TIME_REGS); + if (ret) { + dev_err(dev, "Failed to bulk read rtc_data: %d\n", ret); + return ret; + } + ret = regmap_bulk_read(rtc->regmap, RTC_SET_SECONDS, + rtc_data, NUM_TIME_REGS); + if (ret) { + dev_err(dev, "Failed to bulk read rtc_data: %d\n", ret); + return ret; + } + ret = regmap_bulk_read(rtc->regmap, RTC_SET_SECONDS, + rtc_data, NUM_TIME_REGS); + if (ret) { + dev_err(dev, "Failed to bulk read rtc_data: %d\n", ret); + return ret; + } + + tm->tm_sec = bcd2bin(rtc_data[0] & SECONDS_REG_MSK); + tm->tm_min = bcd2bin(rtc_data[1] & MINUTES_REG_MAK); + tm->tm_hour = bcd2bin(rtc_data[2] & HOURS_REG_MSK); + tm->tm_mday = bcd2bin(rtc_data[3] & DAYS_REG_MSK); + tm->tm_mon = (bcd2bin(rtc_data[4] & MONTHS_REG_MSK)) - 1; + yearl = (bcd2bin(rtc_data[5] & YEARS_REG_MSK)); + yearh = (bcd2bin(rtc_data[6] & YEARS_REG_MSK)); + tm->tm_year = yearh * 100 + yearl + 100; + tm->tm_wday = bcd2bin(rtc_data[7] & WEEKS_REG_MSK); + + dev_dbg(dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", + 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, + tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); + + return ret; +} + +/* Set current time and date in RTC */ +static int rockchip_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ + struct rockchip_rtc *rtc = dev_get_drvdata(dev); + u32 rtc_data[NUM_TIME_REGS]; + int ret, status = 0; + int yearl, yearh; + + dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", + 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, + tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); + + rtc_data[0] = bin2bcd(tm->tm_sec) | RTC_WRITE_MASK; + rtc_data[1] = bin2bcd(tm->tm_min) | RTC_WRITE_MASK; + rtc_data[2] = bin2bcd(tm->tm_hour) | RTC_WRITE_MASK; + rtc_data[3] = bin2bcd(tm->tm_mday) | RTC_WRITE_MASK; + rtc_data[4] = bin2bcd(tm->tm_mon + 1) | RTC_WRITE_MASK; + if (tm->tm_year > 199) { + yearh = (tm->tm_year - 100) / 100; + yearl = tm->tm_year - 100 - yearh * 100; + } else { + yearh = 0; + yearl = tm->tm_year - 100 - yearh * 100; + } + rtc_data[5] = bin2bcd(yearl) | RTC_WRITE_MASK; + rtc_data[6] = bin2bcd(yearh) | RTC_WRITE_MASK; + rtc_data[7] = bin2bcd(tm->tm_wday) | RTC_WRITE_MASK; + + /* Stop RTC while updating the RTC registers */ + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_CTRL, + RTC_CTRL_REG_START_RTC, 0); + if (ret) { + dev_err(dev, "Failed to update RTC control: %d\n", ret); + return ret; + } + + ret = regmap_read_poll_timeout(rtc->regmap, RTC_STATUS1, status, + !(status & RTC_CTRL_REG_START_RTC), + 0, RTC_TIMEOUT); + if (ret) + dev_err(dev, + "%s:timeout Update RTC_STATUS1 : %d\n", + __func__, ret); + + ret = regmap_bulk_write(rtc->regmap, RTC_SET_SECONDS, + rtc_data, NUM_TIME_REGS); + if (ret) { + dev_err(dev, "Failed to bull write rtc_data: %d\n", ret); + return ret; + } + + /* Start RTC again */ + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_CTRL, + RTC_CTRL_REG_RTC_READSEL_M | + RTC_CTRL_REG_START_RTC, + RTC_CTRL_REG_RTC_READSEL_M | + RTC_CTRL_REG_START_RTC); + if (ret) { + dev_err(dev, "Failed to update RTC control: %d\n", ret); + return ret; + } + + ret = regmap_read_poll_timeout(rtc->regmap, RTC_STATUS1, status, + (status & RTC_CTRL_REG_START_RTC), + 0, RTC_TIMEOUT); + if (ret) + dev_err(dev, + "%s:timeout Update RTC_STATUS1 : %d\n", + __func__, ret); + + return 0; +} + +/* Read alarm time and date in RTC */ +static int rockchip_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct rockchip_rtc *rtc = dev_get_drvdata(dev); + u32 alrm_data[NUM_ALARM_REGS]; + u32 int_reg; + int yearl, yearh; + int ret; + + ret = regmap_bulk_read(rtc->regmap, + RTC_ALARM_SECONDS, + alrm_data, NUM_ALARM_REGS); + if (ret) { + dev_err(dev, "Failed to read RTC alarm date REG: %d\n", ret); + return ret; + } + + alrm->time.tm_sec = bcd2bin(alrm_data[0] & SECONDS_REG_MSK); + alrm->time.tm_min = bcd2bin(alrm_data[1] & MINUTES_REG_MAK); + alrm->time.tm_hour = bcd2bin(alrm_data[2] & HOURS_REG_MSK); + alrm->time.tm_mday = bcd2bin(alrm_data[3] & DAYS_REG_MSK); + alrm->time.tm_mon = (bcd2bin(alrm_data[4] & MONTHS_REG_MSK)) - 1; + yearl = (bcd2bin(alrm_data[5] & YEARS_REG_MSK)); + yearh = (bcd2bin(alrm_data[6] & YEARS_REG_MSK)); + alrm->time.tm_year = yearh * 100 + yearl + 100; + + ret = regmap_read(rtc->regmap, RTC_INT0_EN, &int_reg); + if (ret) { + dev_err(dev, "Failed to read RTC INT REG: %d\n", ret); + return ret; + } + + dev_dbg(dev, + "alrm read RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", + 1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, + alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, + alrm->time.tm_min, alrm->time.tm_sec); + + alrm->enabled = (int_reg & RTC_INT_REG_ALARM_EN) ? 1 : 0; + + return 0; +} + +static int rockchip_rtc_stop_alarm(struct rockchip_rtc *rtc) +{ + int ret; + + ret = rockchip_rtc_write(rtc->regmap, RTC_INT0_EN, 0); + + return ret; +} + +static int rockchip_rtc_start_alarm(struct rockchip_rtc *rtc) +{ + int ret; + + ret = rockchip_rtc_write(rtc->regmap, RTC_STATUS0, RTC_STATUS_MASK); + ret = rockchip_rtc_write(rtc->regmap, RTC_STATUS0, 0); + ret = rockchip_rtc_write(rtc->regmap, RTC_INT0_EN, ENABLE_ALARM_INT); + + return ret; +} + +static int rockchip_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct rockchip_rtc *rtc = dev_get_drvdata(dev); + u32 alrm_data[NUM_ALARM_REGS]; + int yearl, yearh; + int ret; + + ret = rockchip_rtc_stop_alarm(rtc); + if (ret) { + dev_err(dev, "Failed to stop alarm: %d\n", ret); + return ret; + } + dev_dbg(dev, + "alrm set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", + 1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, + alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, + alrm->time.tm_min, alrm->time.tm_sec); + + alrm_data[0] = bin2bcd(alrm->time.tm_sec) | RTC_WRITE_MASK; + alrm_data[1] = bin2bcd(alrm->time.tm_min) | RTC_WRITE_MASK; + alrm_data[2] = bin2bcd(alrm->time.tm_hour) | RTC_WRITE_MASK; + alrm_data[3] = bin2bcd(alrm->time.tm_mday) | RTC_WRITE_MASK; + alrm_data[4] = bin2bcd(alrm->time.tm_mon + 1) | RTC_WRITE_MASK; + if (alrm->time.tm_year > 199) { + yearh = (alrm->time.tm_year - 100) / 100; + yearl = alrm->time.tm_year - 100 - yearh * 100; + } else { + yearh = 0; + yearl = alrm->time.tm_year - 100 - yearh * 100; + } + alrm_data[5] = bin2bcd(yearl) | RTC_WRITE_MASK; + alrm_data[6] = bin2bcd(yearh) | RTC_WRITE_MASK; + + ret = regmap_bulk_write(rtc->regmap, + RTC_ALARM_SECONDS, + alrm_data, NUM_ALARM_REGS); + if (ret) { + dev_err(dev, "Failed to bulk write: %d\n", ret); + return ret; + } + if (alrm->enabled) { + ret = rockchip_rtc_start_alarm(rtc); + if (ret) { + dev_err(dev, "Failed to start alarm: %d\n", ret); + return ret; + } + } + return 0; +} + +static int rockchip_rtc_alarm_irq_enable(struct device *dev, + unsigned int enabled) +{ + struct rockchip_rtc *rtc = dev_get_drvdata(dev); + + if (enabled) + return rockchip_rtc_start_alarm(rtc); + + return rockchip_rtc_stop_alarm(rtc); +} + +/* + * We will just handle setting the frequency and make use the framework for + * reading the periodic interrupts. + * + */ +static irqreturn_t rockchip_rtc_alarm_irq(int irq, void *data) +{ + struct rockchip_rtc *rtc = data; + int ret, status; + + ret = regmap_read(rtc->regmap, RTC_STATUS0, &status); + if (ret) { + pr_err("Failed to read RTC INT REG: %d\n", ret); + return ret; + } + + ret = rockchip_rtc_write(rtc->regmap, RTC_STATUS0, status); + if (ret) { + pr_err("%s:Failed to update RTC status: %d\n", __func__, ret); + return ret; + } + if (status & ALARM_INT_STATUS) { + pr_info("Alarm by: %s\n", __func__); + rtc_update_irq(rtc->rtc, 1, RTC_IRQF | RTC_AF); + } + + return IRQ_HANDLED; +} + +static const struct rtc_class_ops rockchip_rtc_ops = { + .read_time = rockchip_rtc_read_time, + .set_time = rockchip_rtc_set_time, + .read_alarm = rockchip_rtc_readalarm, + .set_alarm = rockchip_rtc_setalarm, + .alarm_irq_enable = rockchip_rtc_alarm_irq_enable, +}; + +/* + * Due to the analog generator 32k clock affected by + * temperature, voltage, clock precision need test + * with the environment change. In rtc test, + * use 24M clock as reference clock to measure the 32k clock. + * Before start test 32k clock, we should enable clk32k test(0x80), + * and configure test length, when rtc test done(0x84[2]), + * latch the 24M clock domain counter, + * and read out the counter from rtc_test + * registers(0x8c~0x98) via apb bus. + * In RTC digital design, we set three level compensation, + * the compensation value due to the + * RTC 32k clock test result, and if we need compensation, + * we need configure the compensation enable bit. + * Comp every hour, compensation at last minute every hour, + * and support add time and sub time by the MSB bit. + * Comp every day, compensation at last minute in last hour every day, + * and support add time and sub time by the MSB bit. + * Comp every month, compensation at last minute + * in last hour in last day every month, + * and support add time and sub time by the MSB bit. + */ +static void rockchip_rtc_compensation_delay_work(struct work_struct *work) +{ + struct rockchip_rtc *rtc = container_of(work, struct rockchip_rtc, trim_work.work); + u64 camp; + u32 count[4], counts, g_ref, tcamp; + int ret, done = 0, trim_dir, c_hour, + c_day, c_det_day, c_mon, c_det_mon; + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_CLK32K_TEST, + CLK32K_TEST_EN, CLK32K_TEST_EN); + if (ret) { + pr_err("%s:Failed to update RTC CLK32K TEST: %d\n", + __func__, ret); + return; + } + + ret = rockchip_rtc_write(rtc->regmap, RTC_TEST_LEN, + CLK32K_TEST_LEN); + if (ret) { + pr_err("%s:Failed to update RTC CLK32K TEST LEN: %d\n", + __func__, ret); + return; + } + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_TEST_ST, + CLK32K_TEST_START, + CLK32K_TEST_START); + if (ret) { + pr_err("%s:Failed to update RTC CLK32K TEST STATUS : %d\n", + __func__, ret); + return; + } + ret = regmap_read_poll_timeout(rtc->regmap, RTC_TEST_ST, done, + (done & CLK32K_TEST_DONE), 20000, RTC_TIMEOUT); + if (ret) + pr_err("%s:timeout waiting for RTC TEST STATUS : %d\n", + __func__, ret); + + ret = regmap_bulk_read(rtc->regmap, + RTC_CNT_0, + count, 4); + if (ret) { + pr_err("Failed to read RTC count REG: %d\n", ret); + return; + } + + counts = count[0] | (count[1] << 8) | + (count[2] << 16) | (count[3] << 24); + g_ref = CLK32K_TEST_REF_CLK * (CLK32K_TEST_LEN + 1); + + if (counts > g_ref) { + trim_dir = 0; + camp = 36ULL * (32768 * (counts - g_ref)); + do_div(camp, (g_ref / 100)); + } else { + trim_dir = CLK32K_COMP_DIR_ADD; + camp = 36ULL * (32768 * (g_ref - counts)); + do_div(camp, (g_ref / 100)); + } + tcamp = (u32)camp; + c_hour = DIV_ROUND_CLOSEST(tcamp, 32768); + c_day = DIV_ROUND_CLOSEST(24 * tcamp, 32768); + c_mon = DIV_ROUND_CLOSEST(30 * 24 * tcamp, 32768); + + if (c_hour > 1) + rockchip_rtc_write(rtc->regmap, RTC_COMP_H, bin2bcd((c_hour - 1)) | trim_dir); + else + rockchip_rtc_write(rtc->regmap, RTC_COMP_H, CLK32K_NO_COMP); + + if (c_day > c_hour * 23) { + c_det_day = c_day - c_hour * 23; + trim_dir = CLK32K_COMP_DIR_ADD; + } else { + c_det_day = c_hour * 24 - c_day; + trim_dir = 0; + } + + if (c_det_day > 1) + rockchip_rtc_write(rtc->regmap, RTC_COMP_D, + bin2bcd((c_det_day - 1)) | trim_dir); + else + rockchip_rtc_write(rtc->regmap, RTC_COMP_D, CLK32K_NO_COMP); + + if (c_mon > (29 * c_day + 23 * c_hour)) { + c_det_mon = c_mon - 29 * c_day - 23 * c_hour; + trim_dir = CLK32K_COMP_DIR_ADD; + } else { + c_det_mon = 29 * c_day + 23 * c_hour - c_mon; + trim_dir = 0; + } + + if (c_det_mon) + rockchip_rtc_write(rtc->regmap, RTC_COMP_M, + bin2bcd((c_det_mon - 1)) | trim_dir); + else + rockchip_rtc_write(rtc->regmap, RTC_COMP_M, CLK32K_NO_COMP); + + ret = regmap_read(rtc->regmap, RTC_CTRL, &done); + if (ret) { + pr_err("Failed to read RTC_CTRL: %d\n", ret); + return; + } + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_CTRL, + CLK32K_COMP_EN, CLK32K_COMP_EN); + if (ret) { + pr_err("%s:Failed to update RTC CTRL : %d\n", __func__, ret); + return; + } + return; +} + +static bool rockchip_rtc_is_trimed(struct rockchip_rtc *rtc) +{ + int ret, comp_done; + + ret = regmap_read(rtc->regmap, RTC_CTRL, &comp_done); + if (ret) { + pr_err("%s: Failed to read RTC_CTRL: %d\n", __func__, ret); + return false; + } + return (comp_done & CLK32K_COMP_EN) == CLK32K_COMP_EN; +} + +static void rockchip_rtc_trim_start(struct rockchip_rtc *rtc) +{ + if (!rockchip_rtc_is_trimed(rtc)) + queue_delayed_work(system_long_wq, &rtc->trim_work, + msecs_to_jiffies(5000)); +} + +static void __maybe_unused rockchip_rtc_trim_close(struct rockchip_rtc *rtc) +{ + if (!rockchip_rtc_is_trimed(rtc)) + cancel_delayed_work_sync(&rtc->trim_work); +} + +/* Enable the alarm if it should be enabled (in case it was disabled to + * prevent use as a wake source). + */ +#ifdef CONFIG_PM_SLEEP +/* Turn off the alarm if it should not be a wake source. */ +static int rockchip_rtc_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct rockchip_rtc *rtc = dev_get_drvdata(&pdev->dev); + + if (rtc->suspend_bypass) + return 0; + + if (device_may_wakeup(dev)) + enable_irq_wake(rtc->irq); + + rockchip_rtc_trim_close(rtc); + + if (rtc->grf) { + switch (rtc->mode) { + case ROCKCHIP_RV1106_RTC: + regmap_write(rtc->grf, VI_GRF_VI_MISC_CON0, + (RTC_CLAMP_EN << 16)); + break; + default: + return -EINVAL; + } + } + clk_bulk_disable_unprepare(rtc->num_clks, rtc->clks); + + return 0; +} + +/* Enable the alarm if it should be enabled (in case it was disabled to + * prevent use as a wake source). + */ +static int rockchip_rtc_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct rockchip_rtc *rtc = dev_get_drvdata(&pdev->dev); + int ret; + + if (rtc->suspend_bypass) + return 0; + + if (device_may_wakeup(dev)) + disable_irq_wake(rtc->irq); + + if (rtc->grf) { + switch (rtc->mode) { + case ROCKCHIP_RV1106_RTC: + regmap_write(rtc->grf, VI_GRF_VI_MISC_CON0, + (RTC_CLAMP_EN << 16) | RTC_CLAMP_EN); + break; + default: + return -EINVAL; + } + } + ret = clk_bulk_prepare_enable(rtc->num_clks, rtc->clks); + if (ret) { + dev_err(dev, "Cannot enable clock.\n"); + return ret; + } + rockchip_rtc_trim_start(rtc); + + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(rockchip_rtc_pm_ops, + rockchip_rtc_suspend, rockchip_rtc_resume); + +static const struct of_device_id rockchip_rtc_of_match[] = { + { + .compatible = "rockchip,rv1106-rtc", + .data = (void *)ROCKCHIP_RV1106_RTC + }, + {}, +}; +MODULE_DEVICE_TABLE(of, rockchip_rtc_of_match); + +static void rockchip_rtc_clk_disable(void *data) +{ + struct rockchip_rtc *rtc = data; + + clk_bulk_disable_unprepare(rtc->num_clks, rtc->clks); +} + +static int rockchip_rtc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct rockchip_rtc *rtc; + int ret; + struct rtc_time tm_read, tm = { + .tm_wday = 0, + .tm_year = 121, + .tm_mon = 0, + .tm_mday = 1, + .tm_hour = 12, + .tm_min = 0, + .tm_sec = 0, + }; + + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); + if (!rtc) + return -ENOMEM; + + rtc->regmap = device_node_to_regmap(np); + if (IS_ERR(rtc->regmap)) + return dev_err_probe(dev, PTR_ERR(rtc->regmap), + "no regmap available\n"); + + rtc->mode = (uintptr_t)device_get_match_data(dev); + rtc->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); + if (IS_ERR(rtc->grf)) { + dev_warn(dev, "Missing rockchip,grf property\n"); + rtc->grf = NULL; + } else { + switch (rtc->mode) { + case ROCKCHIP_RV1106_RTC: + regmap_write(rtc->grf, VI_GRF_VI_MISC_CON0, + (RTC_CLAMP_EN << 16) | RTC_CLAMP_EN); + break; + default: + return -EINVAL; + } + } + + platform_set_drvdata(pdev, rtc); + + rtc->num_clks = devm_clk_bulk_get_all(&pdev->dev, &rtc->clks); + if (rtc->num_clks < 1) + return -ENODEV; + ret = clk_bulk_prepare_enable(rtc->num_clks, rtc->clks); + if (ret) + return dev_err_probe(dev, ret, "Cannot enable clock.\n"); + ret = devm_add_action_or_reset(dev, rockchip_rtc_clk_disable, rtc); + if (ret) + return dev_err_probe(dev, ret, + "Failed to add clk disable action."); + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_VPTAT_TRIM, + D2A_POR_REG_SEL1 | + CLK_32K_ENABLE, + D2A_POR_REG_SEL1 | + CLK_32K_ENABLE); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to write RTC_VPTAT_TRIM\n"); + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_ANALOG_EN, + D2A_POR_REG_SEL0, + 0x00); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to write RTC_ANALOG_EN\n"); + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_LDO_CTRL, + RTC_D2A_XO_EN, + RTC_D2A_XO_EN); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to update RTC_LDO_CTRL\n"); + + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_ANALOG_EN, + RTC_D2A_CLK_OUT_EN, + RTC_D2A_CLK_OUT_EN); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to update RTC_ANALOG_EN\n"); + + /* start rtc running by default, and use shadowed timer. */ + ret = rockchip_rtc_update_bits(rtc->regmap, RTC_CTRL, + RTC_CTRL_REG_START_RTC | + RTC_CTRL_REG_RTC_READSEL_M, + RTC_CTRL_REG_RTC_READSEL_M | + RTC_CTRL_REG_START_RTC); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to update RTC control\n"); + + ret = rockchip_rtc_write(rtc->regmap, RTC_STATUS0, RTC_STATUS_MASK); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to write RTC status0\n"); + + ret = rockchip_rtc_write(rtc->regmap, RTC_STATUS0, 0); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to write RTC status0\n"); + + device_init_wakeup(&pdev->dev, 1); + + rockchip_rtc_read_time(&pdev->dev, &tm_read); + if (rtc_valid_tm(&tm_read) != 0) + rockchip_rtc_set_time(&pdev->dev, &tm); + + rtc->rtc = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(rtc->rtc)) + return PTR_ERR(rtc->rtc); + + rtc->rtc->ops = &rockchip_rtc_ops; + + rtc->irq = platform_get_irq(pdev, 0); + if (rtc->irq < 0) + return dev_err_probe(&pdev->dev, rtc->irq, "No IRQ resource\n"); + + /* request alarm irq of rtc */ + ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL, + &rockchip_rtc_alarm_irq, IRQF_ONESHOT, + "RTC alarm", rtc); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to request alarm IRQ %d\n", + rtc->irq); + + /* If rtc 32k used as time for deep sleep, the rtc suspend func bypass do nothing. */ + rtc->suspend_bypass = device_property_read_bool(&pdev->dev, + "rockchip,rtc-suspend-bypass"); + + INIT_DELAYED_WORK(&rtc->trim_work, rockchip_rtc_compensation_delay_work); + rockchip_rtc_trim_start(rtc); + + return devm_rtc_register_device(rtc->rtc); +} + +static struct platform_driver rockchip_rtc_driver = { + .probe = rockchip_rtc_probe, + .driver = { + .name = "rockchip-rtc", + .pm = &rockchip_rtc_pm_ops, + .of_match_table = rockchip_rtc_of_match, + }, +}; + +module_platform_driver(rockchip_rtc_driver); + +MODULE_DESCRIPTION("RTC driver for the rockchip"); +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index c49ddf70f..10bbab6ec 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -276,6 +276,19 @@ struct rockchip_thermal_data { #define RK_MAX_TEMP (180000) +/* vendor rv1106 tsadc uses these names + register defs */ +#define MIN_TEMP (-60000) +#define MAX_TEMP (180000) +/* rv1106 tsadc (TSADCV9 + VOGRF) register defs, ported from vendor */ +#define TSADCV9_Q_MAX 0x210 +#define TSADCV9_FLOW_CON 0x218 +#define TSADCV9_AUTO_SRC (0x10001 << 0) +#define TSADCV9_PD_MODE (0x10001 << 4) +#define TSADCV9_Q_MAX_VAL (0xffff0400 << 0) +#define RV1106_VOGRF_TSADC_CON 0x6000C +#define RV1106_VOGRF_TSADC_TSEN (0x10001 << 8) +#define RV1106_VOGRF_TSADC_ANA (0xff0007 << 0) + /** * struct tsadc_table - code to temperature conversion table @@ -1120,6 +1133,68 @@ static const struct rockchip_tsadc_chip px30_tsadc_data = { }, }; +static const struct tsadc_table rv1106_code_table[] = { + {0, MIN_TEMP}, + {363, MIN_TEMP}, + {396, -40000}, + {504, 25000}, + {605, 85000}, + {673, 125000}, + {758, MAX_TEMP}, + {TSADCV2_DATA_MASK, MAX_TEMP}, +}; + +static void rk_tsadcv9_initialize(struct regmap *grf, void __iomem *regs, + enum tshut_polarity tshut_polarity) +{ + regmap_write(grf, RV1106_VOGRF_TSADC_CON, RV1106_VOGRF_TSADC_TSEN); + udelay(10); + regmap_write(grf, RV1106_VOGRF_TSADC_CON, RV1106_VOGRF_TSADC_ANA); + udelay(100); + + writel_relaxed(TSADCV2_AUTO_PERIOD_TIME, regs + TSADCV3_AUTO_PERIOD); + writel_relaxed(TSADCV2_AUTO_PERIOD_TIME, + regs + TSADCV3_AUTO_PERIOD_HT); + writel_relaxed(TSADCV2_HIGHT_INT_DEBOUNCE_COUNT, + regs + TSADCV3_HIGHT_INT_DEBOUNCE); + writel_relaxed(TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT, + regs + TSADCV3_HIGHT_TSHUT_DEBOUNCE); + writel_relaxed(TSADCV9_AUTO_SRC, regs + TSADCV2_INT_PD); + writel_relaxed(TSADCV9_PD_MODE, regs + TSADCV9_FLOW_CON); + writel_relaxed(TSADCV9_Q_MAX_VAL, regs + TSADCV9_Q_MAX); + if (tshut_polarity == TSHUT_HIGH_ACTIVE) + writel_relaxed(TSADCV2_AUTO_TSHUT_POLARITY_HIGH | + TSADCV2_AUTO_TSHUT_POLARITY_MASK, + regs + TSADCV2_AUTO_CON); + else + writel_relaxed(TSADCV2_AUTO_TSHUT_POLARITY_MASK, + regs + TSADCV2_AUTO_CON); + writel_relaxed(TSADCV3_AUTO_Q_SEL_EN | (TSADCV3_AUTO_Q_SEL_EN << 16), + regs + TSADCV2_AUTO_CON); +} + +static const struct rockchip_tsadc_chip rv1106_tsadc_data = { + /* top, big_core0, big_core1, little_core, center, gpu, npu */ + .chn_offset = 0, /* cpu sensor is channel 0 */ + .chn_num = 1, /* seven channels for tsadc */ + .tshut_mode = TSHUT_MODE_CRU, /* default TSHUT via CRU */ + .tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */ + .tshut_temp = 95000, + .initialize = rk_tsadcv9_initialize, + .irq_ack = rk_tsadcv4_irq_ack, + .control = rk_tsadcv4_control, + .get_temp = rk_tsadcv4_get_temp, + .set_alarm_temp = rk_tsadcv3_alarm_temp, + .set_tshut_temp = rk_tsadcv3_tshut_temp, + .set_tshut_mode = rk_tsadcv4_tshut_mode, + .table = { + .id = rv1106_code_table, + .length = ARRAY_SIZE(rv1106_code_table), + .data_mask = TSADCV2_DATA_MASK, + .mode = ADC_INCREMENT, + }, +}; + static const struct rockchip_tsadc_chip rv1108_tsadc_data = { /* cpu */ .chn_offset = 0, @@ -1358,6 +1433,9 @@ static const struct of_device_id of_rockchip_thermal_match[] = { { .compatible = "rockchip,rv1108-tsadc", .data = (void *)&rv1108_tsadc_data, + }, { + .compatible = "rockchip,rv1106-tsadc", + .data = (void *)&rv1106_tsadc_data, }, { .compatible = "rockchip,rk3228-tsadc",