Skip to content

Commit

Permalink
Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/gregkh/char-misc

Pull char / misc driver updates from Greg KH:
 "Here is the big char/misc driver update for 5.11-rc1.

  Continuing the tradition of previous -rc1 pulls, there seems to be
  more and more tiny driver subsystems flowing through this tree.

  Lots of different things, all of which have been in linux-next for a
  while with no reported issues:

   - extcon driver updates

   - habannalab driver updates

   - mei driver updates

   - uio driver updates

   - binder fixes and features added

   - soundwire driver updates

   - mhi bus driver updates

   - phy driver updates

   - coresight driver updates

   - fpga driver updates

   - speakup driver updates

   - slimbus driver updates

   - various small char and misc driver updates"

* tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (305 commits)
  extcon: max77693: Fix modalias string
  extcon: fsa9480: Support TI TSU6111 variant
  extcon: fsa9480: Rewrite bindings in YAML and extend
  dt-bindings: extcon: add binding for TUSB320
  extcon: Add driver for TI TUSB320
  slimbus: qcom: fix potential NULL dereference in qcom_slim_prg_slew()
  siox: Make remove callback return void
  siox: Use bus_type functions for probe, remove and shutdown
  spmi: Add driver shutdown support
  spmi: fix some coding style issues at the spmi core
  spmi: get rid of a warning when built with W=1
  uio: uio_hv_generic: use devm_kzalloc() for private data alloc
  uio: uio_fsl_elbc_gpcm: use device-managed allocators
  uio: uio_aec: use devm_kzalloc() for uio_info object
  uio: uio_cif: use devm_kzalloc() for uio_info object
  uio: uio_netx: use devm_kzalloc() for or uio_info object
  uio: uio_mf624: use devm_kzalloc() for uio_info object
  uio: uio_sercos3: use device-managed functions for simple allocs
  uio: uio_dmem_genirq: finalize conversion of probe to devm_ handlers
  uio: uio_dmem_genirq: convert simple allocations to device-managed
  ...
  • Loading branch information
torvalds committed Dec 15, 2020
2 parents 7240153 + 93f9988 commit 2911ed9
Show file tree
Hide file tree
Showing 290 changed files with 23,644 additions and 4,099 deletions.
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-driver-w1_therm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Users: any user space application which wants to communicate with
w1_term device


What: /sys/bus/w1/devices/.../eeprom
What: /sys/bus/w1/devices/.../eeprom_cmd
Date: May 2020
Contact: Akira Shimahara <[email protected]>
Description:
Expand Down
1 change: 1 addition & 0 deletions Documentation/admin-guide/spkguide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ spk key_slash = say_attributes
spk key_8 = speakup_paste
shift spk key_m = say_first_char
ctrl spk key_semicolon = say_last_char
spk key_r = read_all_doc

5. The Speakup Sys System

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/ingenic,cgu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ required:

patternProperties:
"^usb-phy@[a-f0-9]+$":
allOf: [ $ref: "../usb/ingenic,jz4770-phy.yaml#" ]
allOf: [ $ref: "../phy/ingenic,phy-usb.yaml#" ]

additionalProperties: false

Expand Down
21 changes: 0 additions & 21 deletions Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt

This file was deleted.

41 changes: 41 additions & 0 deletions Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/extcon/extcon-usbc-tusb320.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: TI TUSB320 USB Type-C CC Logic controller

maintainers:
- Michael Auchter <[email protected]>

properties:
compatible:
const: ti,tusb320

reg:
maxItems: 1

interrupts:
maxItems: 1

required:
- compatible
- reg
- interrupts

additionalProperties: false

examples:
- |
i2c0 {
#address-cells = <1>;
#size-cells = <0>;
tusb320@61 {
compatible = "ti,tusb320";
reg = <0x61>;
interrupt-parent = <&gpio>;
interrupts = <27 1>;
};
};
...
52 changes: 52 additions & 0 deletions Documentation/devicetree/bindings/extcon/fcs,fsa880.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/extcon/fcs,fsa880.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Fairchild Semiconductor FSA880, FSA9480 and compatibles

maintainers:
- Linus Walleij <[email protected]>

