Commit 678e14c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "The device tree changes this time are all for NXP i.MX platforms,
  addressing issues with clocks and regulators on i.MX7 and i.MX8.

  The old OMAP2 based Nokia N8x0 tablet get a couple of code fixes for
  regressions that came in.

  The ARM SCMI and FF-A firmware interfaces get a couple of minor bug
  fixes.

  A regression fix for RISC-V cache management addresses a problem with
  probe order on Sifive cores"

* tag 'soc-fixes-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits)
  MAINTAINERS: Change Krzysztof Kozlowski's email address
  arm64: dts: imx8qm-ss-dma: fix can lpcg indices
  arm64: dts: imx8-ss-dma: fix can lpcg indices
  arm64: dts: imx8-ss-dma: fix adc lpcg indices
  arm64: dts: imx8-ss-dma: fix pwm lpcg indices
  arm64: dts: imx8-ss-dma: fix spi lpcg indices
  arm64: dts: imx8-ss-conn: fix usb lpcg indices
  arm64: dts: imx8-ss-lsio: fix pwm lpcg indices
  ARM: dts: imx7s-warp: Pass OV2680 link-frequencies
  ARM: dts: imx7-mba7: Use 'no-mmc' property
  arm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order
  arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix USB vbus regulator
  arm64: dts: freescale: imx8mp-venice-gw72xx-2x: fix USB vbus regulator
  cache: sifive_ccache: Partially convert to a platform driver
  firmware: arm_scmi: Make raw debugfs entries non-seekable
  firmware: arm_scmi: Fix wrong fastchannel initialization
  firmware: arm_ffa: Fix the partition ID check in ffa_notification_info_get()
  ARM: OMAP2+: fix USB regression on Nokia N8x0
  mmc: omap: restore original power up/down steps
  mmc: omap: fix deferred probe
  ...
parents c7c4e130 011d79ef

MAINTAINERS

+19 −19
Original line number Diff line number Diff line
@@ -2707,7 +2707,7 @@ F: sound/soc/rockchip/ 
N:	rockchip









ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









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








@@ -5555,7 +5555,7 @@ F:	drivers/cpuidle/cpuidle-big_little.c







CPUIDLE DRIVER - ARM EXYNOS









M:	Daniel Lezcano <daniel.lezcano@linaro.org>









M:	Kukjin Kim <kgene@kernel.org>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









R:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-pm@vger.kernel.org









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









S:	Maintained








@@ -8994,7 +8994,7 @@ F:	drivers/i2c/muxes/i2c-mux-gpio.c







F:	include/linux/platform_data/i2c-mux-gpio.h

















GENERIC GPIO RESET DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









S:	Maintained









F:	drivers/reset/reset-gpio.c
















@@ -13289,7 +13289,7 @@ F:	drivers/iio/adc/max11205.c















MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS









R:	Iskren Chernev <iskren.chernev@gmail.com>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









R:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Marek Szyprowski <m.szyprowski@samsung.com>









R:	Matheus Castello <matheus@castello.eng.br>









L:	linux-pm@vger.kernel.org








@@ -13299,7 +13299,7 @@ F:	drivers/power/supply/max17040_battery.c















MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS









R:	Hans de Goede <hdegoede@redhat.com>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









R:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Marek Szyprowski <m.szyprowski@samsung.com>









R:	Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>









R:	Purism Kernel Team <kernel@puri.sm>








@@ -13357,7 +13357,7 @@ F:	Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml







F:	drivers/power/supply/max77976_charger.c

















MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









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








@@ -13368,7 +13368,7 @@ F:	drivers/power/supply/max77693_charger.c















MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS









M:	Chanwoo Choi <cw00.choi@samsung.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









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








@@ -14152,7 +14152,7 @@ F:	mm/mm_init.c







F:	tools/testing/memblock/

















MEMORY CONTROLLER DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









B:	mailto:krzysztof.kozlowski@linaro.org








@@ -15533,7 +15533,7 @@ F:	include/uapi/linux/nexthop.h







F:	net/ipv4/nexthop.c

















NFC SUBSYSTEM









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/nfc/








@@ -15910,7 +15910,7 @@ F:	Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml







F:	drivers/regulator/pf8x00-regulator.c

















NXP PTN5150A CC LOGIC AND EXTCON DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml








@@ -16521,7 +16521,7 @@ K:	of_overlay_remove















OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS









M:	Rob Herring <robh@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>









