Commit 63cbb3b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A slightly larger set of fixes have accrued in the last two weeks.
  Mostly a collection of the usual smaller fixes:

   - Marvell Armada: USB phy setup issues on Turris Mox

   - Broadcom: GPIO/pinmux DT mapping corrections for Stingray, MMC bus
     width fix for RPi Zero W, GPIO LED removal for RPI CM3. Also some
     maintainer updates.

   - OMAP: Fixlets for display config, interrupt settings for wifi, some
     clock/PM pieces. Also IOMMU regression fix and a ti-sysc
     no-watchdog regression fix.

   - i.MX: A few fixes around PM/settings, some devicetree fixlets and
     catching up with config option changes in DRM

   - Rockchip: RockRro64 misc DT fixups, Hugsun X99 USB-C, Kevin display
     panel settings

  ... and some smaller fixes for Davinci (backlight, McBSP DMA),
  Allwinner (phy regulators, PMU removal on A64, etc)"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits)
  ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157
  MAINTAINERS: Update the Spreadtrum SoC maintainer
  MAINTAINERS: Remove Gregory and Brian for ARCH_BRCMSTB
  ARM: dts: bcm2837-rpi-cm3: Avoid leds-gpio probing issue
  bus: ti-sysc: Fix watchdog quirk handling
  ARM: OMAP2+: Add pdata for OMAP3 ISP IOMMU
  ARM: OMAP2+: Plug in device_enable/idle ops for IOMMUs
  ARM: davinci_all_defconfig: enable GPIO backlight
  ARM: davinci: dm365: Fix McBSP dma_slave_map entry
  ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci
  ARM: imx_v6_v7_defconfig: Enable CONFIG_DRM_MSM
  arm64: dts: imx8mn: Use correct clock for usdhc's ipg clk
  arm64: dts: imx8mm: Use correct clock for usdhc's ipg clk
  arm64: dts: imx8mq: Use correct clock for usdhc's ipg clk
  ARM: dts: imx7s: Correct GPT's ipg clock source
  ARM: dts: vf610-zii-scu4-aib: Specify 'i2c-mux-idle-disconnect'
  ARM: dts: imx6q-logicpd: Re-Enable SNVS power key
  arm64: dts: lx2160a: Correct CPU core idle state name
  mailmap: Add Simon Arlott (replacement for expired email address)
  arm64: dts: rockchip: Fix override mode for rk3399-kevin panel
  ...
parents 8c123380 86ec2e17

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> 
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>

Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Documentation/devicetree/bindings/arm/rockchip.yaml

+2 −2
Original line number Diff line number Diff line
@@ -496,12 +496,12 @@ properties: 


      - description: Theobroma Systems RK3368-uQ7 with Haikou baseboard

        items:

          - const: tsd,rk3368-uq7-haikou

          - const: tsd,rk3368-lion-haikou

          - const: rockchip,rk3368



      - description: Theobroma Systems RK3399-Q7 with Haikou baseboard

        items:

          - const: tsd,rk3399-q7-haikou

          - const: tsd,rk3399-puma-haikou

          - const: rockchip,rk3399



      - description: Tronsmart Orion R68 Meta

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

+3 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/allwinner,sun4i-a10-csi.yaml#

$id: http://devicetree.org/schemas/media/allwinner,sun4i-a10-csi.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Allwinner A10 CMOS Sensor Interface (CSI) Device Tree Bindings
@@ -27,14 +27,12 @@ properties: 
  clocks:

    items:

      - description: The CSI interface clock

      - description: The CSI module clock

      - description: The CSI ISP clock

      - description: The CSI DRAM clock



  clock-names:

    items:

      - const: bus

      - const: mod

      - const: isp

      - const: ram
