Commit 8c7a8608 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'ib-mfd-gpio-power-soc-v6.17' of... 

Merge tag 'ib-mfd-gpio-power-soc-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into gpio/for-next

Immutable branch between MFD, GPIO, Power and SoC due for the v6.17 merge window
parents cc2f156a 819687eb

Documentation/devicetree/bindings/gpio/apple,smc-gpio.yaml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/gpio/apple,smc-gpio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Apple Mac System Management Controller GPIO



maintainers:

  - Sven Peter <sven@kernel.org>



description:

  Apple Mac System Management Controller GPIO block.



properties:

  compatible:

    const: apple,smc-gpio



  gpio-controller: true



  '#gpio-cells':

    const: 2



required:

  - compatible

  - gpio-controller

  - '#gpio-cells'



additionalProperties: false

Documentation/devicetree/bindings/mfd/apple,smc.yaml

0 → 100644
+79 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/apple,smc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Apple Mac System Management Controller



maintainers:

  - Sven Peter <sven@kernel.org>



description:

  Apple Mac System Management Controller implements various functions

  such as GPIO, RTC, power, reboot.



properties:

  compatible:

    items:

      - enum:

          - apple,t6000-smc

          - apple,t8103-smc

          - apple,t8112-smc

      - const: apple,smc



  reg:

    items:

      - description: SMC area

      - description: SRAM area



  reg-names:

    items:

      - const: smc

      - const: sram



  mboxes:

    maxItems: 1



  gpio:

    $ref: /schemas/gpio/apple,smc-gpio.yaml



  reboot:

    $ref: /schemas/power/reset/apple,smc-reboot.yaml



additionalProperties: false



required:

  - compatible

  - reg

  - reg-names

  - mboxes



examples:

  - |

    soc {

      #address-cells = <2>;

      #size-cells = <2>;



      smc@23e400000 {

        compatible = "apple,t8103-smc", "apple,smc";

        reg = <0x2 0x3e400000 0x0 0x4000>,

               <0x2 0x3fe00000 0x0 0x100000>;

        reg-names = "smc", "sram";

        mboxes = <&smc_mbox>;



        smc_gpio: gpio {

          compatible = "apple,smc-gpio";

          gpio-controller;

          #gpio-cells = <2>;

        };



        reboot {

          compatible = "apple,smc-reboot";

          nvmem-cells = <&shutdown_flag>, <&boot_stage>,

                        <&boot_error_count>, <&panic_count>;

          nvmem-cell-names = "shutdown_flag", "boot_stage",

                             "boot_error_count", "panic_count";

        };

      };

    };

Documentation/devicetree/bindings/power/reset/apple,smc-reboot.yaml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/power/reset/apple,smc-reboot.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Apple SMC Reboot Controller



description:

  The Apple System Management Controller (SMC) provides reboot functionality

  on Apple Silicon SoCs. It uses NVMEM cells to store and track various

  system state information related to boot, shutdown, and panic events.



maintainers:

  - Sven Peter <sven@kernel.org>



properties:

  compatible:

    const: apple,smc-reboot



  nvmem-cells:

    items:

      - description: Flag indicating shutdown (as opposed to reboot)

      - description: Stage at which the boot process stopped (0x30 for normal boot)

      - description: Counter for boot errors

      - description: Counter for system panics



  nvmem-cell-names:

    items:

      - const: shutdown_flag

      - const: boot_stage

      - const: boot_error_count

      - const: panic_count



required:

  - compatible

  - nvmem-cells

  - nvmem-cell-names



additionalProperties: false

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2332,6 +2332,7 @@ F: Documentation/devicetree/bindings/arm/apple/* 
F:	Documentation/devicetree/bindings/clock/apple,nco.yaml

F:	Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml

F:	Documentation/devicetree/bindings/dma/apple,admac.yaml

F:	Documentation/devicetree/bindings/gpio/apple,smc-gpio.yaml

F:	Documentation/devicetree/bindings/i2c/apple,i2c.yaml

F:	Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml

F:	Documentation/devicetree/bindings/interrupt-controller/apple,*
@@ -2339,6 +2340,7 @@ F: Documentation/devicetree/bindings/iommu/apple,dart.yaml 
F:	Documentation/devicetree/bindings/iommu/apple,sart.yaml

F:	Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml

F:	Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml

F:	Documentation/devicetree/bindings/mfd/apple,smc.yaml

F:	Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml

F:	Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml

F:	Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
@@ -2346,6 +2348,7 @@ F: Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml 
F:	Documentation/devicetree/bindings/pci/apple,pcie.yaml

F:	Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml

F:	Documentation/devicetree/bindings/power/apple*

F:	Documentation/devicetree/bindings/power/reset/apple,smc-reboot.yaml

F:	Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml

F:	Documentation/devicetree/bindings/spi/apple,spi.yaml

F:	Documentation/devicetree/bindings/spmi/apple,spmi.yaml
@@ -2355,6 +2358,7 @@ F: drivers/bluetooth/hci_bcm4377.c 
F:	drivers/clk/clk-apple-nco.c

F:	drivers/cpufreq/apple-soc-cpufreq.c

F:	drivers/dma/apple-admac.c

F:	drivers/gpio/gpio-macsmc.c

F:	drivers/pmdomain/apple/

F:	drivers/i2c/busses/i2c-pasemi-core.c

F:	drivers/i2c/busses/i2c-pasemi-platform.c
@@ -2362,10 +2366,12 @@ F: drivers/input/touchscreen/apple_z2.c 
F:	drivers/iommu/apple-dart.c

F:	drivers/iommu/io-pgtable-dart.c

F:	drivers/irqchip/irq-apple-aic.c

F:	drivers/mfd/macsmc.c

F:	drivers/nvme/host/apple.c

F:	drivers/nvmem/apple-efuses.c

F:	drivers/nvmem/apple-spmi-nvmem.c

F:	drivers/pinctrl/pinctrl-apple-gpio.c

F:	drivers/power/reset/macsmc-reboot.c

F:	drivers/pwm/pwm-apple.c

F:	drivers/soc/apple/*

F:	drivers/spi/spi-apple.c
@@ -2374,6 +2380,7 @@ F: drivers/video/backlight/apple_dwi_bl.c 
F:	drivers/watchdog/apple_wdt.c

F:	include/dt-bindings/interrupt-controller/apple-aic.h

F:	include/dt-bindings/pinctrl/apple.h

F:	include/linux/mfd/macsmc.h

F:	include/linux/soc/apple/*

F:	include/uapi/drm/asahi_drm.h
































drivers/gpio/Kconfig



+10
−0






























Original line number
Diff line number
Diff line







@@ -1473,6 +1473,16 @@ config GPIO_LP87565







	  This driver can also be built as a module. If so, the module will be









	  called gpio-lp87565.



















config GPIO_MACSMC









	tristate "Apple Mac SMC GPIO"









	depends on MFD_MACSMC









	help









	  Support for GPIOs controlled by the SMC microcontroller on Apple Mac









	  systems.



















	  This driver can also be built as a module. If so, the module will be









	  called gpio-macsmc.



















config GPIO_MADERA









	tristate "Cirrus Logic Madera class codecs"









	depends on PINCTRL_MADERA