M:	Krzysztof Kozlowski <krzk+dt@kernel.org>









M:	Conor Dooley <conor+dt@kernel.org>









L:	devicetree@vger.kernel.org









S:	Maintained








@@ -17478,7 +17478,7 @@ F:	Documentation/devicetree/bindings/pinctrl/renesas,*







F:	drivers/pinctrl/renesas/

















PIN CONTROLLER - SAMSUNG









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -19446,7 +19446,7 @@ F:	Documentation/devicetree/bindings/sound/samsung*







F:	sound/soc/samsung/

















SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-crypto@vger.kernel.org









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









S:	Maintained








@@ -19481,7 +19481,7 @@ S:	Maintained







F:	drivers/platform/x86/samsung-laptop.c

















SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









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









S:	Maintained








@@ -19507,7 +19507,7 @@ F:	drivers/media/platform/samsung/s3c-camif/







F:	include/media/drv-intf/s3c_camif.h

















SAMSUNG S3FWRN5 NFC DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









S:	Maintained









F:	Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml









F:	drivers/nfc/s3fwrn5








@@ -19528,7 +19528,7 @@ S:	Supported







F:	drivers/media/i2c/s5k5baf.c

















SAMSUNG S5P Security SubSystem (SSS) DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Vladimir Zapolskiy <vz@mleia.com>









L:	linux-crypto@vger.kernel.org









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








@@ -19550,7 +19550,7 @@ F:	Documentation/devicetree/bindings/media/samsung,fimc.yaml







F:	drivers/media/platform/samsung/exynos4-is/

















SAMSUNG SOC CLOCK DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









M:	Chanwoo Choi <cw00.choi@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>








@@ -19582,7 +19582,7 @@ F:	drivers/net/ethernet/samsung/sxgbe/















SAMSUNG THERMAL DRIVER









M:	Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-pm@vger.kernel.org









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









S:	Maintained








@@ -23779,7 +23779,7 @@ S:	Orphan







F:	drivers/mmc/host/vub300.c

















W1 DALLAS'S 1-WIRE BUS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









S:	Maintained









F:	Documentation/devicetree/bindings/w1/









F:	Documentation/w1/

























arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -666,7 +666,7 @@ &usdhc1 {







	bus-width = <4>;









	no-1-8-v;









	no-sdio;









	no-emmc;









	no-mmc;









	status = "okay";









};










































arch/arm/boot/dts/nxp/imx/imx7s-warp.dts



+1
−0






























Original line number
Diff line number
Diff line







@@ -210,6 +210,7 @@ ov2680_to_mipi: endpoint {







				remote-endpoint = <&mipi_from_sensor>;









				clock-lanes = <0>;









				data-lanes = <1>;









				link-frequencies = /bits/ 64 <330000000>;









			};









		};









	};
































arch/arm/mach-omap2/board-n8x0.c



+10
−13






























Original line number
Diff line number
Diff line







