Skip to content

Commit 0bb43ae

Browse files
torvaldstorvalds
committed
Merge tag 'riscv-for-linus-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt: - A handful of DT updates for the SiFive HiFive Unmatched, that fix the regulator handling. These should stop some warning spew. - A pair of fixes for both the SiFive Hifive Unleashed and Unmatched, that correctly hook up the MMC card detect signal. * tag 'riscv-for-linus-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: dts: sifive unmatched: Link the tmp451 with its power supply riscv: dts: sifive unmatched: Fix regulator for board rev3 riscv: dts: sifive unmatched: Expose the PMIC sub-functions riscv: dts: sifive unmatched: Expose the board ID eeprom riscv: dts: sifive unmatched: Name gpio lines riscv: dts: unmatched: Add gpio card detect to mmc-spi-slot riscv: dts: unleashed: Add gpio card detect to mmc-spi-slot
2 parents fa09ca5 + f6f7fbb commit 0bb43ae

File tree

2 files changed

+54
-60
lines changed

2 files changed

+54
-60
lines changed

‎arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
spi-max-frequency = <20000000>;
7777
voltage-ranges = <3300 3300>;
7878
disable-wp;
79+
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
7980
};
8081
};
8182

‎arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts‎

Lines changed: 53 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Copyright (c) 2020 SiFive, Inc */
33

44
#include "fu740-c000.dtsi"
5+
#include <dt-bindings/gpio/gpio.h>
56
#include <dt-bindings/interrupt-controller/irq.h>
67

78
/* Clock frequency (in Hz) of the PCB crystal for rtcclk */
@@ -54,59 +55,66 @@
5455
temperature-sensor@4c {
5556
compatible = "ti,tmp451";
5657
reg = <0x4c>;
58+
vcc-supply = <&vdd_bpro>;
5759
interrupt-parent = <&gpio>;
5860
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
5961
};
6062

