Commit 0f135d3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are three sets of patches for the soc tree:

   - Marek Behún addresses multiple build time regressions caused by
     changes to the cznic turris-omnia support

   - Dmitry Torokhov fixes a regression in the legacy "gumstix" board
     code he cleaned up earlier

   - The TI K3 maintainers found multiple bugs in the in gpio, audio and
     pcie devicetree nodes"

* tag 'arm-fixes-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: pxa/gumstix: fix attaching properties to vbus gpio device
  doc: platform: cznic: turris-omnia-mcu: Use double backticks for attribute value
  doc: platform: cznic: turris-omnia-mcu: Fix sphinx-build warning
  platform: cznic: turris-omnia-mcu: Make GPIO code optional
  platform: cznic: turris-omnia-mcu: Make poweroff and wakeup code optional
  platform: cznic: turris-omnia-mcu: Make TRNG code optional
  platform: cznic: turris-omnia-mcu: Make watchdog code optional
  arm64: dts: ti: k3-j784s4-main: Correct McASP DMAs
  arm64: dts: ti: k3-j722s: Fix gpio-range for main_pmx0
  arm64: dts: ti: k3-am62p: Fix gpio-range for main_pmx0
  arm64: dts: ti: k3-am62p: Add gpio-ranges for mcu_gpio0
  arm64: dts: ti: k3-am62-verdin-dahlia: Keep CTRL_SLEEP_MOCI# regulator on
  arm64: dts: ti: k3-j784s4-evm: Consolidate serdes0 references
  arm64: dts: ti: k3-j784s4-evm: Assign only lanes 0 and 1 to PCIe1
parents 146430a0 6b1124c4

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be 
		interrupt.



		This file switches between these two modes:

		- "mcu" makes the button press event be handled by the MCU to

		 - ``mcu`` makes the button press event be handled by the MCU to

		   change the LEDs panel intensity.

		- "cpu" makes the button press event be handled by the CPU.

		 - ``cpu`` makes the button press event be handled by the CPU.



		Format: %s.

arch/arm/mach-pxa/gumstix.c

+7 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/gpio/machine.h>

#include <linux/gpio/property.h>

#include <linux/gpio.h>

#include <linux/err.h>

#include <linux/clk.h>
@@ -40,6 +41,7 @@ 
#include <linux/platform_data/mmc-pxamci.h>

#include "udc.h"

#include "gumstix.h"

#include "devices.h"



#include "generic.h"
@@ -99,8 +101,8 @@ static void __init gumstix_mmc_init(void) 
}

#endif



#ifdef CONFIG_USB_PXA25X

static const struct property_entry spitz_mci_props[] __initconst = {

#if IS_ENABLED(CONFIG_USB_PXA25X)

static const struct property_entry gumstix_vbus_props[] __initconst = {

	PROPERTY_ENTRY_GPIO("vbus-gpios", &pxa2xx_gpiochip_node,

			    GPIO_GUMSTIX_USB_GPIOn, GPIO_ACTIVE_HIGH),

	PROPERTY_ENTRY_GPIO("pullup-gpios", &pxa2xx_gpiochip_node,
@@ -111,6 +113,7 @@ static const struct property_entry spitz_mci_props[] __initconst = { 
static const struct platform_device_info gumstix_gpio_vbus_info __initconst = {

	.name		= "gpio-vbus",

	.id		= PLATFORM_DEVID_NONE,

	.properties	= gumstix_vbus_props,

};



static void __init gumstix_udc_init(void)

arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi

+0 −22
Original line number Diff line number Diff line
@@ -43,15 +43,6 @@ simple-audio-card,cpu { 
			sound-dai = <&mcasp0>;

		};

	};



	reg_usb_hub: regulator-usb-hub {

		compatible = "regulator-fixed";

		enable-active-high;

		/* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */

		gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;

		regulator-boot-on;

		regulator-name = "HUB_PWR_EN";

	};

};



/* Verdin ETHs */
@@ -193,11 +184,6 @@ &ospi0 { 
	status = "okay";

};



/* Do not force CTRL_SLEEP_MOCI# always enabled */

&reg_force_sleep_moci {

	status = "disabled";

};



/* Verdin SD_1 */

&sdhci1 {

	status = "okay";
@@ -218,15 +204,7 @@ &usbss1 { 
};



&usb1 {

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";



	usb-hub@1 {

		compatible = "usb424,2744";

		reg = <1>;

		vdd-supply = <&reg_usb_hub>;

	};

};



/* Verdin CTRL_WAKE1_MICO# */

arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ reg_1v8_eth: regulator-1v8-eth { 
		vin-supply = <&reg_1v8>;

	};



	/*

	 * By default we enable CTRL_SLEEP_MOCI#, this is required to have

	 * peripherals on the carrier board powered.

	 * If more granularity or power saving is required this can be disabled

	 * in the carrier board device tree files.

	 */

	reg_force_sleep_moci: regulator-force-sleep-moci {

		compatible = "regulator-fixed";

		enable-active-high;

arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ mcu_gpio0: gpio@4201000 { 
		power-domains = <&k3_pds 79 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 79 0>;

		clock-names = "gpio";

		gpio-ranges = <&mcu_pmx0 0 0 21>, <&mcu_pmx0 21 23 1>,

			      <&mcu_pmx0 22 32 2>;

	};



	mcu_rti0: watchdog@4880000 {