Skip to content

Commit c307e9c

Browse files
committed
Merge tag 'nuvoton-arm-6.16-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
Nuvoton ARM devicetree updates for v6.16 - MMC, OHCI, UDC and EDAC blocks added to the NPCM7XX DTSI - Fixes for GPIO hog names in the NPCM730 and RunBMC Olympus platforms * tag 'nuvoton-arm-6.16-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: ARM: dts: nuvoton: Add MMC Nodes ARM: dts: nuvoton: Add OHCI node ARM: dts: nuvoton: Add UDC nodes ARM: dts: nuvoton: Add EDAC node ARM: dts: nuvoton: Align GPIO hog name with bindings Link: https://lore.kernel.org/r/CACPK8Xe=f_hNNWUGL670x4-OeKgDB+2P+mxp5BaTLW==T5jE_A@mail.gmail.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7e1a0df + 7efb8b9 commit c307e9c

File tree

4 files changed

+239
-66
lines changed

4 files changed

+239
-66
lines changed

arch/arm/boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
};
100100
};
101101

102+
udc0_phy: usb-phy {
103+
compatible = "usb-nop-xceiv";
104+
#phy-cells = <0>;
105+
};
106+
102107
ahb {
103108
#address-cells = <1>;
104109
#size-cells = <1>;
@@ -122,6 +127,13 @@
122127
clocks = <&clk_refclk>, <&clk_sysbypck>, <&clk_mcbypck>;
123128
};
124129

130+
mc: memory-controller@f0824000 {
131+
compatible = "nuvoton,npcm750-memory-controller";
132+
reg = <0xf0824000 0x1000>;
133+
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
134+
status = "disabled";
135+
};
136+
125137
gmac0: eth@f0802000 {
126138
device_type = "network";
127139
compatible = "snps,dwmac";
@@ -137,13 +149,43 @@
137149
status = "disabled";
138150
};
139151

152+
sdmmc: mmc@f0842000 {
153+
compatible = "nuvoton,npcm750-sdhci";
154+
status = "disabled";
155+
reg = <0xf0842000 0x200>;
156+
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
157+
clocks = <&clk NPCM7XX_CLK_AHB>;
158+
clock-names = "clk_mmc";
159+
pinctrl-names = "default";
160+
pinctrl-0 = <&mmc8_pins
161+
&mmc_pins>;
162+
};
163+
164+
sdhci: mmc@f0840000 {
165+
compatible = "nuvoton,npcm750-sdhci";
166+
status = "disabled";
167+
reg = <0xf0840000 0x200>;
168+
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
169+
clocks = <&clk NPCM7XX_CLK_AHB>;
170+
clock-names = "clk_sdhc";
171+
pinctrl-names = "default";
172+
pinctrl-0 = <&sd1_pins>;
173+
};
174+
140175
ehci1: usb@f0806000 {
141176
compatible = "nuvoton,npcm750-ehci";
142177
reg = <0xf0806000 0x1000>;
143178
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
144179
status = "disabled";
145180
};
146181

182+
ohci1: usb@f0807000 {
183+
compatible = "generic-ohci";
184+
reg = <0xf0807000 0x1000>;
185+
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
186+
status = "disabled";
187+
};
188+
147189
fiu0: spi@fb000000 {
148190
compatible = "nuvoton,npcm750-fiu";
149191
#address-cells = <1>;
@@ -179,6 +221,72 @@
179221
status = "disabled";
180222
};
181223

