Commit e402b086 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These are the latest bug fixes that have come up in the soc tree. Most
  of these are fairly minor. Most notably, the majority of changes this
  time are not for dts files as usual.

   - Updates to the addresses of the broadcom and aspeed entries in the
     MAINTAINERS file.

   - Defconfig updates to address a regression on samsung and a build
     warning from an unknown Kconfig symbol

   - Build fixes for the StrongARM and Uniphier platforms

   - Code fixes for SCMI and FF-A firmware drivers, both of which had a
     simple bug that resulted in invalid data, and a lesser fix for the
     optee firmware driver

   - Multiple fixes for the recently added loongson/loongarch "guts" soc
     driver

   - Devicetree fixes for RISC-V on the startfive platform, addressing
     issues with NOR flash, usb and uart.

   - Multiple fixes for NXP i.MX8/i.MX9 dts files, fixing problems with
     clock, gpio, hdmi settings and the Makefile

   - Bug fixes for i.MX firmware code and the OCOTP soc driver

   - Multiple fixes for the TI sysc bus driver

   - Minor dts updates for TI omap dts files, to address boot time
     warnings and errors"

* tag 'soc-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (35 commits)
  MAINTAINERS: Fix Florian Fainelli's email address
  arm64: defconfig: enable syscon-poweroff driver
  ARM: locomo: fix locomolcd_power declaration
  soc: loongson: loongson2_guts: Remove unneeded semicolon
  soc: loongson: loongson2_guts: Convert to devm_platform_ioremap_resource()
  soc: loongson: loongson_pm2: Populate children syscon nodes
  dt-bindings: soc: loongson,ls2k-pmc: Allow syscon-reboot/syscon-poweroff as child
  soc: loongson: loongson_pm2: Drop useless of_device_id compatible
  dt-bindings: soc: loongson,ls2k-pmc: Use fallbacks for ls2k-pmc compatible
  soc: loongson: loongson_pm2: Add dependency for INPUT
  arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y
  ARM: uniphier: fix cache kernel-doc warnings
  MAINTAINERS: aspeed: Update Andrew's email address
  MAINTAINERS: aspeed: Update git tree URL
  firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND
  arm64: dts: imx: Add imx8mm-prt8mm.dtb to build
  arm64: dts: imx8mm-evk: Fix hdmi@3d node
  soc: imx8m: Enable OCOTP clock for imx8mm before reading registers
  arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock
  arm64: dts: imx8mp: Fix SDMA2/3 clocks
  ...
parents 3b347e40 b0b88a58

Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml

+37 −6
Original line number Diff line number Diff line
@@ -11,10 +11,15 @@ maintainers: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - const: loongson,ls2k0500-pmc

          - const: syscon

      - items:

          - enum:

          - loongson,ls2k0500-pmc

              - loongson,ls2k1000-pmc

              - loongson,ls2k2000-pmc

          - const: loongson,ls2k0500-pmc

          - const: syscon



  reg:
@@ -32,6 +37,18 @@ properties: 
      addition, the PM need according to it to indicate that current

      SoC whether support Suspend To RAM.



  syscon-poweroff:

    $ref: /schemas/power/reset/syscon-poweroff.yaml#

    type: object

    description:

      Node for power off method



  syscon-reboot:

    $ref: /schemas/power/reset/syscon-reboot.yaml#

    type: object

    description:

      Node for reboot method



required:

  - compatible

  - reg
@@ -44,9 +61,23 @@ examples: 
    #include <dt-bindings/interrupt-controller/irq.h>



    power-management@1fe27000 {

        compatible = "loongson,ls2k1000-pmc", "syscon";

        compatible = "loongson,ls2k1000-pmc", "loongson,ls2k0500-pmc", "syscon";

        reg = <0x1fe27000 0x58>;

        interrupt-parent = <&liointc1>;

        interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

        loongson,suspend-address = <0x0 0x1c000500>;



        syscon-reboot {

            compatible = "syscon-reboot";

            offset = <0x30>;

            mask = <0x1>;

        };



        syscon-poweroff {

            compatible = "syscon-poweroff";

            regmap = <&pmc>;

            offset = <0x14>;

            mask = <0x3c00>;

            value = <0x3c00>;

        };

    };

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -1963,12 +1963,12 @@ F: drivers/irqchip/irq-aspeed-i2c-ic.c 








ARM/ASPEED MACHINE SUPPORT









M:	Joel Stanley <joel@jms.id.au>









R:	Andrew Jeffery <andrew@aj.id.au>









R:	Andrew Jeffery <andrew@codeconstruct.com.au>









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









L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)









S:	Supported









Q:	https://patchwork.ozlabs.org/project/linux-aspeed/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git









F:	Documentation/devicetree/bindings/arm/aspeed/









F:	arch/arm/boot/dts/aspeed/









F:	arch/arm/mach-aspeed/








@@ -3058,7 +3058,7 @@ F:	Documentation/devicetree/bindings/peci/peci-aspeed.yaml







F:	drivers/peci/controller/peci-aspeed.c

















ASPEED PINCTRL DRIVERS









M:	Andrew Jeffery <andrew@aj.id.au>









M:	Andrew Jeffery <andrew@codeconstruct.com.au>









L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)









L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)









L:	linux-gpio@vger.kernel.org








@@ -3075,7 +3075,7 @@ F:	drivers/irqchip/irq-aspeed-scu-ic.c







F:	include/dt-bindings/interrupt-controller/aspeed-scu-ic.h

















ASPEED SD/MMC DRIVER









M:	Andrew Jeffery <andrew@aj.id.au>









M:	Andrew Jeffery <andrew@codeconstruct.com.au>









L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)









L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)









L:	linux-mmc@vger.kernel.org








@@ -4082,7 +4082,7 @@ F:	drivers/net/wireless/broadcom/brcm80211/















BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>









M:	Florian Fainelli <florian.fainelli@broadcom>









M:	Florian Fainelli <florian.fainelli@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









S:	Supported









F:	Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
































arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi



+3
−2






























Original line number
Diff line number
Diff line







@@ -614,12 +614,12 @@







/* Configure pwm clock source for timers 8 & 9 */









&timer8 {









	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;









	assigned-clock-parents = <&sys_clkin_ck>;









	assigned-clock-parents = <&sys_32k_ck>;









};



















&timer9 {









	assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;









	assigned-clock-parents = <&sys_clkin_ck>;









	assigned-clock-parents = <&sys_32k_ck>;









};



















/*








@@ -640,6 +640,7 @@







&uart3 {









	interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH









			       &omap4_pmx_core 0x17c>;









	overrun-throttle-ms = <500>;









};



















&uart4 {
































arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi



+1
−2






























Original line number
Diff line number
Diff line







@@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal {







	polling-delay = <1000>; /* milliseconds */









	coefficients = <0 20000>;



















			/* sensor       ID */









	thermal-sensors = <&bandgap     0>;









	thermal-sensors = <&bandgap>;



















	cpu_trips: trips {









		cpu_alert0: cpu_alert {
































arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi



+4
−1






























Original line number
Diff line number
Diff line







@@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal {







	polling-delay-passive = <250>; /* milliseconds */









	polling-delay = <1000>; /* milliseconds */



















			/* sensor       ID */









	/*









	 * See 44xx files for single sensor addressing, omap5 and dra7 need









	 * also sensor ID for addressing.









	 */









	thermal-sensors = <&bandgap     0>;



















	cpu_trips: trips {