mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
Devicetree fixes for v7.2-rc, part 1:
- Drop unnecessary type reference from khadas,mcu "fan-supply" - Fix clocks in Renesas R-Mobile APE6 example - Add missing Unisoc SC2730 PMIC regulators schema - Fix Amlogic thermal example - kernel-doc fix for of_map_id() - Handle negative index in of_fwnode_get_reference_args() -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmo9lgUACgkQ+vtdtY28 YcMHdg//b53t64fBQF7AhVO0mp/EJLYvvCnKZ0iWw1N0Ya7WgKFMtl6UhYoxfkn5 8Q+q18rCaV6v9cP933RQ1zgdYeEavmP1ev1tpuW3MzWFRGQykJt1tgtwr1LTFEDK NbalsaAiAbihn1Tn22gXDAddy8ghI0AyZoSDvLrUx1mlO2dZjOgg2tSt/yzmZIBf 00ZKmu6lcqmdvoitWkjN2CmFuyTATQ3+7mGJvTgPUx9FRvF/xSGHgzxkN3eHnMhC MhYLZQMtmJ4xkRSZ1NC/OBbgSftzIbpYsZTMsG1KUJpXdGAdcz3LPUVWLWAlaqIb sP6bu7i7x42zPF+m2BkdA9N5pdJsPNBNaR1rdcZykq9qiN+nfQkUUK16TlznQd0t xH+wBrMZcHjoZuBpP1vzEuFc/GyGIxWOTCmjgCXXOHLxUDt17V5COHBziLa+/w1O e++M4QYy+/1irPeTq8obr8uSSkHthbwomwWm55yfuuC+gs5tKYGoLnuyHswP4Eza E5Usz7VlInMfF6x0yADAPlcpAymp5VdnLFnWktSv0CHo69Tac0EbgWsGMB6HV9c/ 2ZawGm5yNIfoBNggA2UodgN9QDomi8I+tATCmClvZo6yR5Jaus669/s7ELMHBfgw 35RktyT0cS4z8OvkhdADWAdBIC0KGWl0PKdoqqkXITEaR/t7FjY= =/1jq -----END PGP SIGNATURE----- Merge tag 'devicetree-fixes-for-7.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull devicetree fixes from Rob Herring: - Drop unnecessary type reference from khadas,mcu "fan-supply" - Fix clocks in Renesas R-Mobile APE6 example - Add missing Unisoc SC2730 PMIC regulators schema - Fix Amlogic thermal example - kernel-doc fix for of_map_id() - Handle negative index in of_fwnode_get_reference_args() * tag 'devicetree-fixes-for-7.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: mfd: khadas,mcu: Drop type reference from "fan-supply" dt-bindings: clock: renesas: div6: Use ZT/ZTR trace clock in R-Mobile APE6 example regulator: dt-bindings: Add Unisoc SC2730 PMIC dt-bindings: thermal: amlogic: Correct 'reg' in the example dt-bindings: thermal: amlogic: Fix missing header in the example of: Fix RST inline emphasis warnings in of_map_id() kernel-doc of: property: Fix of_fwnode_get_reference_args() with negative index
This commit is contained in:
Linus Torvalds
commit
fc91b7d77d
|
|
@ -60,7 +60,7 @@ examples:
|
|||
clock-output-names = "main", "pll0", "pll1", "pll2",
|
||||
"pll2s", "pll2h", "z", "z2",
|
||||
"i", "m3", "b", "m1", "m2",
|
||||
"zx", "zs", "hp";
|
||||
"zx", "zs", "hp", "ztr", "zt";
|
||||
};
|
||||
|
||||
sdhi2_clk: sdhi2_clk@e615007c {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ properties:
|
|||
|
||||
fan-supply:
|
||||
description: Phandle to the regulator that powers the fan.
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
|
||||
required:
|
||||
- compatible
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/regulator/sprd,sc2730-regulator.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Unisoc SC2730 Power Management IC regulators
|
||||
|
||||
maintainers:
|
||||
- Otto Pflüger <otto.pflueger@abscue.de>
|
||||
|
||||
patternProperties:
|
||||
"^dcdc-(core|cpu|gen[0-1]|gpu|mem|memq|modem|sram)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^ldo-avdd(12|18)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^ldo-vdd(18-dcxo|28)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^ldo-vdd(emmccore|kpled|ldo[0-2]|sd(core|io)|sim[0-2]|usb33|wcn|wifipa)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^ldo-vddcam(a0|a1|d0|d1|io|mot)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^ldo-vddrf(1v25|18)$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
|
||||
additionalProperties: false
|
||||
...
|
||||
|
|
@ -87,9 +87,12 @@ examples:
|
|||
amlogic,ao-secure = <&sec_AO>;
|
||||
};
|
||||
- |
|
||||
#include <dt-bindings/clock/amlogic,t7-peripherals-clkc.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
temperature-sensor@20000 {
|
||||
compatible = "amlogic,t7-thermal";
|
||||
reg = <0x0 0x20000 0x0 0x50>;
|
||||
reg = <0x20000 0x50>;
|
||||
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clkc_periphs CLKID_TS>;
|
||||
#thermal-sensor-cells = <0>;
|
||||
|
|
|
|||
|
|
@ -2160,7 +2160,7 @@ static bool of_check_bad_map(const __be32 *map, int len)
|
|||
* @map_mask_name: optional property name of the mask to use.
|
||||
* @filter_np: pointer to an optional filter node, or NULL to allow bypass.
|
||||
* If non-NULL, the map property must exist (-ENODEV if absent). If
|
||||
* *filter_np is also non-NULL, only entries targeting that node match.
|
||||
* ``*filter_np`` is also non-NULL, only entries targeting that node match.
|
||||
* @arg: pointer to a &struct of_phandle_args for the result. On success,
|
||||
* @arg->args_count will be set to the number of output specifier cells
|
||||
* as defined by @cells_name in the target node, and
|
||||
|
|
@ -2350,7 +2350,7 @@ EXPORT_SYMBOL_GPL(of_map_iommu_id);
|
|||
* stream/device ID) used as the lookup key in the msi-map table.
|
||||
* @filter_np: pointer to an optional filter node, or NULL to allow bypass.
|
||||
* If non-NULL, the map property must exist (-ENODEV if absent). If
|
||||
* *filter_np is also non-NULL, only entries targeting that node match.
|
||||
* ``*filter_np`` is also non-NULL, only entries targeting that node match.
|
||||
* @arg: pointer to a &struct of_phandle_args for the result. On success,
|
||||
* @arg->args_count will be set to the number of output specifier cells
|
||||
* and @arg->args[0..args_count-1] will contain the translated output
|
||||
|
|
|
|||
|
|
@ -1172,6 +1172,14 @@ of_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
|
|||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* This function should return -ENOENT for out of bound indexes,
|
||||
* but the OF API uses signed indexes and consider negative indexes
|
||||
* as invalid. Catch them here to correctly implement the fwnode API.
|
||||
*/
|
||||
if ((int)index < 0)
|
||||
return -ENOENT;
|
||||
|
||||
if (nargs_prop)
|
||||
ret = of_parse_phandle_with_args(to_of_node(fwnode), prop,
|
||||
nargs_prop, index, &of_args);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user