Commit 1dffab5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "The usual batch; most of them are DT tweaks to fix misdescribed
  hardware. Beyond that:

   - A bugfix for MMP2 CPU detection, it's been there quite a while but
     makes sense to fix now anyway.

   - Some power management tweaks:
      + disabling of CPU idle power state on Marvell Armada 7K/8K
        (Macchiatobin et al)
      + Increase of minimum voltage on BananaPi M3
      + Tweak of power ramp time for DVFS on NXP/Freescale i.MX7SX

   - A couple of MAINTAINER updates:
      + MMP has a new volunteer to look after it
      + Mediatek adds a few keywords, IRC channel and wiki URL"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"
  ARM: dts: imx7d-pico: Describe the Wifi clock
  ARM: dts: realview: Fix some more duplicate regulator nodes
  MAINTAINERS: update entry for MMP platform
  ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt
  MAINTAINERS: mediatek: Update SoC entry
  ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs
  arm64: dts: mt7622: Drop the general purpose timer node
  arm64: dts: mt7622: fix no more console output on BPI-R64 board
  arm64: dts: mt7622: fix no more console output on rfb1
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V
parents 40e020c1 0603a9a8

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -2541,6 +2541,10 @@ S: Ormond 
S: Victoria 3163

S: Australia



N: Eric Miao

E: eric.y.miao@gmail.com

D: MMP support



N: Pauline Middelink

E: middelin@polyware.nl

D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support



N: Richard Zidlicky

E: rz@linux-m68k.org, rdzidlic@geocities.com

W: http://www.geocities.com/rdzidlic

MAINTAINERS

+6 −5
Original line number Diff line number Diff line
@@ -1739,13 +1739,17 @@ ARM/Mediatek SoC support 
M:	Matthias Brugger <matthias.bgg@gmail.com>

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

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

W:	https://mtk.bcnfs.org/

C:	irc://chat.freenode.net/linux-mediatek

S:	Maintained

F:	arch/arm/boot/dts/mt6*

F:	arch/arm/boot/dts/mt7*

F:	arch/arm/boot/dts/mt8*

F:	arch/arm/mach-mediatek/

F:	arch/arm64/boot/dts/mediatek/

F:	drivers/soc/mediatek/

N:	mtk

N:	mt[678]

K:	mediatek



ARM/Mediatek USB3 PHY DRIVER
@@ -10005,12 +10009,9 @@ S: Odd Fixes 
F:	drivers/media/radio/radio-miropcm20*



MMP SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

M:	Haojian Zhuang <haojian.zhuang@gmail.com>

R:	Lubomir Rintel <lkundrak@v3.sk>

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

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

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

S:	Odd Fixes

F:	arch/arm/boot/dts/mmp*

F:	arch/arm/mach-mmp/

arch/arm/boot/dts/arm-realview-pb1176.dts

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
	};



	/* The voltage to the MMC card is hardwired at 3.3V */

	vmmc: fixedregulator@0 {

	vmmc: regulator-vmmc {

		compatible = "regulator-fixed";

		regulator-name = "vmmc";

		regulator-min-microvolt = <3300000>;
@@ -53,7 +53,7 @@ 
		regulator-boot-on;

        };



	veth: fixedregulator@0 {

	veth: regulator-veth {

		compatible = "regulator-fixed";

		regulator-name = "veth";

		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/arm-realview-pb11mp.dts

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
	};



	/* The voltage to the MMC card is hardwired at 3.3V */

	vmmc: fixedregulator@0 {

	vmmc: regulator-vmmc {

		compatible = "regulator-fixed";

		regulator-name = "vmmc";

		regulator-min-microvolt = <3300000>;
@@ -153,7 +153,7 @@ 
		regulator-boot-on;

        };



	veth: fixedregulator@0 {

	veth: regulator-veth {

		compatible = "regulator-fixed";

		regulator-name = "veth";

		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE