Commit 8013d1d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents c0e6265e adee8aa2

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ flexcom@f8034000 { 
		clock-names = "spi_clk";

		atmel,fifo-size = <32>;



		mtd_dataflash@0 {

		flash@0 {

			compatible = "atmel,at25f512b";

			reg = <0>;

			spi-max-frequency = <20000000>;

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2644,6 +2644,7 @@ L: linux-samsung-soc@vger.kernel.org 
S:	Maintained

C:	irc://irc.libera.chat/linux-exynos

Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/

B:	mailto:linux-samsung-soc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git

F:	Documentation/arm/samsung/

F:	Documentation/devicetree/bindings/arm/samsung/
@@ -11973,6 +11974,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-pm@vger.kernel.org

S:	Supported

B:	mailto:linux-samsung-soc@vger.kernel.org

F:	Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml

F:	Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml

F:	drivers/power/supply/max14577_charger.c
@@ -11984,6 +11986,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

B:	mailto:linux-samsung-soc@vger.kernel.org

F:	Documentation/devicetree/bindings/*/maxim,max14577.yaml

F:	Documentation/devicetree/bindings/*/maxim,max77686.yaml

F:	Documentation/devicetree/bindings/*/maxim,max77693.yaml
@@ -12677,6 +12680,7 @@ MEMORY CONTROLLER DRIVERS 
M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

B:	mailto:krzysztof.kozlowski@linaro.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git

F:	Documentation/devicetree/bindings/memory-controllers/

F:	drivers/memory/
@@ -15611,6 +15615,7 @@ L: linux-samsung-soc@vger.kernel.org 
S:	Maintained

C:	irc://irc.libera.chat/linux-exynos

Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/

B:	mailto:linux-samsung-soc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git

F:	Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml

F:	drivers/pinctrl/samsung/
@@ -17327,6 +17332,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

B:	mailto:linux-samsung-soc@vger.kernel.org

F:	Documentation/devicetree/bindings/sound/samsung*

F:	sound/soc/samsung/








@@ -17371,6 +17377,7 @@ M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>







L:	linux-kernel@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









B:	mailto:linux-samsung-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml









F:	Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml









F:	Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml

























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



+2
−0






























Original line number
Diff line number
Diff line







@@ -263,6 +263,8 @@







				compatible = "ti,am3359-tscadc";









				reg = <0x0 0x1000>;









				interrupts = <16>;









				clocks = <&adc_tsc_fck>;









				clock-names = "fck";









				status = "disabled";









				dmas = <&edma 53 0>, <&edma 57 0>;









				dma-names = "fifo0", "fifo1";
































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



+40
−5






























Original line number
Diff line number
Diff line







@@ -161,6 +161,8 @@

















	/* HS USB Host PHY on PORT 1 */









	hsusb1_phy: hsusb1_phy {









		pinctrl-names = "default";









		pinctrl-0 = <&hsusb1_rst_pins>;









		compatible = "usb-nop-xceiv";









		reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; /* gpio_57 */









		#phy-cells = <0>;








@@ -168,6 +170,8 @@







};



















&davinci_emac {









	pinctrl-names = "default";









	pinctrl-0 = <&ethernet_pins>;









	status = "okay";









};


















@@ -193,6 +197,8 @@







};



















&i2c2 {









	pinctrl-names = "default";









	pinctrl-0 = <&i2c2_pins>;









	clock-frequency = <400000>;









	/* User DIP swithes [1:8] / User LEDS [1:2] */









	tca6416: gpio@21 {








@@ -205,6 +211,8 @@







};



















&i2c3 {









	pinctrl-names = "default";









	pinctrl-0 = <&i2c3_pins>;









	clock-frequency = <400000>;









};


















@@ -223,6 +231,8 @@







};



















&usbhshost {









	pinctrl-names = "default";









	pinctrl-0 = <&hsusb1_pins>;









	port1-mode = "ehci-phy";









};


















@@ -231,8 +241,35 @@







};



















&omap3_pmx_core {









	pinctrl-names = "default";









	pinctrl-0 = <&hsusb1_rst_pins>;



















	ethernet_pins: pinmux_ethernet_pins {









		pinctrl-single,pins = <









			OMAP3_CORE1_IOPAD(0x21fe, PIN_INPUT | MUX_MODE0) /* rmii_mdio_data */









			OMAP3_CORE1_IOPAD(0x2200, MUX_MODE0) /* rmii_mdio_clk */









			OMAP3_CORE1_IOPAD(0x2202, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd0 */









			OMAP3_CORE1_IOPAD(0x2204, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd1 */









			OMAP3_CORE1_IOPAD(0x2206, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_crs_dv */









			OMAP3_CORE1_IOPAD(0x2208, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_rxer */









			OMAP3_CORE1_IOPAD(0x220a, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd0 */









			OMAP3_CORE1_IOPAD(0x220c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd1 */









			OMAP3_CORE1_IOPAD(0x220e, PIN_OUTPUT_PULLDOWN |MUX_MODE0) /* rmii_txen */









			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50mhz_clk */









		>;









	};



















	i2c2_pins: pinmux_i2c2_pins {









		pinctrl-single,pins = <









			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_scl */









			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_sda */









		>;









	};



















	i2c3_pins: pinmux_i2c3_pins {









		pinctrl-single,pins = <









			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_scl */









			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_sda */









		>;









	};



















	leds_pins: pinmux_leds_pins {









		pinctrl-single,pins = <








@@ -300,8 +337,6 @@







};



















&omap3_pmx_core2 {









	pinctrl-names = "default";









	pinctrl-0 = <&hsusb1_pins>;



















	hsusb1_pins: pinmux_hsusb1_pins {









		pinctrl-single,pins = <
































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



+9
−0






























Original line number
Diff line number
Diff line







@@ -69,6 +69,8 @@







};



















&i2c1 {









	pinctrl-names = "default";









	pinctrl-0 = <&i2c1_pins>;









	clock-frequency = <400000>;



















	s35390a: s35390a@30 {








@@ -179,6 +181,13 @@

















&omap3_pmx_core {



















	i2c1_pins: pinmux_i2c1_pins {









		pinctrl-single,pins = <









			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_scl */









			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_sda */









		>;









	};



















	wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {









		pinctrl-single,pins = <









			OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4)  /* mmc1_dat7.gpio_129 */