description:
The FSA880 and FSA9480 are USB port accessory detectors and switches.
The switch is fully controlled using I2C and enables USB data, stereo
and mono audio, video, microphone, and UART data to use a common
connector port. Compatible switches exist from other manufacturers.

properties:
compatible:
enum:
- fcs,fsa880
- fcs,fsa9480
- ti,tsu6111

reg:
maxItems: 1
description: The I2C address for an FSA880 compatible device is
usually 0x25.

interrupts:
maxItems: 1

required:
- compatible
- reg
- interrupts

additionalProperties: false

examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
i2c {
#address-cells = <1>;
#size-cells = <0>;
usb-switch@25 {
compatible = "fcs,fsa880";
reg = <0x25>;
interrupt-parent = <&gpio>;
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
};
};
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Required properties:
"mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
"mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
"mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
"mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
- reg: Should contain registers location and length

= Data cells =
Expand Down
17 changes: 14 additions & 3 deletions Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,18 @@ allOf:

properties:
compatible:
const: qcom,qfprom
items:
- enum:
- qcom,apq8064-qfprom
- qcom,apq8084-qfprom
- qcom,msm8974-qfprom
- qcom,msm8916-qfprom
- qcom,msm8996-qfprom
- qcom,msm8998-qfprom
- qcom,qcs404-qfprom
- qcom,sc7180-qfprom
- qcom,sdm845-qfprom
- const: qcom,qfprom

reg:
# If the QFPROM is read-only OS image then only the corrected region
Expand Down Expand Up @@ -60,7 +71,7 @@ examples:
#size-cells = <2>;
efuse@784000 {
compatible = "qcom,qfprom";
compatible = "qcom,sc7180-qfprom", "qcom,qfprom";
reg = <0 0x00784000 0 0x8ff>,
<0 0x00780000 0 0x7a0>,
<0 0x00782000 0 0x100>,
Expand All @@ -85,7 +96,7 @@ examples:
#size-cells = <2>;
efuse@784000 {
compatible = "qcom,qfprom";
compatible = "qcom,sdm845-qfprom", "qcom,qfprom";
reg = <0 0x00784000 0 0x8ff>;
#address-cells = <1>;
#size-cells = <1>;
Expand Down
70 changes: 70 additions & 0 deletions Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
# Copyright 2020 BayLibre, SAS
%YAML 1.2
---
$id: "http://devicetree.org/schemas/phy/amlogic,axg-mipi-dphy.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"

title: Amlogic AXG MIPI D-PHY

maintainers:
- Neil Armstrong <[email protected]>

properties:
compatible:
enum:
- amlogic,axg-mipi-dphy

reg:
maxItems: 1

clocks:
maxItems: 1

clock-names:
items:
- const: pclk

resets:
maxItems: 1

reset-names:
items:
- const: phy

"#phy-cells":
const: 0

phys:
maxItems: 1

phy-names:
items:
- const: analog

required:
- compatible
- reg
- clocks
- clock-names
- resets
- reset-names
- phys
- phy-names
- "#phy-cells"

additionalProperties: false

examples:
- |
phy@ff640000 {
compatible = "amlogic,axg-mipi-dphy";
reg = <0xff640000 0x100>;
clocks = <&clk_mipi_dsi_phy>;
clock-names = "pclk";
resets = <&reset_phy>;
reset-names = "phy";
phys = <&mipi_pcie_analog_dphy>;
phy-names = "analog";
#phy-cells = <0>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,32 @@ title: Amlogic AXG shared MIPI/PCIE analog PHY
maintainers:
- Remi Pommarel <[email protected]>

description: |+
The Everything-Else Power Domains node should be the child of a syscon
node with the required property:
- compatible: Should be the following:
"amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon"
Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.yaml
properties:
compatible:
const: amlogic,axg-mipi-pcie-analog-phy

reg:
maxItems: 1

"#phy-cells":
const: 1
const: 0

required:
- compatible
- reg
- "#phy-cells"

additionalProperties: false

examples:
- |
mpphy: phy@0 {
mpphy: phy {
compatible = "amlogic,axg-mipi-pcie-analog-phy";
reg = <0x0 0xc>;
#phy-cells = <1>;
#phy-cells = <0>;
};
Loading

0 comments on commit 2911ed9

Please sign in to comment.