@@ -79,10 +79,8 @@ static struct musb_hdrc_platform_data tusb_data = {







static struct gpiod_lookup_table tusb_gpio_table = {









	.dev_id = "musb-tusb",









	.table = {









		GPIO_LOOKUP("gpio-0-15", 0, "enable",









			    GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP("gpio-48-63", 10, "int",









			    GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP("gpio-0-31", 0, "enable", GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP("gpio-32-63", 26, "int", GPIO_ACTIVE_HIGH),









		{ }









	},









};








@@ -140,12 +138,11 @@ static int slot1_cover_open;







static int slot2_cover_open;









static struct device *mmc_device;



















static struct gpiod_lookup_table nokia8xx_mmc_gpio_table = {









static struct gpiod_lookup_table nokia800_mmc_gpio_table = {









	.dev_id = "mmci-omap.0",









	.table = {









		/* Slot switch, GPIO 96 */









		GPIO_LOOKUP("gpio-80-111", 16,









			    "switch", GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP("gpio-96-127", 0, "switch", GPIO_ACTIVE_HIGH),









		{ }









	},









};








@@ -153,12 +150,12 @@ static struct gpiod_lookup_table nokia8xx_mmc_gpio_table = {







static struct gpiod_lookup_table nokia810_mmc_gpio_table = {









	.dev_id = "mmci-omap.0",









	.table = {









		/* Slot switch, GPIO 96 */









		GPIO_LOOKUP("gpio-96-127", 0, "switch", GPIO_ACTIVE_HIGH),









		/* Slot index 1, VSD power, GPIO 23 */









		GPIO_LOOKUP_IDX("gpio-16-31", 7,









				"vsd", 1, GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP_IDX("gpio-0-31", 23, "vsd", 1, GPIO_ACTIVE_HIGH),









		/* Slot index 1, VIO power, GPIO 9 */









		GPIO_LOOKUP_IDX("gpio-0-15", 9,









				"vio", 1, GPIO_ACTIVE_HIGH),









		GPIO_LOOKUP_IDX("gpio-0-31", 9, "vio", 1, GPIO_ACTIVE_HIGH),









		{ }









	},









};








@@ -415,8 +412,6 @@ static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];

















static void __init n8x0_mmc_init(void)









{









	gpiod_add_lookup_table(&nokia8xx_mmc_gpio_table);



















	if (board_is_n810()) {









		mmc1_data.slots[0].name = "external";


















@@ -429,6 +424,8 @@ static void __init n8x0_mmc_init(void)







		mmc1_data.slots[1].name = "internal";









		mmc1_data.slots[1].ban_openended = 1;









		gpiod_add_lookup_table(&nokia810_mmc_gpio_table);









	} else {









		gpiod_add_lookup_table(&nokia800_mmc_gpio_table);









	}



















	mmc1_data.nr_slots = 2;
































arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi



+8
−8






























Original line number
Diff line number
Diff line







@@ -41,7 +41,7 @@ usbotg1: usb@5b0d0000 {







		interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;









		fsl,usbphy = <&usbphy1>;









		fsl,usbmisc = <&usbmisc1 0>;









		clocks = <&usb2_lpcg 0>;









		clocks = <&usb2_lpcg IMX_LPCG_CLK_6>;









		ahb-burst-config = <0x0>;









		tx-burst-size-dword = <0x10>;









		rx-burst-size-dword = <0x10>;








@@ -58,7 +58,7 @@ usbmisc1: usbmisc@5b0d0200 {







	usbphy1: usbphy@5b100000 {









		compatible = "fsl,imx7ulp-usbphy";









		reg = <0x5b100000 0x1000>;









		clocks = <&usb2_lpcg 1>;









		clocks = <&usb2_lpcg IMX_LPCG_CLK_7>;









		power-domains = <&pd IMX_SC_R_USB_0_PHY>;









		status = "disabled";









	};








@@ -67,8 +67,8 @@ usdhc1: mmc@5b010000 {







		interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;









		reg = <0x5b010000 0x10000>;









		clocks = <&sdhc0_lpcg IMX_LPCG_CLK_4>,









			 <&sdhc0_lpcg IMX_LPCG_CLK_0>,









			 <&sdhc0_lpcg IMX_LPCG_CLK_5>;









			 <&sdhc0_lpcg IMX_LPCG_CLK_5>,









			 <&sdhc0_lpcg IMX_LPCG_CLK_0>;









		clock-names = "ipg", "ahb", "per";









		power-domains = <&pd IMX_SC_R_SDHC_0>;









		status = "disabled";








@@ -78,8 +78,8 @@ usdhc2: mmc@5b020000 {







		interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;









		reg = <0x5b020000 0x10000>;









		clocks = <&sdhc1_lpcg IMX_LPCG_CLK_4>,









			 <&sdhc1_lpcg IMX_LPCG_CLK_0>,









			 <&sdhc1_lpcg IMX_LPCG_CLK_5>;









			 <&sdhc1_lpcg IMX_LPCG_CLK_5>,









			 <&sdhc1_lpcg IMX_LPCG_CLK_0>;









		clock-names = "ipg", "ahb", "per";









		power-domains = <&pd IMX_SC_R_SDHC_1>;









		fsl,tuning-start-tap = <20>;








@@ -91,8 +91,8 @@ usdhc3: mmc@5b030000 {







		interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;









		reg = <0x5b030000 0x10000>;









		clocks = <&sdhc2_lpcg IMX_LPCG_CLK_4>,









			 <&sdhc2_lpcg IMX_LPCG_CLK_0>,









			 <&sdhc2_lpcg IMX_LPCG_CLK_5>;









			 <&sdhc2_lpcg IMX_LPCG_CLK_5>,









			 <&sdhc2_lpcg IMX_LPCG_CLK_0>;









		clock-names = "ipg", "ahb", "per";









		power-domains = <&pd IMX_SC_R_SDHC_2>;









		status = "disabled";