Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a512726 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:
 "Volume is a little higher than usual due to a set of gpio fixes for
  Davinci platforms that's been around a while, still seemed appropriate
  to not hold off until next merge window.

  Besides that it's the usual mix of minor fixes, mostly corrections of
  small stuff in device trees.

  Major stability-related one is the removal of a regulator from DT on
  Rock960, since DVFS caused undervoltage. I expect it'll be restored
  once they figure out the underlying issue"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  MAINTAINERS: Remove unused Qualcomm SoC mailing list
  ARM: davinci: dm644x: set the GPIO base to 0
  ARM: davinci: da830: set the GPIO base to 0
  ARM: davinci: dm355: set the GPIO base to 0
  ARM: davinci: dm646x: set the GPIO base to 0
  ARM: davinci: dm365: set the GPIO base to 0
  ARM: davinci: da850: set the GPIO base to 0
  gpio: davinci: restore a way to manually specify the GPIO base
  ARM: davinci: dm644x: define gpio interrupts as separate resources
  ARM: davinci: dm355: define gpio interrupts as separate resources
  ARM: davinci: dm646x: define gpio interrupts as separate resources
  ARM: davinci: dm365: define gpio interrupts as separate resources
  ARM: davinci: da8xx: define gpio interrupts as separate resources
  ARM: dts: at91: sama5d2: use the divided clock for SMC
  ARM: dts: imx51-zii-rdu1: Remove EEPROM node
  ARM: dts: rockchip: Remove @0 from the veyron memory node
  arm64: dts: rockchip: Fix PCIe reset polarity for rk3399-puma-haikou.
  arm64: dts: qcom: msm8998: Reserve gpio ranges on MTP
  arm64: dts: sdm845-mtp: Reserve reserved gpios
  arm64: dts: ti: k3-am654: Fix wakeup_uart reg address
  ...
parents 292974c5 bfed4d73

MAINTAINERS

+0 −3
Original line number Diff line number Diff line
@@ -1923,7 +1923,6 @@ ARM/QUALCOMM SUPPORT 
M:	Andy Gross <andy.gross@linaro.org>

M:	David Brown <david.brown@linaro.org>

L:	linux-arm-msm@vger.kernel.org

L:	linux-soc@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/soc/qcom/

F:	arch/arm/boot/dts/qcom-*.dts
@@ -2931,7 +2930,6 @@ F: arch/mips/include/asm/mach-bcm47xx/* 
BROADCOM BCM5301X ARM ARCHITECTURE

M:	Hauke Mehrtens <hauke@hauke-m.de>

M:	Rafał Miłecki <zajec5@gmail.com>

M:	Jon Mason <jonmason@broadcom.com>

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

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained
@@ -3077,7 +3075,6 @@ F: drivers/net/ethernet/broadcom/genet/ 
BROADCOM IPROC ARM ARCHITECTURE

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

M:	Jon Mason <jonmason@broadcom.com>

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

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

T:	git git://github.com/broadcom/cygnus-linux.git

arch/arm/boot/dts/am3517-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ 
	vmmc-supply = <&vmmc_fixed>;

	bus-width = <4>;

	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */

	cd-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio_127 */

	cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>; /* gpio_127 */

};



&mmc3 {

arch/arm/boot/dts/am3517-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio6>;

		interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio_170 */

		interrupts = <10 IRQ_TYPE_EDGE_RISING>; /* gpio_170 */

		ref-clock-frequency = <26000000>;

		tcxo-clock-frequency = <26000000>;

	};

arch/arm/boot/dts/imx51-zii-rdu1.dts

+0 −6
Original line number Diff line number Diff line
@@ -492,12 +492,6 @@ 
	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c04";

		pagesize = <16>;

		reg = <0x50>;

	};



	hpa1: amp@60 {

		compatible = "ti,tpa6130a2";

		reg = <0x60>;

arch/arm/boot/dts/logicpd-som-lv.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
};



&mmc3 {

	interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;

	interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;

	pinctrl-0 = <&mmc3_pins &wl127x_gpio>;

	pinctrl-names = "default";

	vmmc-supply = <&wl12xx_vmmc>;