Unverified Commit 097d4193 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-drivers-for-6.11' of... 

Merge tag 'sunxi-drivers-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers

Allwinner SoC driver changes for 6.11

- DT binding addition of regulator node under SRAM node
- Cleanup of unused list in SRAM driver

* tag 'sunxi-drivers-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  dt-bindings: sram: sunxi-sram: Add regulators child
  soc: sunxi: sram: Remove unused list 'claimed_sram'

Link: https://lore.kernel.org/r/ZoQZguQ6taJziJ11@wens.tw


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2bb1acc6 3a6fb902

Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml

+28 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
  ranges: true



patternProperties:

  "^regulators@[0-9a-f]+$":

    $ref: /schemas/regulator/allwinner,sun20i-d1-system-ldos.yaml#



  "^sram@[a-f0-9]+":

    $ref: /schemas/sram/sram.yaml#

    unevaluatedProperties: false
@@ -130,3 +133,28 @@ examples: 
        };

      };

    };



  - |

    syscon@3000000 {

      compatible = "allwinner,sun20i-d1-system-control";

      reg = <0x3000000 0x1000>;

      ranges;

      #address-cells = <1>;

      #size-cells = <1>;



      regulators@3000150 {

        compatible = "allwinner,sun20i-d1-system-ldos";

        reg = <0x3000150 0x4>;



        reg_ldoa: ldoa {

          regulator-min-microvolt = <1800000>;

          regulator-max-microvolt = <1800000>;

        };



        reg_ldob: ldob {

          regulator-name = "vcc-dram";

          regulator-min-microvolt = <1500000>;

          regulator-max-microvolt = <1500000>;

        };

      };

    };

drivers/soc/sunxi/sunxi_sram.c

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct sunxi_sram_data { 
	u8			offset;

	u8			width;

	struct sunxi_sram_func	*func;

	struct list_head	list;

};



struct sunxi_sram_desc {
@@ -103,7 +102,6 @@ static const struct of_device_id sunxi_sram_dt_ids[] = { 
};



static struct device *sram_dev;

static LIST_HEAD(claimed_sram);

static DEFINE_SPINLOCK(sram_lock);

static void __iomem *base;