Skip to content

Commit 8013d1d

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: - A fix for a regression caused by the previous set of bugfixes changing tegra and at91 pinctrl properties. More work is needed to figure out what this should actually be, but a revert makes it work for the moment. - Defconfig regression fixes for tegra after renamed symbols - Build-time warning and static checker fixes for imx, op-tee, sunxi, meson, at91, and omap - More at91 DT fixes for audio, regulator and spi nodes - A regression fix for Renesas Hyperflash memory probe - A stability fix for amlogic boards, modifying the allowed cpufreq states - Multiple fixes for system suspend on omap2+ - DT fixes for various i.MX bugs - A probe error fix for imx6ull-colibri MMC - A MAINTAINERS file entry for samsung bug reports * tag 'soc-fixes-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits) Revert "arm: dts: at91: Fix boolean properties with values" bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() Revert "arm64: dts: tegra: Fix boolean properties with values" arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock ARM: dts: imx6ull-colibri: fix vqmmc regulator MAINTAINERS: add Bug entry for Samsung and memory controller drivers memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 ARM: dts: am3517-evm: Fix misc pinmuxing ARM: dts: am33xx-l4: Add missing touchscreen clock properties ARM: dts: Fix mmc order for omap3-gta04 ARM: dts: at91: fix pinctrl phandles ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name ARM: dts: at91: Describe regulators on at91sam9g20ek ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek ARM: dts: at91: Fix boolean properties with values ARM: dts: at91: use generic node name for dataflash ARM: dts: at91: align SPI NOR node name with dtschema ARM: dts: at91: sama7g5ek: Align the impedance of the QSPI0's HSIO and PCB lines ARM: dts: at91: sama7g5ek: enable pull-up on flexcom3 console lines ...
2 parents c0e6265 + adee8aa commit 8013d1d

68 files changed

