Skip to content

Commit 097d419

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 2bb1acc + 3a6fb90 commit 097d419

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ properties:
5656
ranges: true
5757

5858
patternProperties:
59+
"^regulators@[0-9a-f]+$":
60+
$ref: /schemas/regulator/allwinner,sun20i-d1-system-ldos.yaml#
61+
5962
"^sram@[a-f0-9]+":
6063
$ref: /schemas/sram/sram.yaml#
6164
unevaluatedProperties: false
@@ -130,3 +133,28 @@ examples:
130133
};
131134
};
132135
};
136+
137+
- |
138+
syscon@3000000 {
139+
compatible = "allwinner,sun20i-d1-system-control";
140+
reg = <0x3000000 0x1000>;
141+
ranges;
142+
#address-cells = <1>;
143+
#size-cells = <1>;
144+
145+
regulators@3000150 {
146+
compatible = "allwinner,sun20i-d1-system-ldos";
147+
reg = <0x3000150 0x4>;
148+
149+
reg_ldoa: ldoa {
150+
regulator-min-microvolt = <1800000>;
151+
regulator-max-microvolt = <1800000>;
152+
};
153+
154+
reg_ldob: ldob {
155+
regulator-name = "vcc-dram";
156+
regulator-min-microvolt = <1500000>;
157+
regulator-max-microvolt = <1500000>;
158+
};
159+
};
160+
};

drivers/soc/sunxi/sunxi_sram.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ struct sunxi_sram_data {
3333
u8 offset;
3434
u8 width;
3535
struct sunxi_sram_func *func;
36-
struct list_head list;
3736
};
3837

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

105104
static struct device *sram_dev;
106-
static LIST_HEAD(claimed_sram);
107105
static DEFINE_SPINLOCK(sram_lock);
108106
static void __iomem *base;
109107

0 commit comments

Comments
 (0)