@@ -89,9 +87,8 @@ examples: 
        compatible = "allwinner,sun7i-a20-csi0";

        reg = <0x01c09000 0x1000>;

        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>,

                 <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;

        clock-names = "bus", "mod", "isp", "ram";

        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;

        clock-names = "bus", "isp", "ram";

        resets = <&ccu RST_CSI0>;



        port {

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -2323,11 +2323,13 @@ F: drivers/edac/altera_edac. 














ARM/SPREADTRUM SoC SUPPORT















M:	Orson Zhai <orsonzhai@gmail.com>













M:	Baolin Wang <baolin.wang@linaro.org>













M:	Baolin Wang <baolin.wang7@gmail.com>















M:	Chunyan Zhang <zhang.lyra@gmail.com>















S:	Maintained















F:	arch/arm64/boot/dts/sprd















N:	sprd













N:	sc27xx













N:	sc2731





























ARM/STI ARCHITECTURE















M:	Patrice Chotard <patrice.chotard@st.com>










@@ -3183,7 +3185,7 @@ N:	bcm216*













N:	kona















F:	arch/arm/mach-bcm/



























BROADCOM BCM2835 ARM ARCHITECTURE













BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE















M:	Eric Anholt <eric@anholt.net>















M:	Stefan Wahren <wahrenst@gmx.net>















L:	bcm-kernel-feedback-list@broadcom.com









@@ -3191,6 +3193,7 @@ L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)













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















T:	git git://github.com/anholt/linux















S:	Maintained













N:	bcm2711















N:	bcm2835















F:	drivers/staging/vc04_services
























@@ -3237,8 +3240,6 @@ S:	Maintained













F:	drivers/usb/gadget/udc/bcm63xx_udc.*





























BROADCOM BCM7XXX ARM ARCHITECTURE













M:	Brian Norris <computersforpeace@gmail.com>













M:	Gregory Fong <gregory.0xf0@gmail.com>















M:	Florian Fainelli <f.fainelli@gmail.com>















M:	bcm-kernel-feedback-list@broadcom.com















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

































arch/arm/boot/dts/am3874-iceboard.dts



+1
−8






























Original line number
Diff line number
Diff line








@@ -111,13 +111,13 @@













		reg = <0x70>;















		#address-cells = <1>;















		#size-cells = <0>;













		i2c-mux-idle-disconnect;































		i2c@0 {















			/* FMC A */















			#address-cells = <1>;















			#size-cells = <0>;















			reg = <0>;













			i2c-mux-idle-disconnect;















		};































		i2c@1 {









@@ -125,7 +125,6 @@













			#address-cells = <1>;















			#size-cells = <0>;















			reg = <1>;













			i2c-mux-idle-disconnect;















		};































		i2c@2 {









@@ -133,7 +132,6 @@













			#address-cells = <1>;















			#size-cells = <0>;















			reg = <2>;













			i2c-mux-idle-disconnect;















		};































		i2c@3 {









@@ -141,7 +139,6 @@













			#address-cells = <1>;















			#size-cells = <0>;















			reg = <3>;













			i2c-mux-idle-disconnect;















		};































		i2c@4 {









@@ -149,14 +146,12 @@













			#address-cells = <1>;















			#size-cells = <0>;















			reg = <4>;













			i2c-mux-idle-disconnect;















		};































		i2c@5 {















			#address-cells = <1>;















			#size-cells = <0>;















			reg = <5>;













			i2c-mux-idle-disconnect;































			ina230@40 { compatible = "ti,ina230"; reg = <0x40>; shunt-resistor = <5000>; };















			ina230@41 { compatible = "ti,ina230"; reg = <0x41>; shunt-resistor = <5000>; };









@@ -182,14 +177,12 @@













			#address-cells = <1>;















			#size-cells = <0>;















			reg = <6>;













			i2c-mux-idle-disconnect;















		};































		i2c@7 {















			#address-cells = <1>;















			#size-cells = <0>;















			reg = <7>;













			i2c-mux-idle-disconnect;































			u41: pca9575@20 {















				compatible = "nxp,pca9575";









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE