From: Alexey Sheplyakov <asheplyakov@basealt.ru> To: devel-kernel@lists.altlinux.org Cc: nir@basealt.ru, jqt4@basealt.ru, rst@basealt.ru, sin@basealt.ru Subject: [d-kernel] [PATCH 17/31] hwmon: bt1-pvt: adjusted probing for Baikal-M SoC Date: Mon, 3 Oct 2022 18:02:13 +0400 Message-ID: <20221003140226.1064966-18-asheplyakov@basealt.ru> (raw) In-Reply-To: <20221003140226.1064966-1-asheplyakov@basealt.ru> PVT registers and clocks are managed by the firmware (ARM-TF) and can't be accessed by Linux directly. Therefore skip enabling (disabling) clocks and ioremapping registers on Baikal-M. Also a sensor is identified by special `pvt_id' instead of registers base address. pvt_id is initialized from the device tree. Signed-off-by: Alexey Sheplyakov <asheplyakov@basealt.ru> X-feature-Baikal-M --- drivers/hwmon/Kconfig | 5 +++-- drivers/hwmon/bt1-pvt.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index e70d9614bec2..b0417edd884c 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -418,10 +418,11 @@ config SENSORS_ATXP1 config SENSORS_BT1_PVT tristate "Baikal-T1 Process, Voltage, Temperature sensor driver" - depends on MIPS_BAIKAL_T1 || COMPILE_TEST + depends on MIPS_BAIKAL_T1 || ARCH_BAIKAL || COMPILE_TEST + default m if MIPS_BAIKAL_T1 || ARCH_BAIKAL select POLYNOMIAL help - If you say yes here you get support for Baikal-T1 PVT sensor + If you say yes here you get support for Baikal-M or Baikal-T1 PVT sensor embedded into the SoC. This driver can also be built as a module. If so, the module will be diff --git a/drivers/hwmon/bt1-pvt.c b/drivers/hwmon/bt1-pvt.c index fa91be300c3b..90f29521f1af 100644 --- a/drivers/hwmon/bt1-pvt.c +++ b/drivers/hwmon/bt1-pvt.c @@ -927,6 +927,7 @@ static int pvt_request_regs(struct pvt_hwmon *pvt) { struct platform_device *pdev = to_platform_device(pvt->dev); struct resource *res; + int err = 0; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -934,27 +935,38 @@ static int pvt_request_regs(struct pvt_hwmon *pvt) return -EINVAL; } +#ifdef BT1_PVT_DIRECT_REG_ACCESS pvt->regs = devm_ioremap_resource(pvt->dev, res); if (IS_ERR(pvt->regs)) return PTR_ERR(pvt->regs); +#else + err = of_property_read_u32(pvt->dev->of_node, "pvt_id", &(pvt->pvt_id)); + if (err) { + dev_err(pvt->dev, "couldn't find pvt_id\n"); + return err; + } +#endif return 0; } +#ifdef BT1_PVT_DIRECT_REG_ACCESS static void pvt_disable_clks(void *data) { struct pvt_hwmon *pvt = data; clk_bulk_disable_unprepare(PVT_CLOCK_NUM, pvt->clks); } +#endif static int pvt_request_clks(struct pvt_hwmon *pvt) { - int ret; + int ret = 0; pvt->clks[PVT_CLOCK_APB].id = "pclk"; pvt->clks[PVT_CLOCK_REF].id = "ref"; +#ifdef BT1_PVT_DIRECT_REG_ACCESS ret = devm_clk_bulk_get(pvt->dev, PVT_CLOCK_NUM, pvt->clks); if (ret) { dev_err(pvt->dev, "Couldn't get PVT clocks descriptors\n"); @@ -972,8 +984,11 @@ static int pvt_request_clks(struct pvt_hwmon *pvt) dev_err(pvt->dev, "Can't add PVT clocks disable action\n"); return ret; } - - return 0; +#else + pvt->clks[PVT_CLOCK_APB].clk = NULL; + pvt->clks[PVT_CLOCK_REF].clk = NULL; +#endif + return ret; } static int pvt_check_pwr(struct pvt_hwmon *pvt) @@ -1013,14 +1028,17 @@ static int pvt_check_pwr(struct pvt_hwmon *pvt) static int pvt_init_iface(struct pvt_hwmon *pvt) { - unsigned long rate; u32 trim, temp; +#ifdef BT1_PVT_DIRECT_REG_ACCESS + unsigned long rate; + rate = clk_get_rate(pvt->clks[PVT_CLOCK_REF].clk); if (!rate) { dev_err(pvt->dev, "Invalid reference clock rate\n"); return -ENODEV; } +#endif /* * Make sure all interrupts and controller are disabled so not to @@ -1049,6 +1067,7 @@ static int pvt_init_iface(struct pvt_hwmon *pvt) * polled. In that case the formulae will look a bit different: * Ttotal = 5 * (N / Fclk + Tmin) */ +#if defined(BT1_PVT_DIRECT_REG_ACCESS) #if defined(CONFIG_SENSORS_BT1_PVT_ALARMS) pvt->timeout = ktime_set(PVT_SENSORS_NUM * PVT_TOUT_DEF, 0); pvt->timeout = ktime_divns(pvt->timeout, rate); @@ -1058,6 +1077,9 @@ static int pvt_init_iface(struct pvt_hwmon *pvt) pvt->timeout = ktime_divns(pvt->timeout, rate); pvt->timeout = ktime_add_ns(pvt->timeout, PVT_TOUT_MIN); #endif +#else + pvt->timeout = ktime_set(0, PVT_TOUT_MIN * PVT_SENSORS_NUM); +#endif trim = PVT_TRIM_DEF; if (!of_property_read_u32(pvt->dev->of_node, -- 2.33.3
next prev parent reply other threads:[~2022-10-03 14:02 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-03 14:01 [d-kernel] Ядро 6.0 с поддержкой СнК Байкал-М Alexey Sheplyakov 2022-10-03 14:01 ` [d-kernel] [PATCH 01/31] clk: added Baikal-M clock management unit driver Alexey Sheplyakov 2022-10-03 14:01 ` [d-kernel] [PATCH 02/31] cpufreq-dt: don't load on Baikal-M SoC Alexey Sheplyakov 2022-10-03 14:01 ` [d-kernel] [PATCH 03/31] serial: 8250_dw: verify clock rate in dw8250_set_termios Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 04/31] usb: dwc3: of-simple: added compatible string for Baikal-M SoC Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 05/31] dw-pcie: refuse to load on Baikal-M with recent firmware Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 06/31] arm64: Enable armv8 based Baikal-M SoC support Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 07/31] efi-rtc: avoid calling efi.get_time on Baikal-M SoC Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 08/31] arm64-stub: fixed secondary cores boot " Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 09/31] pm: disable all sleep states on Baikal-M based boards Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 10/31] net: fwnode_get_phy_id: consider all compatible strings Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 11/31] net: stmmac: inital support of Baikal-T1/M SoCs GMAC Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 12/31] dt-bindings: dwmac: Add bindings for Baikal-T1/M SoCs Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 13/31] net: dwmac-baikal: added compatible strings Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 14/31] Added TF307/TF306 board management controller driver Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 15/31] hwmon: bt1-pvt: access registers via pvt_{readl, writel} helpers Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 16/31] hwmon: bt1-pvt: define pvt_readl/pvt_writel for Baikal-M SoC Alexey Sheplyakov 2022-10-03 14:02 ` Alexey Sheplyakov [this message] 2022-10-03 14:02 ` [d-kernel] [PATCH 18/31] hwmon: bt1-pvt: added compatible baikal, pvt Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 19/31] drm: new bridge driver - stdp4028 Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 20/31] drm: added Baikal-M SoC video display unit driver Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 21/31] drm/bridge: dw-hdmi: support ahb audio hw revision 0x2a Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 22/31] dt-bindings: dw-hdmi: added ahb-audio-regshift Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 23/31] drm/bridge: dw-hdmi: force ahb audio register offset for Baikal-M Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 24/31] drm/panfrost: forcibly set dma-coherent on Baikal-M Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 25/31] drm/panfrost: disable devfreq " Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 26/31] ALSA: hda: Baikal-M support Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 27/31] PCI: pcie-baikal: driver for Baikal-M with new firmware Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 28/31] (BROKEN) dwc-i2s: support Baikal-M SoC Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 29/31] input: added TF307 serio PS/2 emulator driver Alexey Sheplyakov 2022-10-03 14:02 ` [d-kernel] [PATCH 30/31] input: new driver - serdev-serio Alexey Sheplyakov 2022-10-06 4:34 ` [d-kernel] Ядро 6.0 с поддержкой СнК Байкал-М Vitaly Chikunov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221003140226.1064966-18-asheplyakov@basealt.ru \ --to=asheplyakov@basealt.ru \ --cc=devel-kernel@lists.altlinux.org \ --cc=jqt4@basealt.ru \ --cc=nir@basealt.ru \ --cc=rst@basealt.ru \ --cc=sin@basealt.ru \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux kernel packages development This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel-kernel/0 devel-kernel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel-kernel devel-kernel/ http://lore.altlinux.org/devel-kernel \ devel-kernel@altlinux.org devel-kernel@altlinux.ru devel-kernel@altlinux.com public-inbox-index devel-kernel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git