63+
eeprom@54 {
64+
compatible = "microchip,24c02", "atmel,24c02";
65+
reg = <0x54>;
66+
vcc-supply = <&vdd_bpro>;
67+
label = "board-id";
68+
pagesize = <16>;
69+
read-only;
70+
size = <256>;
71+
};
72+
6173
pmic@58 {
6274
compatible = "dlg,da9063";
6375
reg = <0x58>;
6476
interrupt-parent = <&gpio>;
6577
interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
6678
interrupt-controller;
6779

68-
regulators {
69-
vdd_bcore1: bcore1 {
70-
regulator-min-microvolt = <900000>;
71-
regulator-max-microvolt = <900000>;
72-
regulator-min-microamp = <5000000>;
73-
regulator-max-microamp = <5000000>;
74-
regulator-always-on;
75-
};
80+
onkey {
81+
compatible = "dlg,da9063-onkey";
82+
};
7683

77-
vdd_bcore2: bcore2 {
78-
regulator-min-microvolt = <900000>;
79-
regulator-max-microvolt = <900000>;
80-
regulator-min-microamp = <5000000>;
81-
regulator-max-microamp = <5000000>;
84+
rtc {
85+
compatible = "dlg,da9063-rtc";
86+
};
87+
88+
wdt {
89+
compatible = "dlg,da9063-watchdog";
90+
};
91+
92+
regulators {
93+
vdd_bcore: bcores-merged {
94+
regulator-min-microvolt = <1050000>;
95+
regulator-max-microvolt = <1050000>;
96+
regulator-min-microamp = <4800000>;
97+
regulator-max-microamp = <4800000>;
8298
regulator-always-on;
8399
};
84100

85101
vdd_bpro: bpro {
86102
regulator-min-microvolt = <1800000>;
87103
regulator-max-microvolt = <1800000>;
88-
regulator-min-microamp = <2500000>;
89-
regulator-max-microamp = <2500000>;
104+
regulator-min-microamp = <2400000>;
105+
regulator-max-microamp = <2400000>;
90106
regulator-always-on;
91107
};
92108

93109
vdd_bperi: bperi {
94-
regulator-min-microvolt = <1050000>;
95-
regulator-max-microvolt = <1050000>;
110+
regulator-min-microvolt = <1060000>;
111+
regulator-max-microvolt = <1060000>;
96112
regulator-min-microamp = <1500000>;
97113
regulator-max-microamp = <1500000>;
98114
regulator-always-on;
99115
};
100116

101-
vdd_bmem: bmem {
102-
regulator-min-microvolt = <1200000>;
103-
regulator-max-microvolt = <1200000>;
104-
regulator-min-microamp = <3000000>;
105-
regulator-max-microamp = <3000000>;
106-
regulator-always-on;
107-
};
108-
109-
vdd_bio: bio {
117+
vdd_bmem_bio: bmem-bio-merged {
110118
regulator-min-microvolt = <1200000>;
111119
regulator-max-microvolt = <1200000>;
112120
regulator-min-microamp = <3000000>;
@@ -117,86 +125,66 @@
117125
vdd_ldo1: ldo1 {
118126
regulator-min-microvolt = <1800000>;
119127
regulator-max-microvolt = <1800000>;
120-
regulator-min-microamp = <100000>;
121-
regulator-max-microamp = <100000>;
122128
regulator-always-on;
123129
};
124130

125131
vdd_ldo2: ldo2 {
126132
regulator-min-microvolt = <1800000>;
127133
regulator-max-microvolt = <1800000>;
128-
regulator-min-microamp = <200000>;
129-
regulator-max-microamp = <200000>;
130134
regulator-always-on;
131135
};
132136

133137
vdd_ldo3: ldo3 {
134-
regulator-min-microvolt = <1800000>;
135-
regulator-max-microvolt = <1800000>;
136-
regulator-min-microamp = <200000>;
137-
regulator-max-microamp = <200000>;
138+
regulator-min-microvolt = <3300000>;
139+
regulator-max-microvolt = <3300000>;
138140
regulator-always-on;
139141
};
140142

141143
vdd_ldo4: ldo4 {
142-
regulator-min-microvolt = <1800000>;
143-
regulator-max-microvolt = <1800000>;
144-
regulator-min-microamp = <200000>;
145-
regulator-max-microamp = <200000>;
144+
regulator-min-microvolt = <2500000>;
145+
regulator-max-microvolt = <2500000>;
146146
regulator-always-on;
147147
};
148148

149149
vdd_ldo5: ldo5 {
150-
regulator-min-microvolt = <1800000>;
151-
regulator-max-microvolt = <1800000>;
152-
regulator-min-microamp = <100000>;
153-
regulator-max-microamp = <100000>;
150+
regulator-min-microvolt = <3300000>;
151+
regulator-max-microvolt = <3300000>;
154152
regulator-always-on;
155153
};
156154

157155
vdd_ldo6: ldo6 {
158-
regulator-min-microvolt = <3300000>;
159-
regulator-max-microvolt = <3300000>;
160-
regulator-min-microamp = <200000>;
161-
regulator-max-microamp = <200000>;
156+
regulator-min-microvolt = <1800000>;
157+
regulator-max-microvolt = <1800000>;
162158
regulator-always-on;
163159
};
164160

165161
vdd_ldo7: ldo7 {
166-
regulator-min-microvolt = <1800000>;
167-
regulator-max-microvolt = <1800000>;
168-
regulator-min-microamp = <200000>;
169-
regulator-max-microamp = <200000>;
162+
regulator-min-microvolt = <3300000>;
163+
regulator-max-microvolt = <3300000>;
170164
regulator-always-on;
171165
};
172166

173167
vdd_ldo8: ldo8 {
174-
regulator-min-microvolt = <1800000>;
175-
regulator-max-microvolt = <1800000>;
176-
regulator-min-microamp = <200000>;
177-
regulator-max-microamp = <200000>;
168+
regulator-min-microvolt = <3300000>;
169+
regulator-max-microvolt = <3300000>;
178170
regulator-always-on;
179171
};
180172

181173
vdd_ld09: ldo9 {
182174
regulator-min-microvolt = <1050000>;
183175
regulator-max-microvolt = <1050000>;
184-
regulator-min-microamp = <200000>;
185-
regulator-max-microamp = <200000>;
176+
regulator-always-on;
186177
};
187178

188179
vdd_ldo10: ldo10 {
189180
regulator-min-microvolt = <1000000>;
190181
regulator-max-microvolt = <1000000>;
191-
regulator-min-microamp = <300000>;
192-
regulator-max-microamp = <300000>;
182+
regulator-always-on;
193183
};
194184

195185
vdd_ldo11: ldo11 {
196186
regulator-min-microvolt = <2500000>;
197187
regulator-max-microvolt = <2500000>;
198-
regulator-min-microamp = <300000>;
199-
regulator-max-microamp = <300000>;
200188
regulator-always-on;
201189
};
202190
};
@@ -223,6 +211,7 @@
223211
spi-max-frequency = <20000000>;
224212
voltage-ranges = <3300 3300>;
225213
disable-wp;
214+
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
226215
};
227216
};
228217

@@ -245,4 +234,8 @@
245234

246235
&gpio {
247236
status = "okay";
237+
gpio-line-names = "J29.1", "PMICNTB", "PMICSHDN", "J8.1", "J8.3",
238+
"PCIe_PWREN", "THERM", "UBRDG_RSTN", "PCIe_PERSTN",
239+
"ULPI_RSTN", "J8.2", "UHUB_RSTN", "GEMGXL_RST", "J8.4",
240+
"EN_VDD_SD", "SD_CD";
248241
};

0 commit comments

Comments
 (0)