224+
udc5: usb@f0835000 {
225+
compatible = "nuvoton,npcm750-udc";
226+
reg = <0xf0835000 0x1000
227+
0xfffd2800 0x800>;
228+
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
229+
clocks = <&clk NPCM7XX_CLK_SU>;
230+
clock-names = "clk_usb_bridge";
231+
phys = <&udc0_phy>;
232+
phy_type = "utmi_wide";
233+
dr_mode = "peripheral";
234+
status = "disabled";
235+
};
236+
237+
udc6: usb@f0836000 {
238+
compatible = "nuvoton,npcm750-udc";
239+
reg = <0xf0836000 0x1000
240+
0xfffd3000 0x800>;
241+
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
242+
clocks = <&clk NPCM7XX_CLK_SU>;
243+
clock-names = "clk_usb_bridge";
244+
phys = <&udc0_phy>;
245+
phy_type = "utmi_wide";
246+
dr_mode = "peripheral";
247+
status = "disabled";
248+
};
249+
250+
udc7: usb@f0837000 {
251+
compatible = "nuvoton,npcm750-udc";
252+
reg = <0xf0837000 0x1000
253+
0xfffd3800 0x800>;
254+
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
255+
clocks = <&clk NPCM7XX_CLK_SU>;
256+
clock-names = "clk_usb_bridge";
257+
phys = <&udc0_phy>;
258+
phy_type = "utmi_wide";
259+
dr_mode = "peripheral";
260+
status = "disabled";
261+
};
262+
263+
udc8: usb@f0838000 {
264+
compatible = "nuvoton,npcm750-udc";
265+
reg = <0xf0838000 0x1000
266+
0xfffd4000 0x800>;
267+
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
268+
clocks = <&clk NPCM7XX_CLK_SU>;
269+
clock-names = "clk_usb_bridge";
270+
phys = <&udc0_phy>;
271+
phy_type = "utmi_wide";
272+
dr_mode = "peripheral";
273+
status = "disabled";
274+
};
275+
276+
udc9: usb@f0839000 {
277+
compatible = "nuvoton,npcm750-udc";
278+
reg = <0xf0839000 0x1000
279+
0xfffd4800 0x800>;
280+
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
281+
clocks = <&clk NPCM7XX_CLK_SU>;
282+
clock-names = "clk_usb_bridge";
283+
nuvoton,sysgcr = <&gcr>;
284+
phys = <&udc0_phy>;
285+
phy_type = "utmi_wide";
286+
dr_mode = "peripheral";
287+
status = "disabled";
288+
};
289+
182290
apb {
183291
#address-cells = <1>;
184292
#size-cells = <1>;

arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,39 +1050,39 @@
10501050
"","","","SIO_POWER_GOOD","","","","";
10511051
};
10521052
gpio2: gpio@f0012000 {
1053-
bmc_usb_mux_oe_n {
1053+
bmc-usb-mux-oe-n-hog {
10541054
gpio-hog;
10551055
gpios = <25 GPIO_ACTIVE_HIGH>;
10561056
output-low;
10571057
line-name = "bmc-usb-mux-oe-n";
10581058
};
1059-
bmc_usb_mux_sel {
1059+
bmc-usb-mux-sel-hog {
10601060
gpio-hog;
10611061
gpios = <26 GPIO_ACTIVE_HIGH>;
10621062
output-low;
10631063
line-name = "bmc-usb-mux-sel";
10641064
};
1065-
bmc_usb2517_reset_n {
1065+
bmc-usb2517-reset-n-hog {
10661066
gpio-hog;
10671067
gpios = <27 GPIO_ACTIVE_LOW>;
10681068
output-low;
10691069
line-name = "bmc-usb2517-reset-n";
10701070
};
10711071
};
10721072
gpio3: gpio@f0013000 {
1073-
assert_cpu0_reset {
1073+
assert-cpu0-reset-hog {
10741074
gpio-hog;
10751075
gpios = <14 GPIO_ACTIVE_HIGH>;
10761076
output-low;
10771077
line-name = "assert-cpu0-reset";
10781078
};
1079-
assert_pwrok_cpu0_n {
1079+
assert-pwrok-cpu0-n-hog {
10801080
gpio-hog;
10811081
gpios = <15 GPIO_ACTIVE_HIGH>;
10821082
output-low;
10831083
line-name = "assert-pwrok-cpu0-n";
10841084
};
1085-
assert_cpu0_prochot {
1085+
assert-cpu0-prochot-hog {
10861086
gpio-hog;
10871087
gpios = <16 GPIO_ACTIVE_HIGH>;
10881088
output-low;

0 commit comments

Comments
 (0)