Lines changed: 311 additions & 228 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/mfd/atmel-flexcom.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ flexcom@f8034000 {
5454
clock-names = "spi_clk";
5555
atmel,fifo-size = <32>;
5656

57-
mtd_dataflash@0 {
57+
flash@0 {
5858
compatible = "atmel,at25f512b";
5959
reg = <0>;
6060
spi-max-frequency = <20000000>;

‎MAINTAINERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2644,6 +2644,7 @@ L: linux-samsung-soc@vger.kernel.org
26442644
S: Maintained
26452645
C: irc://irc.libera.chat/linux-exynos
26462646
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
2647+
B: mailto:linux-samsung-soc@vger.kernel.org
26472648
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
26482649
F: Documentation/arm/samsung/
26492650
F: Documentation/devicetree/bindings/arm/samsung/
@@ -11973,6 +11974,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1197311974
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1197411975
L: linux-pm@vger.kernel.org
1197511976
S: Supported
11977+
B: mailto:linux-samsung-soc@vger.kernel.org
1197611978
F: Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
1197711979
F: Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
1197811980
F: drivers/power/supply/max14577_charger.c
@@ -11984,6 +11986,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1198411986
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1198511987
L: linux-kernel@vger.kernel.org
1198611988
S: Supported
11989+
B: mailto:linux-samsung-soc@vger.kernel.org
1198711990
F: Documentation/devicetree/bindings/*/maxim,max14577.yaml
1198811991
F: Documentation/devicetree/bindings/*/maxim,max77686.yaml
1198911992
F: Documentation/devicetree/bindings/*/maxim,max77693.yaml
@@ -12677,6 +12680,7 @@ MEMORY CONTROLLER DRIVERS
1267712680
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1267812681
L: linux-kernel@vger.kernel.org
1267912682
S: Maintained
12683+
B: mailto:krzysztof.kozlowski@linaro.org
1268012684
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
1268112685
F: Documentation/devicetree/bindings/memory-controllers/
1268212686
F: drivers/memory/
@@ -15611,6 +15615,7 @@ L: linux-samsung-soc@vger.kernel.org
1561115615
S: Maintained
1561215616
C: irc://irc.libera.chat/linux-exynos
1561315617
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
15618+
B: mailto:linux-samsung-soc@vger.kernel.org
1561415619
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
1561515620
F: Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
1561615621
F: drivers/pinctrl/samsung/
@@ -17327,6 +17332,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1732717332
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1732817333
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1732917334
S: Supported
17335+
B: mailto:linux-samsung-soc@vger.kernel.org
1733017336
F: Documentation/devicetree/bindings/sound/samsung*
1733117337
F: sound/soc/samsung/
1733217338

@@ -17371,6 +17377,7 @@ M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1737117377
L: linux-kernel@vger.kernel.org
1737217378
L: linux-samsung-soc@vger.kernel.org
1737317379
S: Supported
17380+
B: mailto:linux-samsung-soc@vger.kernel.org
1737417381
F: Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
1737517382
F: Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
1737617383
F: Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml

‎arch/arm/boot/dts/am33xx-l4.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@
263263
compatible = "ti,am3359-tscadc";
264264
reg = <0x0 0x1000>;
265265
interrupts = <16>;
266+
clocks = <&adc_tsc_fck>;
267+
clock-names = "fck";
266268
status = "disabled";
267269
dmas = <&edma 53 0>, <&edma 57 0>;
268270
dma-names = "fifo0", "fifo1";

‎arch/arm/boot/dts/am3517-evm.dts‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,18 @@
161161

162162
/* HS USB Host PHY on PORT 1 */
163163
hsusb1_phy: hsusb1_phy {
164+
pinctrl-names = "default";
165+
pinctrl-0 = <&hsusb1_rst_pins>;
164166
compatible = "usb-nop-xceiv";
165167
reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; /* gpio_57 */
166168
#phy-cells = <0>;
167169
};
168170
};
169171

170172
&davinci_emac {
171-
status = "okay";
173+
pinctrl-names = "default";
174+
pinctrl-0 = <&ethernet_pins>;
175+
status = "okay";
172176
};
173177

174178
&davinci_mdio {
@@ -193,6 +197,8 @@
193197
};
194198

195199
&i2c2 {
200+
pinctrl-names = "default";
201+
pinctrl-0 = <&i2c2_pins>;
196202
clock-frequency = <400000>;
197203
/* User DIP swithes [1:8] / User LEDS [1:2] */
198204
tca6416: gpio@21 {
@@ -205,6 +211,8 @@
205211
};
206212

207213
&i2c3 {
214+
pinctrl-names = "default";
215+
pinctrl-0 = <&i2c3_pins>;
208216
clock-frequency = <400000>;
209217
};
210218

@@ -223,6 +231,8 @@
223231
};
224232

225233
&usbhshost {
234+
pinctrl-names = "default";
235+
pinctrl-0 = <&hsusb1_pins>;
226236
port1-mode = "ehci-phy";
227237
};
228238

@@ -231,8 +241,35 @@
231241
};
232242

233243
&omap3_pmx_core {
234-
pinctrl-names = "default";
235-
pinctrl-0 = <&hsusb1_rst_pins>;
244+
245+
ethernet_pins: pinmux_ethernet_pins {
246+
pinctrl-single,pins = <
247+
OMAP3_CORE1_IOPAD(0x21fe, PIN_INPUT | MUX_MODE0) /* rmii_mdio_data */
248+
OMAP3_CORE1_IOPAD(0x2200, MUX_MODE0) /* rmii_mdio_clk */
249+
OMAP3_CORE1_IOPAD(0x2202, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd0 */
250+
OMAP3_CORE1_IOPAD(0x2204, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd1 */
251+
OMAP3_CORE1_IOPAD(0x2206, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_crs_dv */
252+
OMAP3_CORE1_IOPAD(0x2208, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_rxer */
253+
OMAP3_CORE1_IOPAD(0x220a, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd0 */
254+
OMAP3_CORE1_IOPAD(0x220c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd1 */
255+
OMAP3_CORE1_IOPAD(0x220e, PIN_OUTPUT_PULLDOWN |MUX_MODE0) /* rmii_txen */
256+
OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50mhz_clk */
257+
>;
258+
};
259+
260+
i2c2_pins: pinmux_i2c2_pins {
261+
pinctrl-single,pins = <
262+
OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */
263+
OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */
264+
>;
265+
};
266+
267+
i2c3_pins: pinmux_i2c3_pins {
268+
pinctrl-single,pins = <
269+
OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
270+
OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
271+
>;
272+
};
236273

237274
leds_pins: pinmux_leds_pins {
238275
pinctrl-single,pins = <
@@ -300,8 +337,6 @@
300337
};
301338

302339
&omap3_pmx_core2 {
303-
pinctrl-names = "default";
304-
pinctrl-0 = <&hsusb1_pins>;
305340

306341
hsusb1_pins: pinmux_hsusb1_pins {
307342
pinctrl-single,pins = <

‎arch/arm/boot/dts/am3517-som.dtsi‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
};
7070

7171
&i2c1 {
72+
pinctrl-names = "default";
73+
pinctrl-0 = <&i2c1_pins>;
7274
clock-frequency = <400000>;
7375

7476
s35390a: s35390a@30 {
@@ -179,6 +181,13 @@
179181

180182
&omap3_pmx_core {
181183

184+
i2c1_pins: pinmux_i2c1_pins {
185+
pinctrl-single,pins = <
186+
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
187+
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
188+
>;
189+
};
190+
182191
wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {
183192
pinctrl-single,pins = <
184193
OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4) /* mmc1_dat7.gpio_129 */

‎arch/arm/boot/dts/at91-dvk_su60_somc.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
status = "okay";
4545

4646
/* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */
47-
spi-flash@0 {
47+
flash@0 {
4848
compatible = "mxicy,mx25u4035", "jedec,spi-nor";
4949
spi-max-frequency = <33000000>;
5050
reg = <0>;

‎arch/arm/boot/dts/at91-kizbox3-hs.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
pinctrl_pio_io_reset: gpio_io_reset {
226226
pinmux = <PIN_PB30__GPIO>;
227227
bias-disable;
228-
drive-open-drain;
228+
drive-open-drain = <1>;
229229
output-low;
230230
};
231231
pinctrl_pio_input: gpio_input {

‎arch/arm/boot/dts/at91-kizbox3_common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
pinmux = <PIN_PD12__FLEXCOM4_IO0>, //DATA
212212
<PIN_PD13__FLEXCOM4_IO1>; //CLK
213213
bias-disable;
214-
drive-open-drain;
214+
drive-open-drain = <1>;
215215
};
216216

217217
pinctrl_pwm0 {

‎arch/arm/boot/dts/at91-q5xr5.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;
126126
status = "okay";
127127

128-
m25p80@0 {
128+
flash@0 {
129129
compatible = "jedec,spi-nor";
130130
spi-max-frequency = <20000000>;
131131
reg = <0>;

‎arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
pinctrl-0 = <&pinctrl_qspi1_default>;
215215
status = "disabled";
216216

217-
qspi1_flash: spi_flash@0 {
217+
qspi1_flash: flash@0 {
218218
#address-cells = <1>;
219219
#size-cells = <1>;
220220
compatible = "jedec,spi-nor";

0 commit comments

Comments
 (0)