Commit 5281c656 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes to resolve reported
  problems for 6.15-rc4. Included in here are:

   - misc chrdev region range fix reported by many people

   - nvmem driver fixes and dt updates

   - mei new device id and fixes

   - comedi driver fix

   - pps driver fix

   - binder debug log fix

   - pci1xxxx driver fixes

   - firmware driver fix

  All of these have been in linux-next for over a week with no reported
  issues"

* tag 'char-misc-6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (25 commits)
  firmware: stratix10-svc: Add of_platform_default_populate()
  mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type
  mei: vsc: Fix fortify-panic caused by invalid counted_by() use
  pps: generators: tio: fix platform_set_drvdata()
  mcb: fix a double free bug in chameleon_parse_gdd()
  misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
  misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
  char: misc: register chrdev region with all possible minors
  mei: me: add panther lake H DID
  comedi: jr3_pci: Fix synchronous deletion of timer
  binder: fix offset calculation in debug log
  intel_th: avoid using deprecated page->mapping, index fields
  dt-bindings: nvmem: Add compatible for MSM8960
  dt-bindings: nvmem: Add compatible for IPQ5018
  nvmem: qfprom: switch to 4-byte aligned reads
  nvmem: core: update raw_len if the bit reading is required
  nvmem: core: verify cell's raw_len
  nvmem: core: fix bit offsets of more than one byte
  dt-bindings: nvmem: fixed-cell: increase bits start value to 31
  dt-bindings: nvmem: Add compatible for MS8937
  ...
parents 3ae7f509 4d239f44

Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32-array

    items:

      - minimum: 0

        maximum: 7

        maximum: 31

        description:

          Offset in bit within the address range specified by reg.

      - minimum: 1

Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - enum:

          - qcom,apq8064-qfprom

          - qcom,apq8084-qfprom

          - qcom,ipq5018-qfprom

          - qcom,ipq5332-qfprom

          - qcom,ipq5424-qfprom

          - qcom,ipq6018-qfprom
@@ -28,6 +29,8 @@ properties: 
          - qcom,msm8226-qfprom

          - qcom,msm8916-qfprom

          - qcom,msm8917-qfprom

          - qcom,msm8937-qfprom

          - qcom,msm8960-qfprom

          - qcom,msm8974-qfprom

          - qcom,msm8976-qfprom

          - qcom,msm8996-qfprom
@@ -51,6 +54,7 @@ properties: 
          - qcom,sm8450-qfprom

          - qcom,sm8550-qfprom

          - qcom,sm8650-qfprom

          - qcom,x1e80100-qfprom

      - const: qcom,qfprom



  reg:

Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml

+25 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    enum:

      - rockchip,px30-otp

      - rockchip,rk3308-otp

      - rockchip,rk3576-otp

      - rockchip,rk3588-otp



  reg:
@@ -62,12 +63,34 @@ allOf: 
      properties:

        clocks:

          maxItems: 3

        clock-names:

          maxItems: 3

        resets:

          maxItems: 1

        reset-names:

          items:

            - const: phy



  - if:

      properties:

        compatible:

          contains:

            enum:

              - rockchip,rk3576-otp

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          maxItems: 3

        resets:

          minItems: 2

          maxItems: 2

        reset-names:

          items:

            - const: otp

            - const: apb



  - if:

      properties:

        compatible:
@@ -78,6 +101,8 @@ allOf: 
      properties:

        clocks:

          minItems: 4

        clock-names:

          minItems: 4

        resets:

          minItems: 3

        reset-names:

drivers/android/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -6373,7 +6373,7 @@ static void print_binder_transaction_ilocked(struct seq_file *m, 
		seq_printf(m, " node %d", buffer->target_node->debug_id);

	seq_printf(m, " size %zd:%zd offset %lx\n",

		   buffer->data_size, buffer->offsets_size,

		   proc->alloc.vm_start - buffer->user_data);

		   buffer->user_data - proc->alloc.vm_start);

}



static void print_binder_work_ilocked(struct seq_file *m,

drivers/char/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int __init misc_init(void) 
		goto fail_remove;



	err = -EIO;

	if (register_chrdev(MISC_MAJOR, "misc", &misc_fops))

	if (__register_chrdev(MISC_MAJOR, 0, MINORMASK + 1, "misc", &misc_fops))

		goto fail_printk;

	return 0;