Commit 9c148cb4 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'ti-driver-soc-for-v6.11' of...

Merge tag 'ti-driver-soc-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers

TI SoC driver updates for v6.11

- Update TISCI protocol URL link  which was dead
- socinfo: Add j721E SR 2.0 detection support
- MAINTAINER list additions: ti,pruss.yaml and ti,j721e-system-controller.yaml
- pm33xx: log statement improvement
- knav_qmss: minor data structure optimization

* tag 'ti-driver-soc-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  dt-bindings: soc: ti: Move ti,j721e-system-controller.yaml to soc/ti
  MAINTAINERS: Add entry for ti,pruss.yaml to TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
  soc: ti: k3-socinfo: Add J721E SR2.0
  soc: ti: knav_qmss: Constify struct knav_range_ops
  firmware: ti_sci: fix TISCI protocol URL link
  dt-bindings: ti: fix TISCI protocol URL link
  soc: ti: pm33xx: Fix missing newlines in log statements

Link: https://lore.kernel.org/r/20240705151449.s4rngkehjn73favn@streamSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9f511474 b87a1cbb
...@@ -20,7 +20,7 @@ description: | ...@@ -20,7 +20,7 @@ description: |
initialized early into boot process and provides services to Operating Systems initialized early into boot process and provides services to Operating Systems
on multiple processors including ones running Linux. on multiple processors including ones running Linux.
See http://processors.wiki.ti.com/index.php/TISCI for protocol definition. See https://software-dl.ti.com/tisci/esd/latest/index.html for protocol definition.
The TI-SCI node describes the Texas Instrument's System Controller entity node. The TI-SCI node describes the Texas Instrument's System Controller entity node.
This parent node may optionally have additional children nodes which describe This parent node may optionally have additional children nodes which describe
......
...@@ -36,7 +36,7 @@ properties: ...@@ -36,7 +36,7 @@ properties:
The second cell should contain the clock ID. The second cell should contain the clock ID.
Please see http://processors.wiki.ti.com/index.php/TISCI for Please see https://software-dl.ti.com/tisci/esd/latest/index.html for
protocol documentation for the values to be used for different devices. protocol documentation for the values to be used for different devices.
additionalProperties: false additionalProperties: false
......
...@@ -37,7 +37,7 @@ properties: ...@@ -37,7 +37,7 @@ properties:
The second cell should contain the reset mask corresponding to the device The second cell should contain the reset mask corresponding to the device
used by system controller. used by system controller.
Please see http://processors.wiki.ti.com/index.php/TISCI for Please see https://software-dl.ti.com/tisci/esd/latest/index.html for
protocol documentation for the values to be used for different devices. protocol documentation for the values to be used for different devices.
......
...@@ -40,7 +40,7 @@ properties: ...@@ -40,7 +40,7 @@ properties:
TI_SCI_PD_SHARED - Allows the device to be shared by multiple hosts. TI_SCI_PD_SHARED - Allows the device to be shared by multiple hosts.
Please refer to dt-bindings/soc/ti,sci_pm_domain.h for the definitions. Please refer to dt-bindings/soc/ti,sci_pm_domain.h for the definitions.
Please see http://processors.wiki.ti.com/index.php/TISCI for Please see https://software-dl.ti.com/tisci/esd/latest/index.html for
protocol documentation for the values to be used for different devices. protocol documentation for the values to be used for different devices.
additionalProperties: false additionalProperties: false
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ # Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/mfd/ti,j721e-system-controller.yaml# $id: http://devicetree.org/schemas/soc/ti/ti,j721e-system-controller.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: TI J721e System Controller Registers R/W title: TI J721e System Controller Registers R/W
...@@ -19,7 +19,7 @@ description: | ...@@ -19,7 +19,7 @@ description: |
and access the registers directly. and access the registers directly.
maintainers: maintainers:
- Kishon Vijay Abraham I <kishon@ti.com> - Kishon Vijay Abraham I <kishon@kernel.org>
- Roger Quadros <rogerq@kernel.org> - Roger Quadros <rogerq@kernel.org>
properties: properties:
......
...@@ -22531,6 +22531,7 @@ L: linux-kernel@vger.kernel.org ...@@ -22531,6 +22531,7 @@ L: linux-kernel@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
F: Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml
F: drivers/pmdomain/ti/omap_prm.c F: drivers/pmdomain/ti/omap_prm.c
F: drivers/soc/ti/* F: drivers/soc/ti/*
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* Communication protocol with TI SCI hardware * Communication protocol with TI SCI hardware
* The system works in a message response protocol * The system works in a message response protocol
* See: http://processors.wiki.ti.com/index.php/TISCI for details * See: https://software-dl.ti.com/tisci/esd/latest/index.html for details
* *
* Copyright (C) 2015-2016 Texas Instruments Incorporated - https://www.ti.com/ * Copyright (C) 2015-2016 Texas Instruments Incorporated - https://www.ti.com/
*/ */
......
...@@ -61,7 +61,7 @@ static const struct k3_soc_id { ...@@ -61,7 +61,7 @@ static const struct k3_soc_id {
}; };
static const char * const j721e_rev_string_map[] = { static const char * const j721e_rev_string_map[] = {
"1.0", "1.1", "1.0", "1.1", "2.0",
}; };
static int static int
......
...@@ -333,7 +333,7 @@ struct knav_range_info { ...@@ -333,7 +333,7 @@ struct knav_range_info {
void *queue_base_inst; void *queue_base_inst;
unsigned flags; unsigned flags;
struct list_head list; struct list_head list;
struct knav_range_ops *ops; const struct knav_range_ops *ops;
struct knav_acc_info acc_info; struct knav_acc_info acc_info;
struct knav_acc_channel *acc; struct knav_acc_channel *acc;
unsigned num_irqs; unsigned num_irqs;
......
...@@ -450,7 +450,7 @@ static int knav_acc_free_range(struct knav_range_info *range) ...@@ -450,7 +450,7 @@ static int knav_acc_free_range(struct knav_range_info *range)
return 0; return 0;
} }
static struct knav_range_ops knav_acc_range_ops = { static const struct knav_range_ops knav_acc_range_ops = {
.set_notify = knav_acc_set_notify, .set_notify = knav_acc_set_notify,
.init_queue = knav_acc_init_queue, .init_queue = knav_acc_init_queue,
.open_queue = knav_acc_open_queue, .open_queue = knav_acc_open_queue,
......
...@@ -411,7 +411,7 @@ static int knav_gp_close_queue(struct knav_range_info *range, ...@@ -411,7 +411,7 @@ static int knav_gp_close_queue(struct knav_range_info *range,
return 0; return 0;
} }
static struct knav_range_ops knav_gp_range_ops = { static const struct knav_range_ops knav_gp_range_ops = {
.set_notify = knav_gp_set_notify, .set_notify = knav_gp_set_notify,
.open_queue = knav_gp_open_queue, .open_queue = knav_gp_open_queue,
.close_queue = knav_gp_close_queue, .close_queue = knav_gp_close_queue,
......
...@@ -450,14 +450,14 @@ static int am33xx_pm_rtc_setup(void) ...@@ -450,14 +450,14 @@ static int am33xx_pm_rtc_setup(void)
rtc_base_virt = of_iomap(np, 0); rtc_base_virt = of_iomap(np, 0);
if (!rtc_base_virt) { if (!rtc_base_virt) {
pr_warn("PM: could not iomap rtc"); pr_warn("PM: could not iomap rtc\n");
error = -ENODEV; error = -ENODEV;
goto err_clk_put; goto err_clk_put;
} }
omap_rtc = rtc_class_open("rtc0"); omap_rtc = rtc_class_open("rtc0");
if (!omap_rtc) { if (!omap_rtc) {
pr_warn("PM: rtc0 not available"); pr_warn("PM: rtc0 not available\n");
error = -EPROBE_DEFER; error = -EPROBE_DEFER;
goto err_iounmap; goto err_iounmap;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment