Merge tag 'mfd-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2021 19:38:59 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2021 19:38:59 +0000 (12:38 -0700)
Pull MFD updates from Lee Jones:
 "Core Frameworks:
   - Add support for registering devices via MFD cells to Simple MFD (I2C)

  New Drivers:
   - Add support for Renesas Synchronization Management Unit (SMU)

  New Device Support:
   - Add support for N5010 to Intel M10 BMC
   - Add support for Cannon Lake to Intel LPSS ACPI
   - Add support for Samsung SSG{1,2} to ST-Ericsson's U8500 family
   - Add support for TQMx110EB and TQMxE40x to TQ-Systems PLD TQMx86

  New Functionality:
   - Add support for GPIO to Intel LPC ICH
   - Add support for Reset to Texas Instruments TPS65086

  Fix-ups:
   - Trivial, sorting, whitespace, renaming, etc; mt6360-core, db8500-prcmu-regs, tqmx86
   - Device Tree fiddling; syscon, axp20x, qcom,pm8008, ti,tps65086, brcm,cru
   - Use proper APIs for IRQ map resolution; ab8500-core, stmpe, tc3589x, wm8994-irq
   - Pass 'supplied-from' property through axp288_fuel_gauge via swnode
   - Remove unused file entry; MAINTAINERS
   - Make interrupt line optional; tps65086
   - Rename db8500-cpuidle driver symbol; db8500-prcmu
   - Remove support for unused hardware; tqmx86
   - Provide a standard LPC clock frequency for unknown boards; tqmx86
   - Remove unused code; ti_am335x_tscadc
   - Use of_iomap() instead of ioremap(); syscon

  Bug Fixes:
   - Clear GPIO IRQ resource flags when no IRQ is set; tqmx86
   - Fix incorrect/misleading frequencies; db8500-prcmu
   - Mitigate namespace clash with other GPIOBASE users"

* tag 'mfd-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (31 commits)
  mfd: lpc_sch: Rename GPIOBASE to prevent build error
  mfd: syscon: Use of_iomap() instead of ioremap()
  dt-bindings: mfd: Add Broadcom CRU
  mfd: ti_am335x_tscadc: Delete superfluous error message
  mfd: tqmx86: Assume 24MHz LPC clock for unknown boards
  mfd: tqmx86: Add support for TQ-Systems DMI IDs
  mfd: tqmx86: Add support for TQMx110EB and TQMxE40x
  mfd: tqmx86: Fix typo in "platform"
  mfd: tqmx86: Remove incorrect TQMx90UC board ID
  mfd: tqmx86: Clear GPIO IRQ resource when no IRQ is set
  mfd: simple-mfd-i2c: Add support for registering devices via MFD cells
  mfd/cpuidle: ux500: Rename driver symbol
  mfd: tps65086: Add cell entry for reset driver
  mfd: tps65086: Make interrupt line optional
  dt-bindings: mfd: Convert tps65086.txt to YAML
  MAINTAINERS: Adjust ARM/NOMADIK/Ux500 ARCHITECTURES to file renaming
  mfd: db8500-prcmu: Handle missing FW variant
  mfd: db8500-prcmu: Rename register header
  mfd: axp20x: Add supplied-from property to axp288_fuel_gauge cell
  mfd: Don't use irq_create_mapping() to resolve a mapping
  ...

38 files changed:
Documentation/devicetree/bindings/mfd/axp20x.txt
Documentation/devicetree/bindings/mfd/brcm,cru.yaml [new file with mode: 0644]
Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
Documentation/devicetree/bindings/mfd/syscon.yaml
Documentation/devicetree/bindings/mfd/ti,tps65086.yaml [new file with mode: 0644]
Documentation/devicetree/bindings/mfd/tps65086.txt [deleted file]
MAINTAINERS
drivers/clk/ux500/u8500_of_clk.c
drivers/cpuidle/cpuidle-ux500.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/ab8500-core.c
drivers/mfd/axp20x.c
drivers/mfd/db8500-prcmu-regs.h [new file with mode: 0644]
drivers/mfd/db8500-prcmu.c
drivers/mfd/dbx500-prcmu-regs.h [deleted file]
drivers/mfd/intel-lpss-acpi.c
drivers/mfd/intel-m10-bmc.c
drivers/mfd/lpc_ich.c
drivers/mfd/lpc_sch.c
drivers/mfd/mt6360-core.c
drivers/mfd/rsmu.h [new file with mode: 0644]
drivers/mfd/rsmu_core.c [new file with mode: 0644]
drivers/mfd/rsmu_i2c.c [new file with mode: 0644]
drivers/mfd/rsmu_spi.c [new file with mode: 0644]
drivers/mfd/simple-mfd-i2c.c
drivers/mfd/simple-mfd-i2c.h [new file with mode: 0644]
drivers/mfd/stmpe.c
drivers/mfd/syscon.c
drivers/mfd/tc3589x.c
drivers/mfd/ti_am335x_tscadc.c
drivers/mfd/tps65086.c
drivers/mfd/tqmx86.c
drivers/mfd/wm8994-irq.c
include/linux/mfd/dbx500-prcmu.h
include/linux/mfd/idt82p33_reg.h [new file with mode: 0644]
include/linux/mfd/idt8a340_reg.h [new file with mode: 0644]
include/linux/mfd/rsmu.h [new file with mode: 0644]

index 4991a64..2b53dcc 100644 (file)
@@ -26,10 +26,10 @@ Required properties:
     * "x-powers,axp803"
     * "x-powers,axp806"
     * "x-powers,axp805", "x-powers,axp806"
+    * "x-powers,axp305", "x-powers,axp805", "x-powers,axp806"
     * "x-powers,axp809"
     * "x-powers,axp813"
 - reg: The I2C slave address or RSB hardware address for the AXP chip
-- interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
 - interrupt-controller: The PMIC has its own internal IRQs
 - #interrupt-cells: Should be set to 1
 
@@ -43,6 +43,7 @@ more information:
                        AXP20x/LDO3: software-based implementation
 
 Optional properties:
+- interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
 - x-powers,dcdc-freq: defines the work frequency of DC-DC in KHz
                      AXP152/20X: range:  750-1875, Default: 1.5 MHz
                      AXP22X/8XX: range: 1800-4050, Default: 3   MHz
diff --git a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml
new file mode 100644 (file)
index 0000000..fc1317a
--- /dev/null
@@ -0,0 +1,86 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/brcm,cru.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom CRU
+
+maintainers:
+  - Rafał Miłecki <rafal@milecki.pl>
+
+description: |
+  Broadcom CRU ("Clock and Reset Unit" or "Central Resource Unit") is a hardware
+  block grouping smaller blocks. On Broadcom Northstar platform it contains e.g.
+  clocks, pinctrl, USB PHY and thermal.
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - brcm,ns-cru
+      - const: simple-mfd
+
+  reg:
+    description: CRU registers
+
+  ranges: true
+
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 1
+
+  pinctrl:
+    $ref: ../pinctrl/brcm,ns-pinmux.yaml
+
+patternProperties:
+  '^clock-controller@[a-f0-9]+$':
+    $ref: ../clock/brcm,iproc-clocks.yaml
+
+  '^thermal@[a-f0-9]+$':
+    $ref: ../thermal/brcm,ns-thermal.yaml
+
+additionalProperties: false
+
+required:
+  - reg
+
+examples:
+  - |
+    cru-bus@1800c100 {
+        compatible = "brcm,ns-cru", "simple-mfd";
+        reg = <0x1800c100 0x1d0>;
+        ranges;
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        clock-controller@100 {
+            #clock-cells = <1>;
+            compatible = "brcm,nsp-lcpll0";
+            reg = <0x100 0x14>;
+            clocks = <&osc>;
+            clock-output-names = "lcpll0", "pcie_phy", "sdio", "ddr_phy";
+        };
+
+        clock-controller@140 {
+            #clock-cells = <1>;
+            compatible = "brcm,nsp-genpll";
+            reg = <0x140 0x24>;
+            clocks = <&osc>;
+            clock-output-names = "genpll", "phy", "ethernetclk", "usbclk",
+                                 "iprocfast", "sata1", "sata2";
+        };
+
+        pinctrl {
+            compatible = "brcm,bcm4708-pinmux";
+            offset = <0x1c0>;
+        };
+
+        thermal@2c0 {
+            compatible = "brcm,ns-thermal";
+            reg = <0x2c0 0x10>;
+            #thermal-sensor-cells = <0>;
+        };
+    };
index 7799368..ec3138c 100644 (file)
@@ -53,7 +53,9 @@ patternProperties:
 
     properties:
       compatible:
-        const: qcom,pm8008-gpio
+        items:
+          - const: qcom,pm8008-gpio
+          - const: qcom,spmi-gpio
 
       reg:
         description: Peripheral address of one of the two GPIO peripherals.
@@ -61,6 +63,9 @@ patternProperties:
 
       gpio-controller: true
 
+      gpio-ranges:
+        maxItems: 1
+
       interrupt-controller: true
 
       "#interrupt-cells":
@@ -75,6 +80,7 @@ patternProperties:
       - gpio-controller
       - interrupt-controller
       - "#gpio-cells"
+      - gpio-ranges
       - "#interrupt-cells"
 
     additionalProperties: false
@@ -107,10 +113,11 @@ examples:
         interrupt-parent = <&tlmm>;
         interrupts = <32 IRQ_TYPE_EDGE_RISING>;
 
-        gpio@c000 {
-          compatible = "qcom,pm8008-gpio";
+        pm8008_gpios: gpio@c000 {
+          compatible = "qcom,pm8008-gpio", "qcom,spmi-gpio";
           reg = <0xc000>;
           gpio-controller;
+          gpio-ranges = <&pm8008_gpios 0 0 2>;
           #gpio-cells = <2>;
           interrupt-controller;
           #interrupt-cells = <2>;
index f14ae6d..abe3fd8 100644 (file)
@@ -45,9 +45,12 @@ properties:
               - microchip,sparx5-cpu-syscon
               - mstar,msc313-pmsleep
               - rockchip,px30-qos
+              - rockchip,rk3036-qos
               - rockchip,rk3066-qos
+              - rockchip,rk3228-qos
               - rockchip,rk3288-qos
               - rockchip,rk3399-qos
+              - rockchip,rk3568-qos
               - samsung,exynos3-sysreg
               - samsung,exynos4-sysreg
               - samsung,exynos5-sysreg
diff --git a/Documentation/devicetree/bindings/mfd/ti,tps65086.yaml b/Documentation/devicetree/bindings/mfd/ti,tps65086.yaml
new file mode 100644 (file)
index 0000000..6aeedda
--- /dev/null
@@ -0,0 +1,124 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/ti,tps65086.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: TPS65086 Power Management Integrated Circuit (PMIC)
+
+maintainers:
+  - Emil Renner Berthing <kernel@esmil.dk>
+
+properties:
+  compatible:
+    const: ti,tps65086
+
+  reg:
+    const: 0x5e
+    description: I2C slave address
+
+  interrupts:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  '#interrupt-cells':
+    const: 2
+    description: |
+      The first cell is the IRQ number. The second cell is the flags,
+      encoded as trigger masks from ../interrupt-controller/interrupts.txt.
+
+  gpio-controller: true
+
+  '#gpio-cells':
+    const: 2
+    description: |
+      The first cell is the pin number and the second cell is used to specify
+      flags.  See ../gpio/gpio.txt for more information.
+
+  regulators:
+    type: object
+    description: |
+      List of child nodes that specify the regulator initialization data.
+      Child nodes must be named after their hardware counterparts:
+      buck[1-6], ldoa[1-3], swa1, swb[1-2], and vtt.
+      Each child node is defined using the standard binding for regulators and
+      the optional regulator properties defined below.
+
+    patternProperties:
+      "^buck[1-6]$":
+        type: object
+        $ref: ../regulator/regulator.yaml
+
+        properties:
+          regulator-name: true
+          regulator-boot-on: true
+          regulator-always-on: true
+          regulator-min-microvolt: true
+          regulator-max-microvolt: true
+          ti,regulator-step-size-25mv:
+            type: boolean
+            description: |
+              Set this if the regulator is factory set with a 25mv step voltage
+              mapping.
+          ti,regulator-decay:
+            type: boolean
+            description: |
+              Set this if the output needs to decay, default is for the output
+              to slew down.
+
+        additionalProperties: false
+
+      "^(ldoa[1-3]|swa1|swb[1-2]|vtt)$":
+        type: object
+        $ref: ../regulator/regulator.yaml
+
+        properties:
+          regulator-name: true
+          regulator-boot-on: true
+          regulator-always-on: true
+          regulator-min-microvolt: true
+          regulator-max-microvolt: true
+
+        additionalProperties: false
+
+additionalProperties: false
+
+required:
+  - compatible
+  - reg
+  - gpio-controller
+  - '#gpio-cells'
+  - regulators
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    i2c0 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pmic: pmic@5e {
+            compatible = "ti,tps65086";
+            reg = <0x5e>;
+            interrupt-parent = <&gpio1>;
+            interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
+            interrupt-controller;
+            #interrupt-cells = <2>;
+            gpio-controller;
+            #gpio-cells = <2>;
+
+            regulators {
+                buck1 {
+                    regulator-name = "vcc1";
+                    regulator-min-microvolt = <1600000>;
+                    regulator-max-microvolt = <1600000>;
+                    regulator-boot-on;
+                    ti,regulator-decay;
+                    ti,regulator-step-size-25mv;
+                };
+            };
+        };
+    };
+
+...
diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
deleted file mode 100644 (file)
index 67eac0e..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-* TPS65086 Power Management Integrated Circuit (PMIC) bindings
-
-Required properties:
- - compatible          : Should be "ti,tps65086".
- - reg                 : I2C slave address.
- - interrupts          : The interrupt line the device is connected to.
- - interrupt-controller        : Marks the device node as an interrupt controller.
- - #interrupt-cells    : The number of cells to describe an IRQ, should be 2.
-                           The first cell is the IRQ number.
-                           The second cell is the flags, encoded as trigger
-                           masks from ../interrupt-controller/interrupts.txt.
- - gpio-controller      : Marks the device node as a GPIO Controller.
- - #gpio-cells          : Should be two.  The first cell is the pin number and
-                            the second cell is used to specify flags.
-                            See ../gpio/gpio.txt for more information.
- - regulators:          : List of child nodes that specify the regulator
-                            initialization data. Child nodes must be named
-                            after their hardware counterparts: buck[1-6],
-                            ldoa[1-3], swa1, swb[1-2], and vtt. Each child
-                            node is defined using the standard binding for
-                            regulators and the optional regulator properties
-                            defined below.
-
-Optional regulator properties:
- - ti,regulator-step-size-25mv : This is applicable for buck[1-6], set this
-                                   if the regulator is factory set with a 25mv
-                                   step voltage mapping.
- - ti,regulator-decay          : This is applicable for buck[1-6], set this if
-                                   the output needs to decay, default is for
-                                   the output to slew down.
-
-Example:
-
-       pmic: tps65086@5e {
-               compatible = "ti,tps65086";
-               reg = <0x5e>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               regulators {
-                       buck1 {
-                               regulator-name = "vcc1";
-                               regulator-min-microvolt = <1600000>;
-                               regulator-max-microvolt = <1600000>;
-                               regulator-boot-on;
-                               ti,regulator-decay;
-                               ti,regulator-step-size-25mv;
-                       };
-               };
-       };
index 4e47960..459ac1e 100644 (file)
@@ -2271,7 +2271,6 @@ F:        drivers/iio/adc/ab8500-gpadc.c
 F:     drivers/mfd/ab8500*
 F:     drivers/mfd/abx500*
 F:     drivers/mfd/db8500*
-F:     drivers/mfd/dbx500*
 F:     drivers/pinctrl/nomadik/
 F:     drivers/rtc/rtc-ab8500.c
 F:     drivers/rtc/rtc-pl031.c
index 0aedd42..528c5bb 100644 (file)
@@ -99,10 +99,11 @@ static void u8500_clk_init(struct device_node *np)
        if (fw_version != NULL) {
                switch (fw_version->project) {
                case PRCMU_FW_PROJECT_U8500_C2:
-               case PRCMU_FW_PROJECT_U8500_MBL:
+               case PRCMU_FW_PROJECT_U8500_SSG1:
                case PRCMU_FW_PROJECT_U8520:
                case PRCMU_FW_PROJECT_U8420:
                case PRCMU_FW_PROJECT_U8420_SYSCLK:
+               case PRCMU_FW_PROJECT_U8500_SSG2:
                        sgaclk_parent = "soc0_pll";
                        break;
                default:
index a2d34be..f7d7785 100644 (file)
@@ -117,7 +117,7 @@ static int dbx500_cpuidle_probe(struct platform_device *pdev)
 
 static struct platform_driver dbx500_cpuidle_plat_driver = {
        .driver = {
-               .name = "cpuidle-dbx500",
+               .name = "db8500-cpuidle",
        },
        .probe = dbx500_cpuidle_probe,
 };
index 01bb42f..ca0edab 100644 (file)
@@ -2199,5 +2199,33 @@ config MFD_INTEL_M10_BMC
          additional drivers must be enabled in order to use the functionality
          of the device.
 
+config MFD_RSMU_I2C
+       tristate "Renesas Synchronization Management Unit with I2C"
+       depends on I2C && OF
+       select MFD_CORE
+       select REGMAP_I2C
+       help
+         Support for the Renesas Synchronization Management Unit, such as
+         Clockmatrix and 82P33XXX series. This option supports I2C as
+         the control interface.
+
+         This driver provides common support for accessing the device.
+         Additional drivers must be enabled in order to use the functionality
+         of the device.
+
+config MFD_RSMU_SPI
+       tristate "Renesas Synchronization Management Unit with SPI"
+       depends on SPI && OF
+       select MFD_CORE
+       select REGMAP_SPI
+       help
+         Support for the Renesas Synchronization Management Unit, such as
+         Clockmatrix and 82P33XXX series. This option supports SPI as
+         the control interface.
+
+         This driver provides common support for accessing the device.
+         Additional drivers must be enabled in order to use the functionality
+         of the device.
+
 endmenu
 endif
index 570b9ff..2ba6646 100644 (file)
@@ -273,3 +273,8 @@ obj-$(CONFIG_MFD_INTEL_M10_BMC)   += intel-m10-bmc.o
 
 obj-$(CONFIG_MFD_ATC260X)      += atc260x-core.o
 obj-$(CONFIG_MFD_ATC260X_I2C)  += atc260x-i2c.o
+
+rsmu-i2c-objs                  := rsmu_core.o rsmu_i2c.o
+rsmu-spi-objs                  := rsmu_core.o rsmu_spi.o
+obj-$(CONFIG_MFD_RSMU_I2C)     += rsmu-i2c.o
+obj-$(CONFIG_MFD_RSMU_SPI)     += rsmu-spi.o
index 3048967..cca0aac 100644 (file)
@@ -485,7 +485,7 @@ static int ab8500_handle_hierarchical_line(struct ab8500 *ab8500,
                if (line == AB8540_INT_GPIO43F || line == AB8540_INT_GPIO44F)
                        line += 1;
 
-               handle_nested_irq(irq_create_mapping(ab8500->domain, line));
+               handle_nested_irq(irq_find_mapping(ab8500->domain, line));
        }
 
        return 0;
index 4145a38..8161a5d 100644 (file)
@@ -125,12 +125,13 @@ static const struct regmap_range axp288_writeable_ranges[] = {
 
 static const struct regmap_range axp288_volatile_ranges[] = {
        regmap_reg_range(AXP20X_PWR_INPUT_STATUS, AXP288_POWER_REASON),
+       regmap_reg_range(AXP22X_PWR_OUT_CTRL1, AXP22X_ALDO3_V_OUT),
        regmap_reg_range(AXP288_BC_GLOBAL, AXP288_BC_GLOBAL),
        regmap_reg_range(AXP288_BC_DET_STAT, AXP20X_VBUS_IPSOUT_MGMT),
        regmap_reg_range(AXP20X_CHRG_BAK_CTRL, AXP20X_CHRG_BAK_CTRL),
        regmap_reg_range(AXP20X_IRQ1_EN, AXP20X_IPSOUT_V_HIGH_L),
        regmap_reg_range(AXP20X_TIMER_CTRL, AXP20X_TIMER_CTRL),
-       regmap_reg_range(AXP22X_GPIO_STATE, AXP22X_GPIO_STATE),
+       regmap_reg_range(AXP20X_GPIO1_CTRL, AXP22X_GPIO_STATE),
        regmap_reg_range(AXP288_RT_BATT_V_H, AXP288_RT_BATT_V_L),
        regmap_reg_range(AXP20X_FG_RES, AXP288_FG_CC_CAP_REG),
 };
@@ -699,6 +700,18 @@ static const struct resource axp288_charger_resources[] = {
        DEFINE_RES_IRQ(AXP288_IRQ_CBTO),
 };
 
+static const char * const axp288_fuel_gauge_suppliers[] = { "axp288_charger" };
+
+static const struct property_entry axp288_fuel_gauge_properties[] = {
+       PROPERTY_ENTRY_STRING_ARRAY("supplied-from", axp288_fuel_gauge_suppliers),
+       { }
+};
+
+static const struct software_node axp288_fuel_gauge_sw_node = {
+       .name = "axp288_fuel_gauge",
+       .properties = axp288_fuel_gauge_properties,
+};
+
 static const struct mfd_cell axp288_cells[] = {
        {
                .name           = "axp288_adc",
@@ -716,6 +729,7 @@ static const struct mfd_cell axp288_cells[] = {
                .name           = "axp288_fuel_gauge",
                .num_resources  = ARRAY_SIZE(axp288_fuel_gauge_resources),
                .resources      = axp288_fuel_gauge_resources,
+               .swnode         = &axp288_fuel_gauge_sw_node,
        }, {
                .name           = "axp221-pek",
                .num_resources  = ARRAY_SIZE(axp288_power_button_resources),
diff --git a/drivers/mfd/db8500-prcmu-regs.h b/drivers/mfd/db8500-prcmu-regs.h
new file mode 100644 (file)
index 0000000..75fd106
--- /dev/null
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * PRCM Unit registers
+ */
+
+#ifndef __DB8500_PRCMU_REGS_H
+#define __DB8500_PRCMU_REGS_H
+
+#define BITS(_start, _end) ((BIT(_end) - BIT(_start)) + BIT(_end))
+
+#define PRCM_ACLK_MGT          (0x004)
+#define PRCM_SVAMMCSPCLK_MGT   (0x008)
+#define PRCM_SIAMMDSPCLK_MGT   (0x00C)
+#define PRCM_SGACLK_MGT                (0x014)
+#define PRCM_UARTCLK_MGT       (0x018)
+#define PRCM_MSP02CLK_MGT      (0x01C)
+#define PRCM_I2CCLK_MGT                (0x020)
+#define PRCM_SDMMCCLK_MGT      (0x024)
+#define PRCM_SLIMCLK_MGT       (0x028)
+#define PRCM_PER1CLK_MGT       (0x02C)
+#define PRCM_PER2CLK_MGT       (0x030)
+#define PRCM_PER3CLK_MGT       (0x034)
+#define PRCM_PER5CLK_MGT       (0x038)
+#define PRCM_PER6CLK_MGT       (0x03C)
+#define PRCM_PER7CLK_MGT       (0x040)
+#define PRCM_LCDCLK_MGT                (0x044)
+#define PRCM_BMLCLK_MGT                (0x04C)
+#define PRCM_HSITXCLK_MGT      (0x050)
+#define PRCM_HSIRXCLK_MGT      (0x054)
+#define PRCM_HDMICLK_MGT       (0x058)
+#define PRCM_APEATCLK_MGT      (0x05C)
+#define PRCM_APETRACECLK_MGT   (0x060)
+#define PRCM_MCDECLK_MGT       (0x064)
+#define PRCM_IPI2CCLK_MGT      (0x068)
+#define PRCM_DSIALTCLK_MGT     (0x06C)
+#define PRCM_DMACLK_MGT                (0x074)
+#define PRCM_B2R2CLK_MGT       (0x078)
+#define PRCM_TVCLK_MGT         (0x07C)
+#define PRCM_UNIPROCLK_MGT     (0x278)
+#define PRCM_SSPCLK_MGT                (0x280)
+#define PRCM_RNGCLK_MGT                (0x284)
+#define PRCM_UICCCLK_MGT       (0x27C)
+#define PRCM_MSP1CLK_MGT       (0x288)
+
+#define PRCM_ARM_PLLDIVPS      (prcmu_base + 0x118)
+#define PRCM_ARM_PLLDIVPS_ARM_BRM_RATE         0x3f
+#define PRCM_ARM_PLLDIVPS_MAX_MASK             0xf
+
+#define PRCM_PLLARM_LOCKP       (prcmu_base + 0x0a8)
+#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3   0x2
+
+#define PRCM_ARM_CHGCLKREQ     (prcmu_base + 0x114)
+#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_CHGCLKREQ  BIT(0)
+#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_DIVSEL     BIT(16)
+
+#define PRCM_PLLARM_ENABLE     (prcmu_base + 0x98)
+#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_ENABLE  0x1
+#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_COUNTON 0x100
+
+#define PRCM_ARMCLKFIX_MGT     (prcmu_base + 0x0)
+#define PRCM_A9PL_FORCE_CLKEN  (prcmu_base + 0x19C)
+#define PRCM_A9_RESETN_CLR     (prcmu_base + 0x1f4)
+#define PRCM_A9_RESETN_SET     (prcmu_base + 0x1f0)
+#define PRCM_ARM_LS_CLAMP      (prcmu_base + 0x30c)
+#define PRCM_SRAM_A9           (prcmu_base + 0x308)
+
+#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN BIT(0)
+#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN BIT(1)
+
+/* CPU mailbox registers */
+#define PRCM_MBOX_CPU_VAL      (prcmu_base + 0x0fc)
+#define PRCM_MBOX_CPU_SET      (prcmu_base + 0x100)
+#define PRCM_MBOX_CPU_CLR      (prcmu_base + 0x104)
+
+#define PRCM_HOSTACCESS_REQ    (prcmu_base + 0x334)
+#define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ 0x1
+#define PRCM_HOSTACCESS_REQ_WAKE_REQ   BIT(16)
+#define ARM_WAKEUP_MODEM       0x1
+
+#define PRCM_ARM_IT1_CLR       (prcmu_base + 0x48C)
+#define PRCM_ARM_IT1_VAL       (prcmu_base + 0x494)
+#define PRCM_HOLD_EVT          (prcmu_base + 0x174)
+
+#define PRCM_MOD_AWAKE_STATUS  (prcmu_base + 0x4A0)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_COREPD_AWAKE    BIT(0)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_AAPD_AWAKE      BIT(1)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_VMODEM_OFF_ISO  BIT(2)
+
+#define PRCM_ITSTATUS0         (prcmu_base + 0x148)
+#define PRCM_ITSTATUS1         (prcmu_base + 0x150)
+#define PRCM_ITSTATUS2         (prcmu_base + 0x158)
+#define PRCM_ITSTATUS3         (prcmu_base + 0x160)
+#define PRCM_ITSTATUS4         (prcmu_base + 0x168)
+#define PRCM_ITSTATUS5         (prcmu_base + 0x484)
+#define PRCM_ITCLEAR5          (prcmu_base + 0x488)
+#define PRCM_ARMIT_MASKXP70_IT (prcmu_base + 0x1018)
+
+/* System reset register */
+#define PRCM_APE_SOFTRST       (prcmu_base + 0x228)
+
+/* Level shifter and clamp control registers */
+#define PRCM_MMIP_LS_CLAMP_SET     (prcmu_base + 0x420)
+#define PRCM_MMIP_LS_CLAMP_CLR     (prcmu_base + 0x424)
+
+#define PRCM_MMIP_LS_CLAMP_DSIPLL_CLAMP                BIT(11)
+#define PRCM_MMIP_LS_CLAMP_DSIPLL_CLAMPI       BIT(22)
+
+/* PRCMU clock/PLL/reset registers */
+#define PRCM_PLLSOC0_FREQ         (prcmu_base + 0x080)
+#define PRCM_PLLSOC1_FREQ         (prcmu_base + 0x084)
+#define PRCM_PLLARM_FREQ          (prcmu_base + 0x088)
+#define PRCM_PLLDDR_FREQ          (prcmu_base + 0x08C)
+#define PRCM_PLL_FREQ_D_SHIFT  0
+#define PRCM_PLL_FREQ_D_MASK   BITS(0, 7)
+#define PRCM_PLL_FREQ_N_SHIFT  8
+#define PRCM_PLL_FREQ_N_MASK   BITS(8, 13)
+#define PRCM_PLL_FREQ_R_SHIFT  16
+#define PRCM_PLL_FREQ_R_MASK   BITS(16, 18)
+#define PRCM_PLL_FREQ_SELDIV2  BIT(24)
+#define PRCM_PLL_FREQ_DIV2EN   BIT(25)
+
+#define PRCM_PLLDSI_FREQ           (prcmu_base + 0x500)
+#define PRCM_PLLDSI_ENABLE         (prcmu_base + 0x504)
+#define PRCM_PLLDSI_LOCKP          (prcmu_base + 0x508)
+#define PRCM_DSI_PLLOUT_SEL        (prcmu_base + 0x530)
+#define PRCM_DSITVCLK_DIV          (prcmu_base + 0x52C)
+#define PRCM_PLLDSI_LOCKP          (prcmu_base + 0x508)
+#define PRCM_APE_RESETN_SET        (prcmu_base + 0x1E4)
+#define PRCM_APE_RESETN_CLR        (prcmu_base + 0x1E8)
+
+#define PRCM_PLLDSI_ENABLE_PRCM_PLLDSI_ENABLE BIT(0)
+
+#define PRCM_PLLDSI_LOCKP_PRCM_PLLDSI_LOCKP10  BIT(0)
+#define PRCM_PLLDSI_LOCKP_PRCM_PLLDSI_LOCKP3   BIT(1)
+
+#define PRCM_DSI_PLLOUT_SEL_DSI0_PLLOUT_DIVSEL_SHIFT   0
+#define PRCM_DSI_PLLOUT_SEL_DSI0_PLLOUT_DIVSEL_MASK    BITS(0, 2)
+#define PRCM_DSI_PLLOUT_SEL_DSI1_PLLOUT_DIVSEL_SHIFT   8
+#define PRCM_DSI_PLLOUT_SEL_DSI1_PLLOUT_DIVSEL_MASK    BITS(8, 10)
+
+#define PRCM_DSI_PLLOUT_SEL_OFF                0
+#define PRCM_DSI_PLLOUT_SEL_PHI                1
+#define PRCM_DSI_PLLOUT_SEL_PHI_2      2
+#define PRCM_DSI_PLLOUT_SEL_PHI_4      3
+
+#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_DIV_SHIFT       0
+#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_DIV_MASK                BITS(0, 7)
+#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_DIV_SHIFT       8
+#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_DIV_MASK                BITS(8, 15)
+#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_DIV_SHIFT       16
+#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_DIV_MASK                BITS(16, 23)
+#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_EN              BIT(24)
+#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_EN              BIT(25)
+#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_EN              BIT(26)
+
+#define PRCM_APE_RESETN_DSIPLL_RESETN BIT(14)
+
+#define PRCM_CLKOCR               (prcmu_base + 0x1CC)
+#define PRCM_CLKOCR_CLKOUT0_REF_CLK    (1 << 0)
+#define PRCM_CLKOCR_CLKOUT0_MASK       BITS(0, 13)
+#define PRCM_CLKOCR_CLKOUT1_REF_CLK    (1 << 16)
+#define PRCM_CLKOCR_CLKOUT1_MASK       BITS(16, 29)
+
+/* ePOD and memory power signal control registers */
+#define PRCM_EPOD_C_SET            (prcmu_base + 0x410)
+#define PRCM_SRAM_LS_SLEEP         (prcmu_base + 0x304)
+
+/* Debug power control unit registers */
+#define PRCM_POWER_STATE_SET       (prcmu_base + 0x254)
+
+/* Miscellaneous unit registers */
+#define PRCM_DSI_SW_RESET          (prcmu_base + 0x324)
+#define PRCM_GPIOCR                (prcmu_base + 0x138)
+#define PRCM_GPIOCR_DBG_STM_MOD_CMD1            0x800
+#define PRCM_GPIOCR_DBG_UARTMOD_CMD0            0x1
+
+/* PRCMU HW semaphore */
+#define PRCM_SEM                   (prcmu_base + 0x400)
+#define PRCM_SEM_PRCM_SEM BIT(0)
+
+#define PRCM_TCR                   (prcmu_base + 0x1C8)
+#define PRCM_TCR_TENSEL_MASK       BITS(0, 7)
+#define PRCM_TCR_STOP_TIMERS       BIT(16)
+#define PRCM_TCR_DOZE_MODE         BIT(17)
+
+#define PRCM_CLKOCR_CLKODIV0_SHIFT     0
+#define PRCM_CLKOCR_CLKODIV0_MASK      BITS(0, 5)
+#define PRCM_CLKOCR_CLKOSEL0_SHIFT     6
+#define PRCM_CLKOCR_CLKOSEL0_MASK      BITS(6, 8)
+#define PRCM_CLKOCR_CLKODIV1_SHIFT     16
+#define PRCM_CLKOCR_CLKODIV1_MASK      BITS(16, 21)
+#define PRCM_CLKOCR_CLKOSEL1_SHIFT     22
+#define PRCM_CLKOCR_CLKOSEL1_MASK      BITS(22, 24)
+#define PRCM_CLKOCR_CLK1TYPE           BIT(28)
+
+#define PRCM_CLK_MGT_CLKPLLDIV_MASK            BITS(0, 4)
+#define PRCM_CLK_MGT_CLKPLLSW_SOC0             BIT(5)
+#define PRCM_CLK_MGT_CLKPLLSW_SOC1             BIT(6)
+#define PRCM_CLK_MGT_CLKPLLSW_DDR              BIT(7)
+#define PRCM_CLK_MGT_CLKPLLSW_MASK             BITS(5, 7)
+#define PRCM_CLK_MGT_CLKEN                     BIT(8)
+#define PRCM_CLK_MGT_CLK38                     BIT(9)
+#define PRCM_CLK_MGT_CLK38DIV                  BIT(11)
+#define PRCM_SGACLK_MGT_SGACLKDIV_BY_2_5_EN    BIT(12)
+
+/* GPIOCR register */
+#define PRCM_GPIOCR_SPI2_SELECT BIT(23)
+
+#define PRCM_DDR_SUBSYS_APE_MINBW      (prcmu_base + 0x438)
+#define PRCM_CGATING_BYPASS            (prcmu_base + 0x134)
+#define PRCM_CGATING_BYPASS_ICN2       BIT(6)
+
+/* Miscellaneous unit registers */
+#define PRCM_RESOUTN_SET               (prcmu_base + 0x214)
+#define PRCM_RESOUTN_CLR               (prcmu_base + 0x218)
+
+/* System reset register */
+#define PRCM_APE_SOFTRST               (prcmu_base + 0x228)
+
+#endif /* __DB8500_PRCMU_REGS_H */
index 287da20..c1d3e7c 100644 (file)
@@ -37,7 +37,7 @@
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
 #include <linux/platform_data/ux500_wdt.h>
-#include "dbx500-prcmu-regs.h"
+#include "db8500-prcmu-regs.h"
 
 /* Index of different voltages to be used when accessing AVSData */
 #define PRCM_AVS_BASE          0x2FC
@@ -1622,22 +1622,20 @@ static long round_clock_rate(u8 clock, unsigned long rate)
 }
 
 static const unsigned long db8500_armss_freqs[] = {
-       200000000,
-       400000000,
-       800000000,
+       199680000,
+       399360000,
+       798720000,
        998400000
 };
 
 /* The DB8520 has slightly higher ARMSS max frequency */
 static const unsigned long db8520_armss_freqs[] = {
-       200000000,
-       400000000,
-       800000000,
+       199680000,
+       399360000,
+       798720000,
        1152000000
 };
 
-
-
 static long round_armss_rate(unsigned long rate)
 {
        unsigned long freq = 0;
@@ -2567,14 +2565,16 @@ static char *fw_project_name(u32 project)
                return "U8500 C4";
        case PRCMU_FW_PROJECT_U9500_MBL:
                return "U9500 MBL";
-       case PRCMU_FW_PROJECT_U8500_MBL:
-               return "U8500 MBL";
+       case PRCMU_FW_PROJECT_U8500_SSG1:
+               return "U8500 Samsung 1";
        case PRCMU_FW_PROJECT_U8500_MBL2:
                return "U8500 MBL2";
        case PRCMU_FW_PROJECT_U8520:
                return "U8520 MBL";
        case PRCMU_FW_PROJECT_U8420:
                return "U8420";
+       case PRCMU_FW_PROJECT_U8500_SSG2:
+               return "U8500 Samsung 2";
        case PRCMU_FW_PROJECT_U8420_SYSCLK:
                return "U8420-sysclk";
        case PRCMU_FW_PROJECT_U9540:
@@ -2951,14 +2951,13 @@ static const struct mfd_cell common_prcmu_devs[] = {
                .pdata_size = sizeof(db8500_wdt_pdata),
                .id = -1,
        },
+       MFD_CELL_NAME("db8500-cpuidle"),
 };
 
 static const struct mfd_cell db8500_prcmu_devs[] = {
        MFD_CELL_OF("db8500-prcmu-regulators", NULL,
                    &db8500_regulators, sizeof(db8500_regulators), 0,
                    "stericsson,db8500-prcmu-regulator"),
-       MFD_CELL_OF("cpuidle-dbx500",
-                   NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),
        MFD_CELL_OF("db8500-thermal",
                    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
 };
diff --git a/drivers/mfd/dbx500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h
deleted file mode 100644 (file)
index 75fd106..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- *
- * PRCM Unit registers
- */
-
-#ifndef __DB8500_PRCMU_REGS_H
-#define __DB8500_PRCMU_REGS_H
-
-#define BITS(_start, _end) ((BIT(_end) - BIT(_start)) + BIT(_end))
-
-#define PRCM_ACLK_MGT          (0x004)
-#define PRCM_SVAMMCSPCLK_MGT   (0x008)
-#define PRCM_SIAMMDSPCLK_MGT   (0x00C)
-#define PRCM_SGACLK_MGT                (0x014)
-#define PRCM_UARTCLK_MGT       (0x018)
-#define PRCM_MSP02CLK_MGT      (0x01C)
-#define PRCM_I2CCLK_MGT                (0x020)
-#define PRCM_SDMMCCLK_MGT      (0x024)
-#define PRCM_SLIMCLK_MGT       (0x028)
-#define PRCM_PER1CLK_MGT       (0x02C)
-#define PRCM_PER2CLK_MGT       (0x030)
-#define PRCM_PER3CLK_MGT       (0x034)
-#define PRCM_PER5CLK_MGT       (0x038)
-#define PRCM_PER6CLK_MGT       (0x03C)
-#define PRCM_PER7CLK_MGT       (0x040)
-#define PRCM_LCDCLK_MGT                (0x044)
-#define PRCM_BMLCLK_MGT                (0x04C)
-#define PRCM_HSITXCLK_MGT      (0x050)
-#define PRCM_HSIRXCLK_MGT      (0x054)
-#define PRCM_HDMICLK_MGT       (0x058)
-#define PRCM_APEATCLK_MGT      (0x05C)
-#define PRCM_APETRACECLK_MGT   (0x060)
-#define PRCM_MCDECLK_MGT       (0x064)
-#define PRCM_IPI2CCLK_MGT      (0x068)
-#define PRCM_DSIALTCLK_MGT     (0x06C)
-#define PRCM_DMACLK_MGT                (0x074)
-#define PRCM_B2R2CLK_MGT       (0x078)
-#define PRCM_TVCLK_MGT         (0x07C)
-#define PRCM_UNIPROCLK_MGT     (0x278)
-#define PRCM_SSPCLK_MGT                (0x280)
-#define PRCM_RNGCLK_MGT                (0x284)
-#define PRCM_UICCCLK_MGT       (0x27C)
-#define PRCM_MSP1CLK_MGT       (0x288)
-
-#define PRCM_ARM_PLLDIVPS      (prcmu_base + 0x118)
-#define PRCM_ARM_PLLDIVPS_ARM_BRM_RATE         0x3f
-#define PRCM_ARM_PLLDIVPS_MAX_MASK             0xf
-
-#define PRCM_PLLARM_LOCKP       (prcmu_base + 0x0a8)
-#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3   0x2
-
-#define PRCM_ARM_CHGCLKREQ     (prcmu_base + 0x114)
-#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_CHGCLKREQ  BIT(0)
-#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_DIVSEL     BIT(16)
-
-#define PRCM_PLLARM_ENABLE     (prcmu_base + 0x98)
-#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_ENABLE  0x1
-#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_COUNTON 0x100
-
-#define PRCM_ARMCLKFIX_MGT     (prcmu_base + 0x0)
-#define PRCM_A9PL_FORCE_CLKEN  (prcmu_base + 0x19C)
-#define PRCM_A9_RESETN_CLR     (prcmu_base + 0x1f4)
-#define PRCM_A9_RESETN_SET     (prcmu_base + 0x1f0)
-#define PRCM_ARM_LS_CLAMP      (prcmu_base + 0x30c)
-#define PRCM_SRAM_A9           (prcmu_base + 0x308)
-
-#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN BIT(0)
-#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN BIT(1)
-
-/* CPU mailbox registers */
-#define PRCM_MBOX_CPU_VAL      (prcmu_base + 0x0fc)
-#define PRCM_MBOX_CPU_SET      (prcmu_base + 0x100)
-#define PRCM_MBOX_CPU_CLR      (prcmu_base + 0x104)
-
-#define PRCM_HOSTACCESS_REQ    (prcmu_base + 0x334)
-#define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ 0x1
-#define PRCM_HOSTACCESS_REQ_WAKE_REQ   BIT(16)
-#define ARM_WAKEUP_MODEM       0x1
-
-#define PRCM_ARM_IT1_CLR       (prcmu_base + 0x48C)
-#define PRCM_ARM_IT1_VAL       (prcmu_base + 0x494)
-#define PRCM_HOLD_EVT          (prcmu_base + 0x174)
-
-#define PRCM_MOD_AWAKE_STATUS  (prcmu_base + 0x4A0)
-#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_COREPD_AWAKE    BIT(0)
-#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_AAPD_AWAKE      BIT(1)
-#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_VMODEM_OFF_ISO  BIT(2)
-
-#define PRCM_ITSTATUS0         (prcmu_base + 0x148)
-#define PRCM_ITSTATUS1         (prcmu_base + 0x150)
-#define PRCM_ITSTATUS2         (prcmu_base + 0x158)
-#define PRCM_ITSTATUS3         (prcmu_base + 0x160)
-#define PRCM_ITSTATUS4         (prcmu_base + 0x168)
-#define PRCM_ITSTATUS5         (prcmu_base + 0x484)
-#define PRCM_ITCLEAR5          (prcmu_base + 0x488)
-#define PRCM_ARMIT_MASKXP70_IT (prcmu_base + 0x1018)
-
-/* System reset register */
-#define PRCM_APE_SOFTRST       (prcmu_base + 0x228)
-
-/* Level shifter and clamp control registers */
-#define PRCM_MMIP_LS_CLAMP_SET     (prcmu_base + 0x420)
-#define PRCM_MMIP_LS_CLAMP_CLR     (prcmu_base + 0x424)
-
-#define PRCM_MMIP_LS_CLAMP_DSIPLL_CLAMP                BIT(11)
-#define PRCM_MMIP_LS_CLAMP_DSIPLL_CLAMPI       BIT(22)
-
-/* PRCMU clock/PLL/reset registers */
-#define PRCM_PLLSOC0_FREQ         (prcmu_base + 0x080)
-#define PRCM_PLLSOC1_FREQ         (prcmu_base + 0x084)
-#define PRCM_PLLARM_FREQ          (prcmu_base + 0x088)
-#define PRCM_PLLDDR_FREQ          (prcmu_base + 0x08C)
-#define PRCM_PLL_FREQ_D_SHIFT  0
-#define PRCM_PLL_FREQ_D_MASK   BITS(0, 7)
-#define PRCM_PLL_FREQ_N_SHIFT  8
-#define PRCM_PLL_FREQ_N_MASK   BITS(8, 13)
-#define PRCM_PLL_FREQ_R_SHIFT  16
-#define PRCM_PLL_FREQ_R_MASK   BITS(16, 18)
-#define PRCM_PLL_FREQ_SELDIV2  BIT(24)
-#define PRCM_PLL_FREQ_DIV2EN   BIT(25)
-
-#define PRCM_PLLDSI_FREQ           (prcmu_base + 0x500)
-#define PRCM_PLLDSI_ENABLE         (prcmu_base + 0x504)
-#define PRCM_PLLDSI_LOCKP          (prcmu_base + 0x508)
-#define PRCM_DSI_PLLOUT_SEL        (prcmu_base + 0x530)
-#define PRCM_DSITVCLK_DIV          (prcmu_base + 0x52C)
-#define PRCM_PLLDSI_LOCKP          (prcmu_base + 0x508)
-#define PRCM_APE_RESETN_SET        (prcmu_base + 0x1E4)
-#define PRCM_APE_RESETN_CLR        (prcmu_base + 0x1E8)
-
-#define PRCM_PLLDSI_ENABLE_PRCM_PLLDSI_ENABLE BIT(0)
-
-#define PRCM_PLLDSI_LOCKP_PRCM_PLLDSI_LOCKP10  BIT(0)
-#define PRCM_PLLDSI_LOCKP_PRCM_PLLDSI_LOCKP3   BIT(1)
-
-#define PRCM_DSI_PLLOUT_SEL_DSI0_PLLOUT_DIVSEL_SHIFT   0
-#define PRCM_DSI_PLLOUT_SEL_DSI0_PLLOUT_DIVSEL_MASK    BITS(0, 2)
-#define PRCM_DSI_PLLOUT_SEL_DSI1_PLLOUT_DIVSEL_SHIFT   8
-#define PRCM_DSI_PLLOUT_SEL_DSI1_PLLOUT_DIVSEL_MASK    BITS(8, 10)
-
-#define PRCM_DSI_PLLOUT_SEL_OFF                0
-#define PRCM_DSI_PLLOUT_SEL_PHI                1
-#define PRCM_DSI_PLLOUT_SEL_PHI_2      2
-#define PRCM_DSI_PLLOUT_SEL_PHI_4      3
-
-#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_DIV_SHIFT       0
-#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_DIV_MASK                BITS(0, 7)
-#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_DIV_SHIFT       8
-#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_DIV_MASK                BITS(8, 15)
-#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_DIV_SHIFT       16
-#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_DIV_MASK                BITS(16, 23)
-#define PRCM_DSITVCLK_DIV_DSI0_ESC_CLK_EN              BIT(24)
-#define PRCM_DSITVCLK_DIV_DSI1_ESC_CLK_EN              BIT(25)
-#define PRCM_DSITVCLK_DIV_DSI2_ESC_CLK_EN              BIT(26)
-
-#define PRCM_APE_RESETN_DSIPLL_RESETN BIT(14)
-
-#define PRCM_CLKOCR               (prcmu_base + 0x1CC)
-#define PRCM_CLKOCR_CLKOUT0_REF_CLK    (1 << 0)
-#define PRCM_CLKOCR_CLKOUT0_MASK       BITS(0, 13)
-#define PRCM_CLKOCR_CLKOUT1_REF_CLK    (1 << 16)
-#define PRCM_CLKOCR_CLKOUT1_MASK       BITS(16, 29)
-
-/* ePOD and memory power signal control registers */
-#define PRCM_EPOD_C_SET            (prcmu_base + 0x410)
-#define PRCM_SRAM_LS_SLEEP         (prcmu_base + 0x304)
-
-/* Debug power control unit registers */
-#define PRCM_POWER_STATE_SET       (prcmu_base + 0x254)
-
-/* Miscellaneous unit registers */
-#define PRCM_DSI_SW_RESET          (prcmu_base + 0x324)
-#define PRCM_GPIOCR                (prcmu_base + 0x138)
-#define PRCM_GPIOCR_DBG_STM_MOD_CMD1            0x800
-#define PRCM_GPIOCR_DBG_UARTMOD_CMD0            0x1
-
-/* PRCMU HW semaphore */
-#define PRCM_SEM                   (prcmu_base + 0x400)
-#define PRCM_SEM_PRCM_SEM BIT(0)
-
-#define PRCM_TCR                   (prcmu_base + 0x1C8)
-#define PRCM_TCR_TENSEL_MASK       BITS(0, 7)
-#define PRCM_TCR_STOP_TIMERS       BIT(16)
-#define PRCM_TCR_DOZE_MODE         BIT(17)
-
-#define PRCM_CLKOCR_CLKODIV0_SHIFT     0
-#define PRCM_CLKOCR_CLKODIV0_MASK      BITS(0, 5)
-#define PRCM_CLKOCR_CLKOSEL0_SHIFT     6
-#define PRCM_CLKOCR_CLKOSEL0_MASK      BITS(6, 8)
-#define PRCM_CLKOCR_CLKODIV1_SHIFT     16
-#define PRCM_CLKOCR_CLKODIV1_MASK      BITS(16, 21)
-#define PRCM_CLKOCR_CLKOSEL1_SHIFT     22
-#define PRCM_CLKOCR_CLKOSEL1_MASK      BITS(22, 24)
-#define PRCM_CLKOCR_CLK1TYPE           BIT(28)
-
-#define PRCM_CLK_MGT_CLKPLLDIV_MASK            BITS(0, 4)
-#define PRCM_CLK_MGT_CLKPLLSW_SOC0             BIT(5)
-#define PRCM_CLK_MGT_CLKPLLSW_SOC1             BIT(6)
-#define PRCM_CLK_MGT_CLKPLLSW_DDR              BIT(7)
-#define PRCM_CLK_MGT_CLKPLLSW_MASK             BITS(5, 7)
-#define PRCM_CLK_MGT_CLKEN                     BIT(8)
-#define PRCM_CLK_MGT_CLK38                     BIT(9)
-#define PRCM_CLK_MGT_CLK38DIV                  BIT(11)
-#define PRCM_SGACLK_MGT_SGACLKDIV_BY_2_5_EN    BIT(12)
-
-/* GPIOCR register */
-#define PRCM_GPIOCR_SPI2_SELECT BIT(23)
-
-#define PRCM_DDR_SUBSYS_APE_MINBW      (prcmu_base + 0x438)
-#define PRCM_CGATING_BYPASS            (prcmu_base + 0x134)
-#define PRCM_CGATING_BYPASS_ICN2       BIT(6)
-
-/* Miscellaneous unit registers */
-#define PRCM_RESOUTN_SET               (prcmu_base + 0x214)
-#define PRCM_RESOUTN_CLR               (prcmu_base + 0x218)
-
-/* System reset register */
-#define PRCM_APE_SOFTRST               (prcmu_base + 0x228)
-
-#endif /* __DB8500_PRCMU_REGS_H */
index 1f39603..3f1d976 100644 (file)
@@ -89,6 +89,11 @@ static const struct intel_lpss_platform_info apl_i2c_info = {
        .swnode = &apl_i2c_node,
 };
 
+static const struct intel_lpss_platform_info cnl_i2c_info = {
+       .clk_rate = 216000000,
+       .swnode = &spt_i2c_node,
+};
+
 static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        /* SPT */
        { "INT3440", (kernel_ulong_t)&spt_info },
@@ -102,6 +107,19 @@ static const struct acpi_device_id intel_lpss_acpi_ids[] = {
        { "INT3448", (kernel_ulong_t)&spt_uart_info },
        { "INT3449", (kernel_ulong_t)&spt_uart_info },
        { "INT344A", (kernel_ulong_t)&spt_uart_info },
+       /* CNL */
+       { "INT34B0", (kernel_ulong_t)&spt_info },
+       { "INT34B1", (kernel_ulong_t)&spt_info },
+       { "INT34B2", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B3", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B4", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B5", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B6", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B7", (kernel_ulong_t)&cnl_i2c_info },
+       { "INT34B8", (kernel_ulong_t)&spt_uart_info },
+       { "INT34B9", (kernel_ulong_t)&spt_uart_info },
+       { "INT34BA", (kernel_ulong_t)&spt_uart_info },
+       { "INT34BC", (kernel_ulong_t)&spt_info },
        /* BXT */
        { "80860AAC", (kernel_ulong_t)&bxt_i2c_info },
        { "80860ABC", (kernel_ulong_t)&bxt_info },
index 1a9bfb7..8db3bcf 100644 (file)
@@ -15,7 +15,8 @@
 
 enum m10bmc_type {
        M10_N3000,
-       M10_D5005
+       M10_D5005,
+       M10_N5010,
 };
 
 static struct mfd_cell m10bmc_d5005_subdevs[] = {
@@ -28,6 +29,10 @@ static struct mfd_cell m10bmc_pacn3000_subdevs[] = {
        { .name = "n3000bmc-secure" },
 };
 
+static struct mfd_cell m10bmc_n5010_subdevs[] = {
+       { .name = "n5010bmc-hwmon" },
+};
+
 static const struct regmap_range m10bmc_regmap_range[] = {
        regmap_reg_range(M10BMC_LEGACY_BUILD_VER, M10BMC_LEGACY_BUILD_VER),
        regmap_reg_range(M10BMC_SYS_BASE, M10BMC_SYS_END),
@@ -192,6 +197,10 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
                cells = m10bmc_d5005_subdevs;
                n_cell = ARRAY_SIZE(m10bmc_d5005_subdevs);
                break;
+       case M10_N5010:
+               cells = m10bmc_n5010_subdevs;
+               n_cell = ARRAY_SIZE(m10bmc_n5010_subdevs);
+               break;
        default:
                return -ENODEV;
        }
@@ -207,6 +216,7 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
 static const struct spi_device_id m10bmc_spi_id[] = {
        { "m10-n3000", M10_N3000 },
        { "m10-d5005", M10_D5005 },
+       { "m10-n5010", M10_N5010 },
        { }
 };
 MODULE_DEVICE_TABLE(spi, m10bmc_spi_id);
index 3bbb29a..f10e531 100644 (file)
@@ -489,6 +489,7 @@ static struct lpc_ich_info lpc_chipset_info[] = {
        [LPC_DH89XXCC] = {
                .name = "DH89xxCC",
                .iTCO_version = 2,
+               .gpio_version = ICH_V5_GPIO,
        },
        [LPC_PPT] = {
                .name = "Panther Point",
index 428a526..9ab9adc 100644 (file)
@@ -22,7 +22,7 @@
 #define SMBASE         0x40
 #define SMBUS_IO_SIZE  64
 
-#define GPIOBASE       0x44
+#define GPIO_BASE      0x44
 #define GPIO_IO_SIZE   64
 #define GPIO_IO_SIZE_CENTERTON 128
 
@@ -145,7 +145,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (ret == 0)
                cells++;
 
-       ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
+       ret = lpc_sch_populate_cell(dev, GPIO_BASE, "sch_gpio",
                                    info->io_size_gpio,
                                    id->device, &lpc_sch_cells[cells]);
        if (ret < 0)
index e628953..6eaa677 100644 (file)
@@ -319,18 +319,18 @@ static const struct resource mt6360_regulator_resources[] = {
        DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_OC_EVT, "buck2_oc_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_OV_EVT, "buck2_ov_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_UV_EVT, "buck2_uv_evt"),
-       DEFINE_RES_IRQ_NAMED(MT6360_LDO6_OC_EVT, "ldo6_oc_evt"),
-       DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"),
-       DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"),
-       DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO1_OC_EVT, "ldo1_oc_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO2_OC_EVT, "ldo2_oc_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO3_OC_EVT, "ldo3_oc_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO5_OC_EVT, "ldo5_oc_evt"),
+       DEFINE_RES_IRQ_NAMED(MT6360_LDO6_OC_EVT, "ldo6_oc_evt"),
+       DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO1_PGB_EVT, "ldo1_pgb_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO2_PGB_EVT, "ldo2_pgb_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO3_PGB_EVT, "ldo3_pgb_evt"),
        DEFINE_RES_IRQ_NAMED(MT6360_LDO5_PGB_EVT, "ldo5_pgb_evt"),
+       DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"),
+       DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"),
 };
 
 static const struct mfd_cell mt6360_devs[] = {
diff --git a/drivers/mfd/rsmu.h b/drivers/mfd/rsmu.h
new file mode 100644 (file)
index 0000000..bb88597
--- /dev/null
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Renesas Synchronization Management Unit (SMU) devices.
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+
+#ifndef __RSMU_MFD_H
+#define __RSMU_MFD_H
+
+#include <linux/mfd/rsmu.h>
+
+int rsmu_core_init(struct rsmu_ddata *rsmu);
+void rsmu_core_exit(struct rsmu_ddata *rsmu);
+
+#endif /* __RSMU_MFD_H */
diff --git a/drivers/mfd/rsmu_core.c b/drivers/mfd/rsmu_core.c
new file mode 100644 (file)
index 0000000..29437fd
--- /dev/null
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Core driver for Renesas Synchronization Management Unit (SMU) devices.
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/rsmu.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include "rsmu.h"
+
+enum {
+       RSMU_PHC = 0,
+       RSMU_CDEV = 1,
+       RSMU_N_DEVS = 2,
+};
+
+static struct mfd_cell rsmu_cm_devs[] = {
+       [RSMU_PHC] = {
+               .name = "8a3400x-phc",
+       },
+       [RSMU_CDEV] = {
+               .name = "8a3400x-cdev",
+       },
+};
+
+static struct mfd_cell rsmu_sabre_devs[] = {
+       [RSMU_PHC] = {
+               .name = "82p33x1x-phc",
+       },
+       [RSMU_CDEV] = {
+               .name = "82p33x1x-cdev",
+       },
+};
+
+static struct mfd_cell rsmu_sl_devs[] = {
+       [RSMU_PHC] = {
+               .name = "8v19n85x-phc",
+       },
+       [RSMU_CDEV] = {
+               .name = "8v19n85x-cdev",
+       },
+};
+
+int rsmu_core_init(struct rsmu_ddata *rsmu)
+{
+       struct mfd_cell *cells;
+       int ret;
+
+       switch (rsmu->type) {
+       case RSMU_CM:
+               cells = rsmu_cm_devs;
+               break;
+       case RSMU_SABRE:
+               cells = rsmu_sabre_devs;
+               break;
+       case RSMU_SL:
+               cells = rsmu_sl_devs;
+               break;
+       default:
+               dev_err(rsmu->dev, "Unsupported RSMU device type: %d\n", rsmu->type);
+               return -ENODEV;
+       }
+
+       mutex_init(&rsmu->lock);
+
+       ret = devm_mfd_add_devices(rsmu->dev, PLATFORM_DEVID_AUTO, cells,
+                                  RSMU_N_DEVS, NULL, 0, NULL);
+       if (ret < 0)
+               dev_err(rsmu->dev, "Failed to register sub-devices: %d\n", ret);
+
+       return ret;
+}
+
+void rsmu_core_exit(struct rsmu_ddata *rsmu)
+{
+       mutex_destroy(&rsmu->lock);
+}
+
+MODULE_DESCRIPTION("Renesas SMU core driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
new file mode 100644 (file)
index 0000000..dc001c9
--- /dev/null
@@ -0,0 +1,203 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * I2C driver for Renesas Synchronization Management Unit (SMU) devices.
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/rsmu.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include "rsmu.h"
+
+/*
+ * 16-bit register address: the lower 8 bits of the register address come
+ * from the offset addr byte and the upper 8 bits come from the page register.
+ */
+#define        RSMU_CM_PAGE_ADDR               0xFD
+#define        RSMU_CM_PAGE_WINDOW             256
+
+/*
+ * 15-bit register address: the lower 7 bits of the register address come
+ * from the offset addr byte and the upper 8 bits come from the page register.
+ */
+#define        RSMU_SABRE_PAGE_ADDR            0x7F
+#define        RSMU_SABRE_PAGE_WINDOW          128
+
+static const struct regmap_range_cfg rsmu_cm_range_cfg[] = {
+       {
+               .range_min = 0,
+               .range_max = 0xD000,
+               .selector_reg = RSMU_CM_PAGE_ADDR,
+               .selector_mask = 0xFF,
+               .selector_shift = 0,
+               .window_start = 0,
+               .window_len = RSMU_CM_PAGE_WINDOW,
+       }
+};
+
+static const struct regmap_range_cfg rsmu_sabre_range_cfg[] = {
+       {
+               .range_min = 0,
+               .range_max = 0x400,
+               .selector_reg = RSMU_SABRE_PAGE_ADDR,
+               .selector_mask = 0xFF,
+               .selector_shift = 0,
+               .window_start = 0,
+               .window_len = RSMU_SABRE_PAGE_WINDOW,
+       }
+};
+
+static bool rsmu_cm_volatile_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case RSMU_CM_PAGE_ADDR:
+               return false;
+       default:
+               return true;
+       }
+}
+
+static bool rsmu_sabre_volatile_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case RSMU_SABRE_PAGE_ADDR:
+               return false;
+       default:
+               return true;
+       }
+}
+
+static const struct regmap_config rsmu_cm_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = 0xD000,
+       .ranges = rsmu_cm_range_cfg,
+       .num_ranges = ARRAY_SIZE(rsmu_cm_range_cfg),
+       .volatile_reg = rsmu_cm_volatile_reg,
+       .cache_type = REGCACHE_RBTREE,
+       .can_multi_write = true,
+};
+
+static const struct regmap_config rsmu_sabre_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = 0x400,
+       .ranges = rsmu_sabre_range_cfg,
+       .num_ranges = ARRAY_SIZE(rsmu_sabre_range_cfg),
+       .volatile_reg = rsmu_sabre_volatile_reg,
+       .cache_type = REGCACHE_RBTREE,
+       .can_multi_write = true,
+};
+
+static const struct regmap_config rsmu_sl_regmap_config = {
+       .reg_bits = 16,
+       .val_bits = 8,
+       .reg_format_endian = REGMAP_ENDIAN_BIG,
+       .max_register = 0x339,
+       .cache_type = REGCACHE_NONE,
+       .can_multi_write = true,
+};
+
+static int rsmu_i2c_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+       const struct regmap_config *cfg;
+       struct rsmu_ddata *rsmu;
+       int ret;
+
+       rsmu = devm_kzalloc(&client->dev, sizeof(*rsmu), GFP_KERNEL);
+       if (!rsmu)
+               return -ENOMEM;
+
+       i2c_set_clientdata(client, rsmu);
+
+       rsmu->dev = &client->dev;
+       rsmu->type = (enum rsmu_type)id->driver_data;
+
+       switch (rsmu->type) {
+       case RSMU_CM:
+               cfg = &rsmu_cm_regmap_config;
+               break;
+       case RSMU_SABRE:
+               cfg = &rsmu_sabre_regmap_config;
+               break;
+       case RSMU_SL:
+               cfg = &rsmu_sl_regmap_config;
+               break;
+       default:
+               dev_err(rsmu->dev, "Unsupported RSMU device type: %d\n", rsmu->type);
+               return -ENODEV;
+       }
+       rsmu->regmap = devm_regmap_init_i2c(client, cfg);
+       if (IS_ERR(rsmu->regmap)) {
+               ret = PTR_ERR(rsmu->regmap);
+               dev_err(rsmu->dev, "Failed to allocate register map: %d\n", ret);
+               return ret;
+       }
+
+       return rsmu_core_init(rsmu);
+}
+
+static int rsmu_i2c_remove(struct i2c_client *client)
+{
+       struct rsmu_ddata *rsmu = i2c_get_clientdata(client);
+
+       rsmu_core_exit(rsmu);
+
+       return 0;
+}
+
+static const struct i2c_device_id rsmu_i2c_id[] = {
+       { "8a34000",  RSMU_CM },
+       { "8a34001",  RSMU_CM },
+       { "82p33810", RSMU_SABRE },
+       { "82p33811", RSMU_SABRE },
+       { "8v19n850", RSMU_SL },
+       { "8v19n851", RSMU_SL },
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, rsmu_i2c_id);
+
+static const struct of_device_id rsmu_i2c_of_match[] = {
+       { .compatible = "idt,8a34000",  .data = (void *)RSMU_CM },
+       { .compatible = "idt,8a34001",  .data = (void *)RSMU_CM },
+       { .compatible = "idt,82p33810", .data = (void *)RSMU_SABRE },
+       { .compatible = "idt,82p33811", .data = (void *)RSMU_SABRE },
+       { .compatible = "idt,8v19n850", .data = (void *)RSMU_SL },
+       { .compatible = "idt,8v19n851", .data = (void *)RSMU_SL },
+       {}
+};
+MODULE_DEVICE_TABLE(of, rsmu_i2c_of_match);
+
+static struct i2c_driver rsmu_i2c_driver = {
+       .driver = {
+               .name = "rsmu-i2c",
+               .of_match_table = of_match_ptr(rsmu_i2c_of_match),
+       },
+       .probe = rsmu_i2c_probe,
+       .remove = rsmu_i2c_remove,
+       .id_table = rsmu_i2c_id,
+};
+
+static int __init rsmu_i2c_init(void)
+{
+       return i2c_add_driver(&rsmu_i2c_driver);
+}
+subsys_initcall(rsmu_i2c_init);
+
+static void __exit rsmu_i2c_exit(void)
+{
+       i2c_del_driver(&rsmu_i2c_driver);
+}
+module_exit(rsmu_i2c_exit);
+
+MODULE_DESCRIPTION("Renesas SMU I2C driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu_spi.c
new file mode 100644 (file)
index 0000000..fec2b4e
--- /dev/null
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * SPI driver for Renesas Synchronization Management Unit (SMU) devices.
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/rsmu.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/spi/spi.h>
+
+#include "rsmu.h"
+
+#define        RSMU_CM_PAGE_ADDR               0x7C
+#define        RSMU_SABRE_PAGE_ADDR            0x7F
+#define        RSMU_HIGHER_ADDR_MASK           0xFF80
+#define        RSMU_HIGHER_ADDR_SHIFT          7
+#define        RSMU_LOWER_ADDR_MASK            0x7F
+
+static int rsmu_read_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes)
+{
+       struct spi_device *client = to_spi_device(rsmu->dev);
+       struct spi_transfer xfer = {0};
+       struct spi_message msg;
+       u8 cmd[256] = {0};
+       u8 rsp[256] = {0};
+       int ret;
+
+       cmd[0] = reg | 0x80;
+       xfer.rx_buf = rsp;
+       xfer.len = bytes + 1;
+       xfer.tx_buf = cmd;
+       xfer.bits_per_word = client->bits_per_word;
+       xfer.speed_hz = client->max_speed_hz;
+
+       spi_message_init(&msg);
+       spi_message_add_tail(&xfer, &msg);
+
+       /*
+        * 4-wire SPI is a shift register, so for every byte you send,
+        * you get one back at the same time. Example read from 0xC024,
+        * which has value of 0x2D
+        *
+        * MOSI:
+        *       7C 00 C0 #Set page register
+        *       A4 00    #MSB is set, so this is read command
+        * MISO:
+        *       XX 2D    #XX is a dummy byte from sending A4 and we
+        *                 need to throw it away
+        */
+       ret = spi_sync(client, &msg);
+       if (ret >= 0)
+               memcpy(buf, &rsp[1], xfer.len-1);
+
+       return ret;
+}
+
+static int rsmu_write_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes)
+{
+       struct spi_device *client = to_spi_device(rsmu->dev);
+       struct spi_transfer xfer = {0};
+       struct spi_message msg;
+       u8 cmd[256] = {0};
+
+       cmd[0] = reg;
+       memcpy(&cmd[1], buf, bytes);
+
+       xfer.len = bytes + 1;
+       xfer.tx_buf = cmd;
+       xfer.bits_per_word = client->bits_per_word;
+       xfer.speed_hz = client->max_speed_hz;
+       spi_message_init(&msg);
+       spi_message_add_tail(&xfer, &msg);
+
+       return  spi_sync(client, &msg);
+}
+
+/*
+ * 1-byte (1B) offset addressing:
+ * 16-bit register address: the lower 7 bits of the register address come
+ * from the offset addr byte and the upper 9 bits come from the page register.
+ */
+static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u16 reg)
+{
+       u8 page_reg;
+       u8 buf[2];
+       u16 bytes;
+       u16 page;
+       int err;
+
+       switch (rsmu->type) {
+       case RSMU_CM:
+               page_reg = RSMU_CM_PAGE_ADDR;
+               page = reg & RSMU_HIGHER_ADDR_MASK;
+               buf[0] = (u8)(page & 0xff);
+               buf[1] = (u8)((page >> 8) & 0xff);
+               bytes = 2;
+               break;
+       case RSMU_SABRE:
+               page_reg = RSMU_SABRE_PAGE_ADDR;
+               page = reg >> RSMU_HIGHER_ADDR_SHIFT;
+               buf[0] = (u8)(page & 0xff);
+               bytes = 1;
+               break;
+       default:
+               dev_err(rsmu->dev, "Unsupported RSMU device type: %d\n", rsmu->type);
+               return -ENODEV;
+       }
+
+       /* Simply return if we are on the same page */
+       if (rsmu->page == page)
+               return 0;
+
+       err = rsmu_write_device(rsmu, page_reg, buf, bytes);
+       if (err)
+               dev_err(rsmu->dev, "Failed to set page offset 0x%x\n", page);
+       else
+               /* Remember the last page */
+               rsmu->page = page;
+
+       return err;
+}
+
+static int rsmu_reg_read(void *context, unsigned int reg, unsigned int *val)
+{
+       struct rsmu_ddata *rsmu = spi_get_drvdata((struct spi_device *)context);
+       u8 addr = (u8)(reg & RSMU_LOWER_ADDR_MASK);
+       int err;
+
+       err = rsmu_write_page_register(rsmu, reg);
+       if (err)
+               return err;
+
+       err = rsmu_read_device(rsmu, addr, (u8 *)val, 1);
+       if (err)
+               dev_err(rsmu->dev, "Failed to read offset address 0x%x\n", addr);
+
+       return err;
+}
+
+static int rsmu_reg_write(void *context, unsigned int reg, unsigned int val)
+{
+       struct rsmu_ddata *rsmu = spi_get_drvdata((struct spi_device *)context);
+       u8 addr = (u8)(reg & RSMU_LOWER_ADDR_MASK);
+       u8 data = (u8)val;
+       int err;
+
+       err = rsmu_write_page_register(rsmu, reg);
+       if (err)
+               return err;
+
+       err = rsmu_write_device(rsmu, addr, &data, 1);
+       if (err)
+               dev_err(rsmu->dev,
+                       "Failed to write offset address 0x%x\n", addr);
+
+       return err;
+}
+
+static const struct regmap_config rsmu_cm_regmap_config = {
+       .reg_bits = 16,
+       .val_bits = 8,
+       .max_register = 0xD000,
+       .reg_read = rsmu_reg_read,
+       .reg_write = rsmu_reg_write,
+       .cache_type = REGCACHE_NONE,
+};
+
+static const struct regmap_config rsmu_sabre_regmap_config = {
+       .reg_bits = 16,
+       .val_bits = 8,
+       .max_register = 0x400,
+       .reg_read = rsmu_reg_read,
+       .reg_write = rsmu_reg_write,
+       .cache_type = REGCACHE_NONE,
+};
+
+static int rsmu_spi_probe(struct spi_device *client)
+{
+       const struct spi_device_id *id = spi_get_device_id(client);
+       const struct regmap_config *cfg;
+       struct rsmu_ddata *rsmu;
+       int ret;
+
+       rsmu = devm_kzalloc(&client->dev, sizeof(*rsmu), GFP_KERNEL);
+       if (!rsmu)
+               return -ENOMEM;
+
+       spi_set_drvdata(client, rsmu);
+
+       rsmu->dev = &client->dev;
+       rsmu->type = (enum rsmu_type)id->driver_data;
+
+       /* Initialize regmap */
+       switch (rsmu->type) {
+       case RSMU_CM:
+               cfg = &rsmu_cm_regmap_config;
+               break;
+       case RSMU_SABRE:
+               cfg = &rsmu_sabre_regmap_config;
+               break;
+       default:
+               dev_err(rsmu->dev, "Unsupported RSMU device type: %d\n", rsmu->type);
+               return -ENODEV;
+       }
+
+       rsmu->regmap = devm_regmap_init(&client->dev, NULL, client, cfg);
+       if (IS_ERR(rsmu->regmap)) {
+               ret = PTR_ERR(rsmu->regmap);
+               dev_err(rsmu->dev, "Failed to allocate register map: %d\n", ret);
+               return ret;
+       }
+
+       return rsmu_core_init(rsmu);
+}
+
+static int rsmu_spi_remove(struct spi_device *client)
+{
+       struct rsmu_ddata *rsmu = spi_get_drvdata(client);
+
+       rsmu_core_exit(rsmu);
+
+       return 0;
+}
+
+static const struct spi_device_id rsmu_spi_id[] = {
+       { "8a34000",  RSMU_CM },
+       { "8a34001",  RSMU_CM },
+       { "82p33810", RSMU_SABRE },
+       { "82p33811", RSMU_SABRE },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, rsmu_spi_id);
+
+static const struct of_device_id rsmu_spi_of_match[] = {
+       { .compatible = "idt,8a34000",  .data = (void *)RSMU_CM },
+       { .compatible = "idt,8a34001",  .data = (void *)RSMU_CM },
+       { .compatible = "idt,82p33810", .data = (void *)RSMU_SABRE },
+       { .compatible = "idt,82p33811", .data = (void *)RSMU_SABRE },
+       {}
+};
+MODULE_DEVICE_TABLE(of, rsmu_spi_of_match);
+
+static struct spi_driver rsmu_spi_driver = {
+       .driver = {
+               .name = "rsmu-spi",
+               .of_match_table = of_match_ptr(rsmu_spi_of_match),
+       },
+       .probe = rsmu_spi_probe,
+       .remove = rsmu_spi_remove,
+       .id_table = rsmu_spi_id,
+};
+
+static int __init rsmu_spi_init(void)
+{
+       return spi_register_driver(&rsmu_spi_driver);
+}
+subsys_initcall(rsmu_spi_init);
+
+static void __exit rsmu_spi_exit(void)
+{
+       spi_unregister_driver(&rsmu_spi_driver);
+}
+module_exit(rsmu_spi_exit);
+
+MODULE_DESCRIPTION("Renesas SMU SPI driver");
+MODULE_LICENSE("GPL");
index 87f684c..5153669 100644 (file)
@@ -2,39 +2,64 @@
 /*
  * Simple MFD - I2C
  *
+ * Author(s):
+ *     Michael Walle <michael@walle.cc>
+ *     Lee Jones <lee.jones@linaro.org>
+ *
  * This driver creates a single register map with the intention for it to be
  * shared by all sub-devices.  Children can use their parent's device structure
  * (dev.parent) in order to reference it.
  *
  * Once the register map has been successfully initialised, any sub-devices
- * represented by child nodes in Device Tree will be subsequently registered.
+ * represented by child nodes in Device Tree or via the MFD cells in this file
+ * will be subsequently registered.
  */
 
 #include <linux/i2c.h>
 #include <linux/kernel.h>
+#include <linux/mfd/core.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/regmap.h>
 
-static const struct regmap_config simple_regmap_config = {
+#include "simple-mfd-i2c.h"
+
+static const struct regmap_config regmap_config_8r_8v = {
        .reg_bits = 8,
        .val_bits = 8,
 };
 
 static int simple_mfd_i2c_probe(struct i2c_client *i2c)
 {
-       const struct regmap_config *config;
+       const struct simple_mfd_data *simple_mfd_data;
+       const struct regmap_config *regmap_config;
        struct regmap *regmap;
+       int ret;
+
+       simple_mfd_data = device_get_match_data(&i2c->dev);
 
-       config = device_get_match_data(&i2c->dev);
-       if (!config)
-               config = &simple_regmap_config;
+       /* If no regmap_config is specified, use the default 8reg and 8val bits */
+       if (!simple_mfd_data || !simple_mfd_data->regmap_config)
+               regmap_config = &regmap_config_8r_8v;
+       else
+               regmap_config = simple_mfd_data->regmap_config;
 
-       regmap = devm_regmap_init_i2c(i2c, config);
+       regmap = devm_regmap_init_i2c(i2c, regmap_config);
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       return devm_of_platform_populate(&i2c->dev);
+       /* If no MFD cells are spedified, use register the DT child nodes instead */
+       if (!simple_mfd_data || !simple_mfd_data->mfd_cell)
+               return devm_of_platform_populate(&i2c->dev);
+
+       ret = devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_AUTO,
+                                  simple_mfd_data->mfd_cell,
+                                  simple_mfd_data->mfd_cell_size,
+                                  NULL, 0, NULL);
+       if (ret)
+               dev_err(&i2c->dev, "Failed to add child devices\n");
+
+       return ret;
 }
 
 static const struct of_device_id simple_mfd_i2c_of_match[] = {
diff --git a/drivers/mfd/simple-mfd-i2c.h b/drivers/mfd/simple-mfd-i2c.h
new file mode 100644 (file)
index 0000000..7cb2bdd
--- /dev/null
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Simple MFD - I2C
+ *
+ * Author: Lee Jones <lee.jones@linaro.org>
+ *
+ * This driver creates a single register map with the intention for it to be
+ * shared by all sub-devices.  Children can use their parent's device structure
+ * (dev.parent) in order to reference it.
+ *
+ * This driver creates a single register map with the intention for it to be
+ * shared by all sub-devices.  Children can use their parent's device structure
+ * (dev.parent) in order to reference it.
+ *
+ * Once the register map has been successfully initialised, any sub-devices
+ * represented by child nodes in Device Tree or via the MFD cells in the
+ * associated C file will be subsequently registered.
+ */
+
+#ifndef __MFD_SIMPLE_MFD_I2C_H
+#define __MFD_SIMPLE_MFD_I2C_H
+
+#include <linux/mfd/core.h>
+#include <linux/regmap.h>
+
+struct simple_mfd_data {
+       const struct regmap_config *regmap_config;
+       const struct mfd_cell *mfd_cell;
+       size_t mfd_cell_size;
+};
+
+#endif /* __MFD_SIMPLE_MFD_I2C_H */
index 1dd3948..58d09c6 100644 (file)
@@ -1095,7 +1095,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)
 
        if (variant->id_val == STMPE801_ID ||
            variant->id_val == STMPE1600_ID) {
-               int base = irq_create_mapping(stmpe->domain, 0);
+               int base = irq_find_mapping(stmpe->domain, 0);
 
                handle_nested_irq(base);
                return IRQ_HANDLED;
@@ -1123,7 +1123,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)
                while (status) {
                        int bit = __ffs(status);
                        int line = bank * 8 + bit;
-                       int nestedirq = irq_create_mapping(stmpe->domain, line);
+                       int nestedirq = irq_find_mapping(stmpe->domain, line);
 
                        handle_nested_irq(nestedirq);
                        status &= ~(1 << bit);
index 765c021..191fdb8 100644 (file)
@@ -60,7 +60,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
                goto err_map;
        }
 
-       base = ioremap(res.start, resource_size(&res));
+       base = of_iomap(np, 0);
        if (!base) {
                ret = -ENOMEM;
                goto err_map;
index 7614f8f..13583cd 100644 (file)
@@ -187,7 +187,7 @@ again:
 
        while (status) {
                int bit = __ffs(status);
-               int virq = irq_create_mapping(tc3589x->domain, bit);
+               int virq = irq_find_mapping(tc3589x->domain, bit);
 
                handle_nested_irq(virq);
                status &= ~(1 << bit);
index 0e6e253..55adc37 100644 (file)
@@ -175,10 +175,9 @@ static     int ti_tscadc_probe(struct platform_device *pdev)
        tscadc->dev = &pdev->dev;
 
        err = platform_get_irq(pdev, 0);
-       if (err < 0) {
-               dev_err(&pdev->dev, "no irq ID is specified.\n");
+       if (err < 0)
                goto ret;
-       else
+       else
                tscadc->irq = err;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
index 341466e..3bd5728 100644 (file)
@@ -24,6 +24,7 @@
 static const struct mfd_cell tps65086_cells[] = {
        { .name = "tps65086-regulator", },
        { .name = "tps65086-gpio", },
+       { .name = "tps65086-reset", },
 };
 
 static const struct regmap_range tps65086_yes_ranges[] = {
@@ -100,29 +101,30 @@ static int tps65086_probe(struct i2c_client *client,
                 (char)((version & TPS65086_DEVICEID_OTP_MASK) >> 4) + 'A',
                 (version & TPS65086_DEVICEID_REV_MASK) >> 6);
 
-       ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
-                                 &tps65086_irq_chip, &tps->irq_data);
-       if (ret) {
-               dev_err(tps->dev, "Failed to register IRQ chip\n");
-               return ret;
+       if (tps->irq > 0) {
+               ret = regmap_add_irq_chip(tps->regmap, tps->irq, IRQF_ONESHOT, 0,
+                                         &tps65086_irq_chip, &tps->irq_data);
+               if (ret) {
+                       dev_err(tps->dev, "Failed to register IRQ chip\n");
+                       return ret;
+               }
        }
 
        ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65086_cells,
                              ARRAY_SIZE(tps65086_cells), NULL, 0,
                              regmap_irq_get_domain(tps->irq_data));
-       if (ret) {
+       if (ret && tps->irq > 0)
                regmap_del_irq_chip(tps->irq, tps->irq_data);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 static int tps65086_remove(struct i2c_client *client)
 {
        struct tps65086 *tps = i2c_get_clientdata(client);
 
-       regmap_del_irq_chip(tps->irq, tps->irq_data);
+       if (tps->irq > 0)
+               regmap_del_irq_chip(tps->irq, tps->irq_data);
 
        return 0;
 }
index ddddf08..7ae906f 100644 (file)
 #define TQMX86_REG_BOARD_ID_E39x       7
 #define TQMX86_REG_BOARD_ID_70EB       8
 #define TQMX86_REG_BOARD_ID_80UC       9
-#define TQMX86_REG_BOARD_ID_90UC       10
+#define TQMX86_REG_BOARD_ID_110EB      11
+#define TQMX86_REG_BOARD_ID_E40M       12
+#define TQMX86_REG_BOARD_ID_E40S       13
+#define TQMX86_REG_BOARD_ID_E40C1      14
+#define TQMX86_REG_BOARD_ID_E40C2      15
 #define TQMX86_REG_BOARD_REV   0x21
 #define TQMX86_REG_IO_EXT_INT  0x26
 #define TQMX86_REG_IO_EXT_INT_NONE             0
@@ -77,7 +81,7 @@ static struct i2c_board_info tqmx86_i2c_devices[] = {
        },
 };
 
-static struct ocores_i2c_platform_data ocores_platfom_data = {
+static struct ocores_i2c_platform_data ocores_platform_data = {
        .num_devices = ARRAY_SIZE(tqmx86_i2c_devices),
        .devices = tqmx86_i2c_devices,
 };
@@ -85,8 +89,8 @@ static struct ocores_i2c_platform_data ocores_platfom_data = {
 static const struct mfd_cell tqmx86_i2c_soft_dev[] = {
        {
                .name = "ocores-i2c",
-               .platform_data = &ocores_platfom_data,
-               .pdata_size = sizeof(ocores_platfom_data),
+               .platform_data = &ocores_platform_data,
+               .pdata_size = sizeof(ocores_platform_data),
                .resources = tqmx_i2c_soft_resources,
                .num_resources = ARRAY_SIZE(tqmx_i2c_soft_resources),
        },
@@ -128,21 +132,33 @@ static const char *tqmx86_board_id_to_name(u8 board_id)
                return "TQMx70EB";
        case TQMX86_REG_BOARD_ID_80UC:
                return "TQMx80UC";
-       case TQMX86_REG_BOARD_ID_90UC:
-               return "TQMx90UC";
+       case TQMX86_REG_BOARD_ID_110EB:
+               return "TQMx110EB";
+       case TQMX86_REG_BOARD_ID_E40M:
+               return "TQMxE40M";
+       case TQMX86_REG_BOARD_ID_E40S:
+               return "TQMxE40S";
+       case TQMX86_REG_BOARD_ID_E40C1:
+               return "TQMxE40C1";
+       case TQMX86_REG_BOARD_ID_E40C2:
+               return "TQMxE40C2";
        default:
                return "Unknown";
        }
 }
 
-static int tqmx86_board_id_to_clk_rate(u8 board_id)
+static int tqmx86_board_id_to_clk_rate(struct device *dev, u8 board_id)
 {
        switch (board_id) {
        case TQMX86_REG_BOARD_ID_50UC:
        case TQMX86_REG_BOARD_ID_60EB:
        case TQMX86_REG_BOARD_ID_70EB:
        case TQMX86_REG_BOARD_ID_80UC:
-       case TQMX86_REG_BOARD_ID_90UC:
+       case TQMX86_REG_BOARD_ID_110EB:
+       case TQMX86_REG_BOARD_ID_E40M:
+       case TQMX86_REG_BOARD_ID_E40S:
+       case TQMX86_REG_BOARD_ID_E40C1:
+       case TQMX86_REG_BOARD_ID_E40C2:
                return 24000;
        case TQMX86_REG_BOARD_ID_E39M:
        case TQMX86_REG_BOARD_ID_E39C:
@@ -152,7 +168,9 @@ static int tqmx86_board_id_to_clk_rate(u8 board_id)
        case TQMX86_REG_BOARD_ID_E38C:
                return 33000;
        default:
-               return 0;
+               dev_warn(dev, "unknown board %d, assuming 24MHz LPC clock\n",
+                        board_id);
+               return 24000;
        }
 }
 
@@ -209,9 +227,11 @@ static int tqmx86_probe(struct platform_device *pdev)
 
                /* Assumes the IRQ resource is first. */
                tqmx_gpio_resources[0].start = gpio_irq;
+       } else {
+               tqmx_gpio_resources[0].flags = 0;
        }
 
-       ocores_platfom_data.clock_khz = tqmx86_board_id_to_clk_rate(board_id);
+       ocores_platform_data.clock_khz = tqmx86_board_id_to_clk_rate(dev, board_id);
 
        if (i2c_det == TQMX86_REG_I2C_DETECT_SOFT) {
                err = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,
@@ -253,6 +273,14 @@ static const struct dmi_system_id tqmx86_dmi_table[] __initconst = {
                },
                .callback = tqmx86_create_platform_device,
        },
+       {
+               .ident = "TQMX86",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TQ-Systems"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TQMx"),
+               },
+               .callback = tqmx86_create_platform_device,
+       },
        {}
 };
 MODULE_DEVICE_TABLE(dmi, tqmx86_dmi_table);
index 6c3a619..651a028 100644 (file)
@@ -154,7 +154,7 @@ static irqreturn_t wm8994_edge_irq(int irq, void *data)
        struct wm8994 *wm8994 = data;
 
        while (gpio_get_value_cansleep(wm8994->pdata.irq_gpio))
-               handle_nested_irq(irq_create_mapping(wm8994->edge_irq, 0));
+               handle_nested_irq(irq_find_mapping(wm8994->edge_irq, 0));
 
        return IRQ_HANDLED;
 }
index e6ee2ec..cbf9d76 100644 (file)
@@ -186,10 +186,11 @@ enum ddr_pwrst {
 #define PRCMU_FW_PROJECT_U8500_C3      8
 #define PRCMU_FW_PROJECT_U8500_C4      9
 #define PRCMU_FW_PROJECT_U9500_MBL     10
-#define PRCMU_FW_PROJECT_U8500_MBL     11 /* Customer specific */
+#define PRCMU_FW_PROJECT_U8500_SSG1    11 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8500_MBL2    12 /* Customer specific */
 #define PRCMU_FW_PROJECT_U8520         13
 #define PRCMU_FW_PROJECT_U8420         14
+#define PRCMU_FW_PROJECT_U8500_SSG2    15 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8420_SYSCLK  17
 #define PRCMU_FW_PROJECT_A9420         20
 /* [32..63] 9540 and derivatives */
diff --git a/include/linux/mfd/idt82p33_reg.h b/include/linux/mfd/idt82p33_reg.h
new file mode 100644 (file)
index 0000000..129a6c0
--- /dev/null
@@ -0,0 +1,112 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Register Map - Based on AN888_SMUforIEEE_SynchEther_82P33xxx_RevH.pdf
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+#ifndef HAVE_IDT82P33_REG
+#define HAVE_IDT82P33_REG
+
+/* Register address */
+#define DPLL1_TOD_CNFG 0x134
+#define DPLL2_TOD_CNFG 0x1B4
+
+#define DPLL1_TOD_STS 0x10B
+#define DPLL2_TOD_STS 0x18B
+
+#define DPLL1_TOD_TRIGGER 0x115
+#define DPLL2_TOD_TRIGGER 0x195
+
+#define DPLL1_OPERATING_MODE_CNFG 0x120
+#define DPLL2_OPERATING_MODE_CNFG 0x1A0
+
+#define DPLL1_HOLDOVER_FREQ_CNFG 0x12C
+#define DPLL2_HOLDOVER_FREQ_CNFG 0x1AC
+
+#define DPLL1_PHASE_OFFSET_CNFG 0x143
+#define DPLL2_PHASE_OFFSET_CNFG 0x1C3
+
+#define DPLL1_SYNC_EDGE_CNFG 0x140
+#define DPLL2_SYNC_EDGE_CNFG 0x1C0
+
+#define DPLL1_INPUT_MODE_CNFG 0x116
+#define DPLL2_INPUT_MODE_CNFG 0x196
+
+#define DPLL1_OPERATING_STS 0x102
+#define DPLL2_OPERATING_STS 0x182
+
+#define DPLL1_CURRENT_FREQ_STS 0x103
+#define DPLL2_CURRENT_FREQ_STS 0x183
+
+#define REG_SOFT_RESET 0X381
+
+#define OUT_MUX_CNFG(outn) REG_ADDR(0x6, (0xC * (outn)))
+
+/* Register bit definitions */
+#define SYNC_TOD BIT(1)
+#define PH_OFFSET_EN BIT(7)
+#define SQUELCH_ENABLE BIT(5)
+
+/* Bit definitions for the DPLL_MODE register */
+#define PLL_MODE_SHIFT         (0)
+#define PLL_MODE_MASK          (0x1F)
+#define COMBO_MODE_EN          BIT(5)
+#define COMBO_MODE_SHIFT       (6)
+#define COMBO_MODE_MASK                (0x3)
+
+/* Bit definitions for DPLL_OPERATING_STS register */
+#define OPERATING_STS_MASK     (0x7)
+#define OPERATING_STS_SHIFT    (0x0)
+
+/* Bit definitions for DPLL_TOD_TRIGGER register */
+#define READ_TRIGGER_MASK      (0xF)
+#define READ_TRIGGER_SHIFT     (0x0)
+#define WRITE_TRIGGER_MASK     (0xF0)
+#define WRITE_TRIGGER_SHIFT    (0x4)
+
+/* Bit definitions for REG_SOFT_RESET register */
+#define SOFT_RESET_EN          BIT(7)
+
+enum pll_mode {
+       PLL_MODE_MIN = 0,
+       PLL_MODE_AUTOMATIC = PLL_MODE_MIN,
+       PLL_MODE_FORCE_FREERUN = 1,
+       PLL_MODE_FORCE_HOLDOVER = 2,
+       PLL_MODE_FORCE_LOCKED = 4,
+       PLL_MODE_FORCE_PRE_LOCKED2 = 5,
+       PLL_MODE_FORCE_PRE_LOCKED = 6,
+       PLL_MODE_FORCE_LOST_PHASE = 7,
+       PLL_MODE_DCO = 10,
+       PLL_MODE_WPH = 18,
+       PLL_MODE_MAX = PLL_MODE_WPH,
+};
+
+enum hw_tod_trig_sel {
+       HW_TOD_TRIG_SEL_MIN = 0,
+       HW_TOD_TRIG_SEL_NO_WRITE = HW_TOD_TRIG_SEL_MIN,
+       HW_TOD_TRIG_SEL_NO_READ = HW_TOD_TRIG_SEL_MIN,
+       HW_TOD_TRIG_SEL_SYNC_SEL = 1,
+       HW_TOD_TRIG_SEL_IN12 = 2,
+       HW_TOD_TRIG_SEL_IN13 = 3,
+       HW_TOD_TRIG_SEL_IN14 = 4,
+       HW_TOD_TRIG_SEL_TOD_PPS = 5,
+       HW_TOD_TRIG_SEL_TIMER_INTERVAL = 6,
+       HW_TOD_TRIG_SEL_MSB_PHASE_OFFSET_CNFG = 7,
+       HW_TOD_TRIG_SEL_MSB_HOLDOVER_FREQ_CNFG = 8,
+       HW_TOD_WR_TRIG_SEL_MSB_TOD_CNFG = 9,
+       HW_TOD_RD_TRIG_SEL_LSB_TOD_STS = HW_TOD_WR_TRIG_SEL_MSB_TOD_CNFG,
+       WR_TRIG_SEL_MAX = HW_TOD_WR_TRIG_SEL_MSB_TOD_CNFG,
+};
+
+/** @brief Enumerated type listing DPLL operational modes */
+enum dpll_state {
+       DPLL_STATE_FREERUN = 1,
+       DPLL_STATE_HOLDOVER = 2,
+       DPLL_STATE_LOCKED = 4,
+       DPLL_STATE_PRELOCKED2 = 5,
+       DPLL_STATE_PRELOCKED = 6,
+       DPLL_STATE_LOSTPHASE = 7,
+       DPLL_STATE_MAX
+};
+
+#endif
diff --git a/include/linux/mfd/idt8a340_reg.h b/include/linux/mfd/idt8a340_reg.h
new file mode 100644 (file)
index 0000000..92d7632
--- /dev/null
@@ -0,0 +1,729 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Based on 5.2.0, Family Programming Guide (Sept 30, 2020)
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+#ifndef HAVE_IDT8A340_REG
+#define HAVE_IDT8A340_REG
+
+#define PAGE_ADDR_BASE                    0x0000
+#define PAGE_ADDR                         0x00fc
+
+#define HW_REVISION                       0x8180
+#define REV_ID                            0x007a
+
+#define HW_DPLL_0                         (0x8a00)
+#define HW_DPLL_1                         (0x8b00)
+#define HW_DPLL_2                         (0x8c00)
+#define HW_DPLL_3                         (0x8d00)
+#define HW_DPLL_4                         (0x8e00)
+#define HW_DPLL_5                         (0x8f00)
+#define HW_DPLL_6                         (0x9000)
+#define HW_DPLL_7                         (0x9100)
+
+#define HW_DPLL_TOD_SW_TRIG_ADDR__0       (0x080)
+#define HW_DPLL_TOD_CTRL_1                (0x089)
+#define HW_DPLL_TOD_CTRL_2                (0x08A)
+#define HW_DPLL_TOD_OVR__0                (0x098)
+#define HW_DPLL_TOD_OUT_0__0              (0x0B0)
+
+#define HW_Q0_Q1_CH_SYNC_CTRL_0           (0xa740)
+#define HW_Q0_Q1_CH_SYNC_CTRL_1           (0xa741)
+#define HW_Q2_Q3_CH_SYNC_CTRL_0           (0xa742)
+#define HW_Q2_Q3_CH_SYNC_CTRL_1           (0xa743)
+#define HW_Q4_Q5_CH_SYNC_CTRL_0           (0xa744)
+#define HW_Q4_Q5_CH_SYNC_CTRL_1           (0xa745)
+#define HW_Q6_Q7_CH_SYNC_CTRL_0           (0xa746)
+#define HW_Q6_Q7_CH_SYNC_CTRL_1           (0xa747)
+#define HW_Q8_CH_SYNC_CTRL_0              (0xa748)
+#define HW_Q8_CH_SYNC_CTRL_1              (0xa749)
+#define HW_Q9_CH_SYNC_CTRL_0              (0xa74a)
+#define HW_Q9_CH_SYNC_CTRL_1              (0xa74b)
+#define HW_Q10_CH_SYNC_CTRL_0             (0xa74c)
+#define HW_Q10_CH_SYNC_CTRL_1             (0xa74d)
+#define HW_Q11_CH_SYNC_CTRL_0             (0xa74e)
+#define HW_Q11_CH_SYNC_CTRL_1             (0xa74f)
+
+#define SYNC_SOURCE_DPLL0_TOD_PPS      0x14
+#define SYNC_SOURCE_DPLL1_TOD_PPS      0x15
+#define SYNC_SOURCE_DPLL2_TOD_PPS      0x16
+#define SYNC_SOURCE_DPLL3_TOD_PPS      0x17
+
+#define SYNCTRL1_MASTER_SYNC_RST       BIT(7)
+#define SYNCTRL1_MASTER_SYNC_TRIG      BIT(5)
+#define SYNCTRL1_TOD_SYNC_TRIG         BIT(4)
+#define SYNCTRL1_FBDIV_FRAME_SYNC_TRIG BIT(3)
+#define SYNCTRL1_FBDIV_SYNC_TRIG       BIT(2)
+#define SYNCTRL1_Q1_DIV_SYNC_TRIG      BIT(1)
+#define SYNCTRL1_Q0_DIV_SYNC_TRIG      BIT(0)
+
+#define HW_Q8_CTRL_SPARE  (0xa7d4)
+#define HW_Q11_CTRL_SPARE (0xa7ec)
+
+/**
+ * Select FOD5 as sync_trigger for Q8 divider.
+ * Transition from logic zero to one
+ * sets trigger to sync Q8 divider.
+ *
+ * Unused when FOD4 is driving Q8 divider (normal operation).
+ */
+#define Q9_TO_Q8_SYNC_TRIG  BIT(1)
+
+/**
+ * Enable FOD5 as driver for clock and sync for Q8 divider.
+ * Enable fanout buffer for FOD5.
+ *
+ * Unused when FOD4 is driving Q8 divider (normal operation).
+ */
+#define Q9_TO_Q8_FANOUT_AND_CLOCK_SYNC_ENABLE_MASK  (BIT(0) | BIT(2))
+
+/**
+ * Select FOD6 as sync_trigger for Q11 divider.
+ * Transition from logic zero to one
+ * sets trigger to sync Q11 divider.
+ *
+ * Unused when FOD7 is driving Q11 divider (normal operation).
+ */
+#define Q10_TO_Q11_SYNC_TRIG  BIT(1)
+
+/**
+ * Enable FOD6 as driver for clock and sync for Q11 divider.
+ * Enable fanout buffer for FOD6.
+ *
+ * Unused when FOD7 is driving Q11 divider (normal operation).
+ */
+#define Q10_TO_Q11_FANOUT_AND_CLOCK_SYNC_ENABLE_MASK  (BIT(0) | BIT(2))
+
+#define RESET_CTRL                        0xc000
+#define SM_RESET                          0x0012
+#define SM_RESET_V520                     0x0013
+#define SM_RESET_CMD                      0x5A
+
+#define GENERAL_STATUS                    0xc014
+#define BOOT_STATUS                       0x0000
+#define HW_REV_ID                         0x000A
+#define BOND_ID                           0x000B
+#define HW_CSR_ID                         0x000C
+#define HW_IRQ_ID                         0x000E
+#define MAJ_REL                           0x0010
+#define MIN_REL                           0x0011
+#define HOTFIX_REL                        0x0012
+#define PIPELINE_ID                       0x0014
+#define BUILD_ID                          0x0018
+#define JTAG_DEVICE_ID                    0x001c
+#define PRODUCT_ID                        0x001e
+#define OTP_SCSR_CONFIG_SELECT            0x0022
+
+#define STATUS                            0xc03c
+#define DPLL0_STATUS                     0x0018
+#define DPLL1_STATUS                     0x0019
+#define DPLL2_STATUS                     0x001a
+#define DPLL3_STATUS                     0x001b
+#define DPLL4_STATUS                     0x001c
+#define DPLL5_STATUS                     0x001d
+#define DPLL6_STATUS                     0x001e
+#define DPLL7_STATUS                     0x001f
+#define DPLL_SYS_STATUS                   0x0020
+#define DPLL_SYS_APLL_STATUS              0x0021
+#define DPLL0_FILTER_STATUS               0x0044
+#define DPLL1_FILTER_STATUS               0x004c
+#define DPLL2_FILTER_STATUS               0x0054
+#define DPLL3_FILTER_STATUS               0x005c
+#define DPLL4_FILTER_STATUS               0x0064
+#define DPLL5_FILTER_STATUS               0x006c
+#define DPLL6_FILTER_STATUS               0x0074
+#define DPLL7_FILTER_STATUS               0x007c
+#define DPLLSYS_FILTER_STATUS             0x0084
+#define USER_GPIO0_TO_7_STATUS            0x008a
+#define USER_GPIO8_TO_15_STATUS           0x008b
+
+#define GPIO_USER_CONTROL                 0xc160
+#define GPIO0_TO_7_OUT                    0x0000
+#define GPIO8_TO_15_OUT                   0x0001
+#define GPIO0_TO_7_OUT_V520               0x0002
+#define GPIO8_TO_15_OUT_V520              0x0003
+
+#define STICKY_STATUS_CLEAR               0xc164
+
+#define GPIO_TOD_NOTIFICATION_CLEAR       0xc16c
+
+#define ALERT_CFG                         0xc188
+
+#define SYS_DPLL_XO                       0xc194
+
+#define SYS_APLL                          0xc19c
+
+#define INPUT_0                           0xc1b0
+#define INPUT_1                           0xc1c0
+#define INPUT_2                           0xc1d0
+#define INPUT_3                           0xc200
+#define INPUT_4                           0xc210
+#define INPUT_5                           0xc220
+#define INPUT_6                           0xc230
+#define INPUT_7                           0xc240
+#define INPUT_8                           0xc250
+#define INPUT_9                           0xc260
+#define INPUT_10                          0xc280
+#define INPUT_11                          0xc290
+#define INPUT_12                          0xc2a0
+#define INPUT_13                          0xc2b0
+#define INPUT_14                          0xc2c0
+#define INPUT_15                          0xc2d0
+
+#define REF_MON_0                         0xc2e0
+#define REF_MON_1                         0xc2ec
+#define REF_MON_2                         0xc300
+#define REF_MON_3                         0xc30c
+#define REF_MON_4                         0xc318
+#define REF_MON_5                         0xc324
+#define REF_MON_6                         0xc330
+#define REF_MON_7                         0xc33c
+#define REF_MON_8                         0xc348
+#define REF_MON_9                         0xc354
+#define REF_MON_10                        0xc360
+#define REF_MON_11                        0xc36c
+#define REF_MON_12                        0xc380
+#define REF_MON_13                        0xc38c
+#define REF_MON_14                        0xc398
+#define REF_MON_15                        0xc3a4
+
+#define DPLL_0                            0xc3b0
+#define DPLL_CTRL_REG_0                   0x0002
+#define DPLL_CTRL_REG_1                   0x0003
+#define DPLL_CTRL_REG_2                   0x0004
+#define DPLL_TOD_SYNC_CFG                 0x0031
+#define DPLL_COMBO_SLAVE_CFG_0            0x0032
+#define DPLL_COMBO_SLAVE_CFG_1            0x0033
+#define DPLL_SLAVE_REF_CFG                0x0034
+#define DPLL_REF_MODE                     0x0035
+#define DPLL_PHASE_MEASUREMENT_CFG        0x0036
+#define DPLL_MODE                         0x0037
+#define DPLL_MODE_V520                    0x003B
+#define DPLL_1                            0xc400
+#define DPLL_2                            0xc438
+#define DPLL_2_V520                       0xc43c
+#define DPLL_3                            0xc480
+#define DPLL_4                            0xc4b8
+#define DPLL_4_V520                       0xc4bc
+#define DPLL_5                            0xc500
+#define DPLL_6                            0xc538
+#define DPLL_6_V520                       0xc53c
+#define DPLL_7                            0xc580
+#define SYS_DPLL                          0xc5b8
+#define SYS_DPLL_V520                     0xc5bc
+
+#define DPLL_CTRL_0                       0xc600
+#define DPLL_CTRL_DPLL_MANU_REF_CFG       0x0001
+#define DPLL_CTRL_DPLL_FOD_FREQ           0x001c
+#define DPLL_CTRL_COMBO_MASTER_CFG        0x003a
+#define DPLL_CTRL_1                       0xc63c
+#define DPLL_CTRL_2                       0xc680
+#define DPLL_CTRL_3                       0xc6bc
+#define DPLL_CTRL_4                       0xc700
+#define DPLL_CTRL_5                       0xc73c
+#define DPLL_CTRL_6                       0xc780
+#define DPLL_CTRL_7                       0xc7bc
+#define SYS_DPLL_CTRL                     0xc800
+
+#define DPLL_PHASE_0                      0xc818
+/* Signed 42-bit FFO in units of 2^(-53) */
+#define DPLL_WR_PHASE                     0x0000
+#define DPLL_PHASE_1                      0xc81c
+#define DPLL_PHASE_2                      0xc820
+#define DPLL_PHASE_3                      0xc824
+#define DPLL_PHASE_4                      0xc828
+#define DPLL_PHASE_5                      0xc82c
+#define DPLL_PHASE_6                      0xc830
+#define DPLL_PHASE_7                      0xc834
+
+#define DPLL_FREQ_0                       0xc838
+/* Signed 42-bit FFO in units of 2^(-53) */
+#define DPLL_WR_FREQ                      0x0000
+#define DPLL_FREQ_1                       0xc840
+#define DPLL_FREQ_2                       0xc848
+#define DPLL_FREQ_3                       0xc850
+#define DPLL_FREQ_4                       0xc858
+#define DPLL_FREQ_5                       0xc860
+#define DPLL_FREQ_6                       0xc868
+#define DPLL_FREQ_7                       0xc870
+
+#define DPLL_PHASE_PULL_IN_0              0xc880
+#define PULL_IN_OFFSET                    0x0000 /* Signed 32 bit */
+#define PULL_IN_SLOPE_LIMIT               0x0004 /* Unsigned 24 bit */
+#define PULL_IN_CTRL                      0x0007
+#define DPLL_PHASE_PULL_IN_1              0xc888
+#define DPLL_PHASE_PULL_IN_2              0xc890
+#define DPLL_PHASE_PULL_IN_3              0xc898
+#define DPLL_PHASE_PULL_IN_4              0xc8a0
+#define DPLL_PHASE_PULL_IN_5              0xc8a8
+#define DPLL_PHASE_PULL_IN_6              0xc8b0
+#define DPLL_PHASE_PULL_IN_7              0xc8b8
+
+#define GPIO_CFG                          0xc8c0
+#define GPIO_CFG_GBL                      0x0000
+#define GPIO_0                            0xc8c2
+#define GPIO_DCO_INC_DEC                  0x0000
+#define GPIO_OUT_CTRL_0                   0x0001
+#define GPIO_OUT_CTRL_1                   0x0002
+#define GPIO_TOD_TRIG                     0x0003
+#define GPIO_DPLL_INDICATOR               0x0004
+#define GPIO_LOS_INDICATOR                0x0005
+#define GPIO_REF_INPUT_DSQ_0              0x0006
+#define GPIO_REF_INPUT_DSQ_1              0x0007
+#define GPIO_REF_INPUT_DSQ_2              0x0008
+#define GPIO_REF_INPUT_DSQ_3              0x0009
+#define GPIO_MAN_CLK_SEL_0                0x000a
+#define GPIO_MAN_CLK_SEL_1                0x000b
+#define GPIO_MAN_CLK_SEL_2                0x000c
+#define GPIO_SLAVE                        0x000d
+#define GPIO_ALERT_OUT_CFG                0x000e
+#define GPIO_TOD_NOTIFICATION_CFG         0x000f
+#define GPIO_CTRL                         0x0010
+#define GPIO_CTRL_V520                    0x0011
+#define GPIO_1                            0xc8d4
+#define GPIO_2                            0xc8e6
+#define GPIO_3                            0xc900
+#define GPIO_4                            0xc912
+#define GPIO_5                            0xc924
+#define GPIO_6                            0xc936
+#define GPIO_7                            0xc948
+#define GPIO_8                            0xc95a
+#define GPIO_9                            0xc980
+#define GPIO_10                           0xc992
+#define GPIO_11                           0xc9a4
+#define GPIO_12                           0xc9b6
+#define GPIO_13                           0xc9c8
+#define GPIO_14                           0xc9da
+#define GPIO_15                           0xca00
+
+#define OUT_DIV_MUX                       0xca12
+#define OUTPUT_0                          0xca14
+#define OUTPUT_0_V520                     0xca20
+/* FOD frequency output divider value */
+#define OUT_DIV                           0x0000
+#define OUT_DUTY_CYCLE_HIGH               0x0004
+#define OUT_CTRL_0                        0x0008
+#define OUT_CTRL_1                        0x0009
+/* Phase adjustment in FOD cycles */
+#define OUT_PHASE_ADJ                     0x000c
+#define OUTPUT_1                          0xca24
+#define OUTPUT_1_V520                     0xca30
+#define OUTPUT_2                          0xca34
+#define OUTPUT_2_V520                     0xca40
+#define OUTPUT_3                          0xca44
+#define OUTPUT_3_V520                     0xca50
+#define OUTPUT_4                          0xca54
+#define OUTPUT_4_V520                     0xca60
+#define OUTPUT_5                          0xca64
+#define OUTPUT_5_V520                     0xca80
+#define OUTPUT_6                          0xca80
+#define OUTPUT_6_V520                     0xca90
+#define OUTPUT_7                          0xca90
+#define OUTPUT_7_V520                     0xcaa0
+#define OUTPUT_8                          0xcaa0
+#define OUTPUT_8_V520                     0xcab0
+#define OUTPUT_9                          0xcab0
+#define OUTPUT_9_V520                     0xcac0
+#define OUTPUT_10                         0xcac0
+#define OUTPUT_10_V520                     0xcad0
+#define OUTPUT_11                         0xcad0
+#define OUTPUT_11_V520                    0xcae0
+
+#define SERIAL                            0xcae0
+#define SERIAL_V520                       0xcaf0
+
+#define PWM_ENCODER_0                     0xcb00
+#define PWM_ENCODER_1                     0xcb08
+#define PWM_ENCODER_2                     0xcb10
+#define PWM_ENCODER_3                     0xcb18
+#define PWM_ENCODER_4                     0xcb20
+#define PWM_ENCODER_5                     0xcb28
+#define PWM_ENCODER_6                     0xcb30
+#define PWM_ENCODER_7                     0xcb38
+#define PWM_DECODER_0                     0xcb40
+#define PWM_DECODER_1                     0xcb48
+#define PWM_DECODER_1_V520                0xcb4a
+#define PWM_DECODER_2                     0xcb50
+#define PWM_DECODER_2_V520                0xcb54
+#define PWM_DECODER_3                     0xcb58
+#define PWM_DECODER_3_V520                0xcb5e
+#define PWM_DECODER_4                     0xcb60
+#define PWM_DECODER_4_V520                0xcb68
+#define PWM_DECODER_5                     0xcb68
+#define PWM_DECODER_5_V520                0xcb80
+#define PWM_DECODER_6                     0xcb70
+#define PWM_DECODER_6_V520                0xcb8a
+#define PWM_DECODER_7                     0xcb80
+#define PWM_DECODER_7_V520                0xcb94
+#define PWM_DECODER_8                     0xcb88
+#define PWM_DECODER_8_V520                0xcb9e
+#define PWM_DECODER_9                     0xcb90
+#define PWM_DECODER_9_V520                0xcba8
+#define PWM_DECODER_10                    0xcb98
+#define PWM_DECODER_10_V520               0xcbb2
+#define PWM_DECODER_11                    0xcba0
+#define PWM_DECODER_11_V520               0xcbbc
+#define PWM_DECODER_12                    0xcba8
+#define PWM_DECODER_12_V520               0xcbc6
+#define PWM_DECODER_13                    0xcbb0
+#define PWM_DECODER_13_V520               0xcbd0
+#define PWM_DECODER_14                    0xcbb8
+#define PWM_DECODER_14_V520               0xcbda
+#define PWM_DECODER_15                    0xcbc0
+#define PWM_DECODER_15_V520               0xcbe4
+#define PWM_USER_DATA                     0xcbc8
+#define PWM_USER_DATA_V520                0xcbf0
+
+#define TOD_0                             0xcbcc
+#define TOD_0_V520                        0xcc00
+/* Enable TOD counter, output channel sync and even-PPS mode */
+#define TOD_CFG                           0x0000
+#define TOD_CFG_V520                      0x0001
+#define TOD_1                             0xcbce
+#define TOD_1_V520                        0xcc02
+#define TOD_2                             0xcbd0
+#define TOD_2_V520                        0xcc04
+#define TOD_3                             0xcbd2
+#define TOD_3_V520                        0xcc06
+
+#define TOD_WRITE_0                       0xcc00
+#define TOD_WRITE_0_V520                  0xcc10
+/* 8-bit subns, 32-bit ns, 48-bit seconds */
+#define TOD_WRITE                         0x0000
+/* Counter increments after TOD write is completed */
+#define TOD_WRITE_COUNTER                 0x000c
+/* TOD write trigger configuration */
+#define TOD_WRITE_SELECT_CFG_0            0x000d
+/* TOD write trigger selection */
+#define TOD_WRITE_CMD                     0x000f
+#define TOD_WRITE_1                       0xcc10
+#define TOD_WRITE_1_V520                  0xcc20
+#define TOD_WRITE_2                       0xcc20
+#define TOD_WRITE_2_V520                  0xcc30
+#define TOD_WRITE_3                       0xcc30
+#define TOD_WRITE_3_V520                  0xcc40
+
+#define TOD_READ_PRIMARY_0                0xcc40
+#define TOD_READ_PRIMARY_0_V520           0xcc50
+/* 8-bit subns, 32-bit ns, 48-bit seconds */
+#define TOD_READ_PRIMARY                  0x0000
+/* Counter increments after TOD write is completed */
+#define TOD_READ_PRIMARY_COUNTER          0x000b
+/* Read trigger configuration */
+#define TOD_READ_PRIMARY_SEL_CFG_0        0x000c
+/* Read trigger selection */
+#define TOD_READ_PRIMARY_CMD              0x000e
+#define TOD_READ_PRIMARY_CMD_V520         0x000f
+#define TOD_READ_PRIMARY_1                0xcc50
+#define TOD_READ_PRIMARY_1_V520           0xcc60
+#define TOD_READ_PRIMARY_2                0xcc60
+#define TOD_READ_PRIMARY_2_V520           0xcc80
+#define TOD_READ_PRIMARY_3                0xcc80
+#define TOD_READ_PRIMARY_3_V520           0xcc90
+
+#define TOD_READ_SECONDARY_0              0xcc90
+#define TOD_READ_SECONDARY_0_V520         0xcca0
+#define TOD_READ_SECONDARY_1              0xcca0
+#define TOD_READ_SECONDARY_1_V520         0xccb0
+#define TOD_READ_SECONDARY_2              0xccb0
+#define TOD_READ_SECONDARY_2_V520         0xccc0
+#define TOD_READ_SECONDARY_3              0xccc0
+#define TOD_READ_SECONDARY_3_V520         0xccd0
+
+#define OUTPUT_TDC_CFG                    0xccd0
+#define OUTPUT_TDC_CFG_V520               0xcce0
+#define OUTPUT_TDC_0                      0xcd00
+#define OUTPUT_TDC_1                      0xcd08
+#define OUTPUT_TDC_2                      0xcd10
+#define OUTPUT_TDC_3                      0xcd18
+#define INPUT_TDC                         0xcd20
+
+#define SCRATCH                           0xcf50
+#define SCRATCH_V520                      0xcf4c
+
+#define EEPROM                            0xcf68
+#define EEPROM_V520                       0xcf64
+
+#define OTP                               0xcf70
+
+#define BYTE                              0xcf80
+
+/* Bit definitions for the MAJ_REL register */
+#define MAJOR_SHIFT                       (1)
+#define MAJOR_MASK                        (0x7f)
+#define PR_BUILD                          BIT(0)
+
+/* Bit definitions for the USER_GPIO0_TO_7_STATUS register */
+#define GPIO0_LEVEL                       BIT(0)
+#define GPIO1_LEVEL                       BIT(1)
+#define GPIO2_LEVEL                       BIT(2)
+#define GPIO3_LEVEL                       BIT(3)
+#define GPIO4_LEVEL                       BIT(4)
+#define GPIO5_LEVEL                       BIT(5)
+#define GPIO6_LEVEL                       BIT(6)
+#define GPIO7_LEVEL                       BIT(7)
+
+/* Bit definitions for the USER_GPIO8_TO_15_STATUS register */
+#define GPIO8_LEVEL                       BIT(0)
+#define GPIO9_LEVEL                       BIT(1)
+#define GPIO10_LEVEL                      BIT(2)
+#define GPIO11_LEVEL                      BIT(3)
+#define GPIO12_LEVEL                      BIT(4)
+#define GPIO13_LEVEL                      BIT(5)
+#define GPIO14_LEVEL                      BIT(6)
+#define GPIO15_LEVEL                      BIT(7)
+
+/* Bit definitions for the GPIO0_TO_7_OUT register */
+#define GPIO0_DRIVE_LEVEL                 BIT(0)
+#define GPIO1_DRIVE_LEVEL                 BIT(1)
+#define GPIO2_DRIVE_LEVEL                 BIT(2)
+#define GPIO3_DRIVE_LEVEL                 BIT(3)
+#define GPIO4_DRIVE_LEVEL                 BIT(4)
+#define GPIO5_DRIVE_LEVEL                 BIT(5)
+#define GPIO6_DRIVE_LEVEL                 BIT(6)
+#define GPIO7_DRIVE_LEVEL                 BIT(7)
+
+/* Bit definitions for the GPIO8_TO_15_OUT register */
+#define GPIO8_DRIVE_LEVEL                 BIT(0)
+#define GPIO9_DRIVE_LEVEL                 BIT(1)
+#define GPIO10_DRIVE_LEVEL                BIT(2)
+#define GPIO11_DRIVE_LEVEL                BIT(3)
+#define GPIO12_DRIVE_LEVEL                BIT(4)
+#define GPIO13_DRIVE_LEVEL                BIT(5)
+#define GPIO14_DRIVE_LEVEL                BIT(6)
+#define GPIO15_DRIVE_LEVEL                BIT(7)
+
+/* Bit definitions for the DPLL_TOD_SYNC_CFG register */
+#define TOD_SYNC_SOURCE_SHIFT             (1)
+#define TOD_SYNC_SOURCE_MASK              (0x3)
+#define TOD_SYNC_EN                       BIT(0)
+
+/* Bit definitions for the DPLL_MODE register */
+#define WRITE_TIMER_MODE                  BIT(6)
+#define PLL_MODE_SHIFT                    (3)
+#define PLL_MODE_MASK                     (0x7)
+#define STATE_MODE_SHIFT                  (0)
+#define STATE_MODE_MASK                   (0x7)
+
+/* Bit definitions for the GPIO_CFG_GBL register */
+#define SUPPLY_MODE_SHIFT                 (0)
+#define SUPPLY_MODE_MASK                  (0x3)
+
+/* Bit definitions for the GPIO_DCO_INC_DEC register */
+#define INCDEC_DPLL_INDEX_SHIFT           (0)
+#define INCDEC_DPLL_INDEX_MASK            (0x7)
+
+/* Bit definitions for the GPIO_OUT_CTRL_0 register */
+#define CTRL_OUT_0                        BIT(0)
+#define CTRL_OUT_1                        BIT(1)
+#define CTRL_OUT_2                        BIT(2)
+#define CTRL_OUT_3                        BIT(3)
+#define CTRL_OUT_4                        BIT(4)
+#define CTRL_OUT_5                        BIT(5)
+#define CTRL_OUT_6                        BIT(6)
+#define CTRL_OUT_7                        BIT(7)
+
+/* Bit definitions for the GPIO_OUT_CTRL_1 register */
+#define CTRL_OUT_8                        BIT(0)
+#define CTRL_OUT_9                        BIT(1)
+#define CTRL_OUT_10                       BIT(2)
+#define CTRL_OUT_11                       BIT(3)
+#define CTRL_OUT_12                       BIT(4)
+#define CTRL_OUT_13                       BIT(5)
+#define CTRL_OUT_14                       BIT(6)
+#define CTRL_OUT_15                       BIT(7)
+
+/* Bit definitions for the GPIO_TOD_TRIG register */
+#define TOD_TRIG_0                        BIT(0)
+#define TOD_TRIG_1                        BIT(1)
+#define TOD_TRIG_2                        BIT(2)
+#define TOD_TRIG_3                        BIT(3)
+
+/* Bit definitions for the GPIO_DPLL_INDICATOR register */
+#define IND_DPLL_INDEX_SHIFT              (0)
+#define IND_DPLL_INDEX_MASK               (0x7)
+
+/* Bit definitions for the GPIO_LOS_INDICATOR register */
+#define REFMON_INDEX_SHIFT                (0)
+#define REFMON_INDEX_MASK                 (0xf)
+/* Active level of LOS indicator, 0=low 1=high */
+#define ACTIVE_LEVEL                      BIT(4)
+
+/* Bit definitions for the GPIO_REF_INPUT_DSQ_0 register */
+#define DSQ_INP_0                         BIT(0)
+#define DSQ_INP_1                         BIT(1)
+#define DSQ_INP_2                         BIT(2)
+#define DSQ_INP_3                         BIT(3)
+#define DSQ_INP_4                         BIT(4)
+#define DSQ_INP_5                         BIT(5)
+#define DSQ_INP_6                         BIT(6)
+#define DSQ_INP_7                         BIT(7)
+
+/* Bit definitions for the GPIO_REF_INPUT_DSQ_1 register */
+#define DSQ_INP_8                         BIT(0)
+#define DSQ_INP_9                         BIT(1)
+#define DSQ_INP_10                        BIT(2)
+#define DSQ_INP_11                        BIT(3)
+#define DSQ_INP_12                        BIT(4)
+#define DSQ_INP_13                        BIT(5)
+#define DSQ_INP_14                        BIT(6)
+#define DSQ_INP_15                        BIT(7)
+
+/* Bit definitions for the GPIO_REF_INPUT_DSQ_2 register */
+#define DSQ_DPLL_0                        BIT(0)
+#define DSQ_DPLL_1                        BIT(1)
+#define DSQ_DPLL_2                        BIT(2)
+#define DSQ_DPLL_3                        BIT(3)
+#define DSQ_DPLL_4                        BIT(4)
+#define DSQ_DPLL_5                        BIT(5)
+#define DSQ_DPLL_6                        BIT(6)
+#define DSQ_DPLL_7                        BIT(7)
+
+/* Bit definitions for the GPIO_REF_INPUT_DSQ_3 register */
+#define DSQ_DPLL_SYS                      BIT(0)
+#define GPIO_DSQ_LEVEL                    BIT(1)
+
+/* Bit definitions for the GPIO_TOD_NOTIFICATION_CFG register */
+#define DPLL_TOD_SHIFT                    (0)
+#define DPLL_TOD_MASK                     (0x3)
+#define TOD_READ_SECONDARY                BIT(2)
+#define GPIO_ASSERT_LEVEL                 BIT(3)
+
+/* Bit definitions for the GPIO_CTRL register */
+#define GPIO_FUNCTION_EN                  BIT(0)
+#define GPIO_CMOS_OD_MODE                 BIT(1)
+#define GPIO_CONTROL_DIR                  BIT(2)
+#define GPIO_PU_PD_MODE                   BIT(3)
+#define GPIO_FUNCTION_SHIFT               (4)
+#define GPIO_FUNCTION_MASK                (0xf)
+
+/* Bit definitions for the OUT_CTRL_1 register */
+#define OUT_SYNC_DISABLE                  BIT(7)
+#define SQUELCH_VALUE                     BIT(6)
+#define SQUELCH_DISABLE                   BIT(5)
+#define PAD_VDDO_SHIFT                    (2)
+#define PAD_VDDO_MASK                     (0x7)
+#define PAD_CMOSDRV_SHIFT                 (0)
+#define PAD_CMOSDRV_MASK                  (0x3)
+
+/* Bit definitions for the TOD_CFG register */
+#define TOD_EVEN_PPS_MODE                 BIT(2)
+#define TOD_OUT_SYNC_ENABLE               BIT(1)
+#define TOD_ENABLE                        BIT(0)
+
+/* Bit definitions for the TOD_WRITE_SELECT_CFG_0 register */
+#define WR_PWM_DECODER_INDEX_SHIFT        (4)
+#define WR_PWM_DECODER_INDEX_MASK         (0xf)
+#define WR_REF_INDEX_SHIFT                (0)
+#define WR_REF_INDEX_MASK                 (0xf)
+
+/* Bit definitions for the TOD_WRITE_CMD register */
+#define TOD_WRITE_SELECTION_SHIFT         (0)
+#define TOD_WRITE_SELECTION_MASK          (0xf)
+/* 4.8.7 */
+#define TOD_WRITE_TYPE_SHIFT              (4)
+#define TOD_WRITE_TYPE_MASK               (0x3)
+
+/* Bit definitions for the TOD_READ_PRIMARY_SEL_CFG_0 register */
+#define RD_PWM_DECODER_INDEX_SHIFT        (4)
+#define RD_PWM_DECODER_INDEX_MASK         (0xf)
+#define RD_REF_INDEX_SHIFT                (0)
+#define RD_REF_INDEX_MASK                 (0xf)
+
+/* Bit definitions for the TOD_READ_PRIMARY_CMD register */
+#define TOD_READ_TRIGGER_MODE             BIT(4)
+#define TOD_READ_TRIGGER_SHIFT            (0)
+#define TOD_READ_TRIGGER_MASK             (0xf)
+
+/* Bit definitions for the DPLL_CTRL_COMBO_MASTER_CFG register */
+#define COMBO_MASTER_HOLD                 BIT(0)
+
+/* Bit definitions for DPLL_SYS_STATUS register */
+#define DPLL_SYS_STATE_MASK               (0xf)
+
+/* Bit definitions for SYS_APLL_STATUS register */
+#define SYS_APLL_LOSS_LOCK_LIVE_MASK       BIT(0)
+#define SYS_APLL_LOSS_LOCK_LIVE_LOCKED     0
+#define SYS_APLL_LOSS_LOCK_LIVE_UNLOCKED   1
+
+/* Bit definitions for the DPLL0_STATUS register */
+#define DPLL_STATE_MASK                   (0xf)
+#define DPLL_STATE_SHIFT                  (0x0)
+
+/* Values of DPLL_N.DPLL_MODE.PLL_MODE */
+enum pll_mode {
+       PLL_MODE_MIN = 0,
+       PLL_MODE_NORMAL = PLL_MODE_MIN,
+       PLL_MODE_WRITE_PHASE = 1,
+       PLL_MODE_WRITE_FREQUENCY = 2,
+       PLL_MODE_GPIO_INC_DEC = 3,
+       PLL_MODE_SYNTHESIS = 4,
+       PLL_MODE_PHASE_MEASUREMENT = 5,
+       PLL_MODE_DISABLED = 6,
+       PLL_MODE_MAX = PLL_MODE_DISABLED,
+};
+
+enum hw_tod_write_trig_sel {
+       HW_TOD_WR_TRIG_SEL_MIN = 0,
+       HW_TOD_WR_TRIG_SEL_MSB = HW_TOD_WR_TRIG_SEL_MIN,
+       HW_TOD_WR_TRIG_SEL_RESERVED = 1,
+       HW_TOD_WR_TRIG_SEL_TOD_PPS = 2,
+       HW_TOD_WR_TRIG_SEL_IRIGB_PPS = 3,
+       HW_TOD_WR_TRIG_SEL_PWM_PPS = 4,
+       HW_TOD_WR_TRIG_SEL_GPIO = 5,
+       HW_TOD_WR_TRIG_SEL_FOD_SYNC = 6,
+       WR_TRIG_SEL_MAX = HW_TOD_WR_TRIG_SEL_FOD_SYNC,
+};
+
+enum scsr_read_trig_sel {
+       /* CANCEL CURRENT TOD READ; MODULE BECOMES IDLE - NO TRIGGER OCCURS */
+       SCSR_TOD_READ_TRIG_SEL_DISABLE = 0,
+       /* TRIGGER IMMEDIATELY */
+       SCSR_TOD_READ_TRIG_SEL_IMMEDIATE = 1,
+       /* TRIGGER ON RISING EDGE OF INTERNAL TOD PPS SIGNAL */
+       SCSR_TOD_READ_TRIG_SEL_TODPPS = 2,
+       /* TRGGER ON RISING EDGE OF SELECTED REFERENCE INPUT */
+       SCSR_TOD_READ_TRIG_SEL_REFCLK = 3,
+       /* TRIGGER ON RISING EDGE OF SELECTED PWM DECODER 1PPS OUTPUT */
+       SCSR_TOD_READ_TRIG_SEL_PWMPPS = 4,
+       SCSR_TOD_READ_TRIG_SEL_RESERVED = 5,
+       /* TRIGGER WHEN WRITE FREQUENCY EVENT OCCURS  */
+       SCSR_TOD_READ_TRIG_SEL_WRITEFREQUENCYEVENT = 6,
+       /* TRIGGER ON SELECTED GPIO */
+       SCSR_TOD_READ_TRIG_SEL_GPIO = 7,
+       SCSR_TOD_READ_TRIG_SEL_MAX = SCSR_TOD_READ_TRIG_SEL_GPIO,
+};
+
+/* Values STATUS.DPLL_SYS_STATUS.DPLL_SYS_STATE */
+enum dpll_state {
+       DPLL_STATE_MIN = 0,
+       DPLL_STATE_FREERUN = DPLL_STATE_MIN,
+       DPLL_STATE_LOCKACQ = 1,
+       DPLL_STATE_LOCKREC = 2,
+       DPLL_STATE_LOCKED = 3,
+       DPLL_STATE_HOLDOVER = 4,
+       DPLL_STATE_OPEN_LOOP = 5,
+       DPLL_STATE_MAX = DPLL_STATE_OPEN_LOOP,
+};
+
+/* 4.8.7 only */
+enum scsr_tod_write_trig_sel {
+       SCSR_TOD_WR_TRIG_SEL_DISABLE = 0,
+       SCSR_TOD_WR_TRIG_SEL_IMMEDIATE = 1,
+       SCSR_TOD_WR_TRIG_SEL_REFCLK = 2,
+       SCSR_TOD_WR_TRIG_SEL_PWMPPS = 3,
+       SCSR_TOD_WR_TRIG_SEL_TODPPS = 4,
+       SCSR_TOD_WR_TRIG_SEL_SYNCFOD = 5,
+       SCSR_TOD_WR_TRIG_SEL_GPIO = 6,
+       SCSR_TOD_WR_TRIG_SEL_MAX = SCSR_TOD_WR_TRIG_SEL_GPIO,
+};
+
+/* 4.8.7 only */
+enum scsr_tod_write_type_sel {
+       SCSR_TOD_WR_TYPE_SEL_ABSOLUTE = 0,
+       SCSR_TOD_WR_TYPE_SEL_DELTA_PLUS = 1,
+       SCSR_TOD_WR_TYPE_SEL_DELTA_MINUS = 2,
+       SCSR_TOD_WR_TYPE_SEL_MAX = SCSR_TOD_WR_TYPE_SEL_DELTA_MINUS,
+};
+#endif
diff --git a/include/linux/mfd/rsmu.h b/include/linux/mfd/rsmu.h
new file mode 100644 (file)
index 0000000..6870de6
--- /dev/null
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Core interface for Renesas Synchronization Management Unit (SMU) devices.
+ *
+ * Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company.
+ */
+
+#ifndef __LINUX_MFD_RSMU_H
+#define __LINUX_MFD_RSMU_H
+
+/* The supported devices are ClockMatrix, Sabre and SnowLotus */
+enum rsmu_type {
+       RSMU_CM         = 0x34000,
+       RSMU_SABRE      = 0x33810,
+       RSMU_SL         = 0x19850,
+};
+
+/**
+ *
+ * struct rsmu_ddata - device data structure for sub devices.
+ *
+ * @dev:    i2c/spi device.
+ * @regmap: i2c/spi bus access.
+ * @lock:   mutex used by sub devices to make sure a series of
+ *          bus access requests are not interrupted.
+ * @type:   RSMU device type.
+ * @page:   i2c/spi bus driver internal use only.
+ */
+struct rsmu_ddata {
+       struct device *dev;
+       struct regmap *regmap;
+       struct mutex lock;
+       enum rsmu_type type;
+       u16 page;
+};
+#endif /*  __LINUX_MFD_RSMU_H */