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

Commit 08f41f7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "The latest and greatest fixes for ARM platform code.  Worth pointing
  out are:

   - Lines-wise, largest is a PXA fix for dealing with interrupts on DT
     that was quite broken.  It's still newish code so while we could
     have held this off, it seemed appropriate to include now

   - Some GPIO fixes for OMAP platforms added a few lines.  This was
     also fixes for code recently added (this release).

   - Small OMAP timer fix to behave better with partially upstreamed
     platforms, which is quite welcome.

   - Allwinner fixes about operating point control, reducing
     overclocking in some cases for better stability.

  plus a handful of other smaller fixes across the map"

* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: juno: Fix misleading name of UART reference clock
  ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
  ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
  ARM: socfpga: dts: fix spi1 interrupt
  ARM: dts: Fix gpio interrupts for dm816x
  ARM: dts: dra7: remove ti,hwmod property from pcie phy
  ARM: OMAP: dmtimer: disable pm runtime on remove
  ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
  ARM: OMAP2+: Fix socbus family info for AM33xx devices
  ARM: dts: omap3: Add missing dmas for crypto
  ARM: dts: rockchip: disable gmac by default in rk3288.dtsi
  MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry
  ARM: pxa: fix pxa interrupts handling in DT
  ARM: pxa: Fix typo in zeus.c
  ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage
parents 7fc377ec 4550bdb0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c 
F:	drivers/*/*rockchip*

F:	drivers/*/*/*rockchip*

F:	sound/soc/rockchip/

N:	rockchip



ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ config ARCH_PXA 
	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_IDE

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PLAT_PXA

	select SPARSE_IRQ

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

+19 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ 
		>;

	};



	mmc_pins: pinmux_mmc_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0a70, MUX_MODE0)			/* SD_POW */

			DM816X_IOPAD(0x0a74, MUX_MODE0)			/* SD_CLK */

			DM816X_IOPAD(0x0a78, MUX_MODE0)			/* SD_CMD */

			DM816X_IOPAD(0x0a7C, MUX_MODE0)			/* SD_DAT0 */

			DM816X_IOPAD(0x0a80, MUX_MODE0)			/* SD_DAT1 */

			DM816X_IOPAD(0x0a84, MUX_MODE0)			/* SD_DAT2 */

			DM816X_IOPAD(0x0a88, MUX_MODE0)			/* SD_DAT2 */

			DM816X_IOPAD(0x0a8c, MUX_MODE2)			/* GP1[7] */

			DM816X_IOPAD(0x0a90, MUX_MODE2)			/* GP1[8] */

		>;

	};



	usb0_pins: pinmux_usb0_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0d00, MUX_MODE0)			/* USB0_DRVVBUS */
@@ -137,7 +151,12 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	vmmc-supply = <&vmmcsd_fixed>;

	bus-width = <4>;

	cd-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;

};



/* At least dm8168-evm rev c won't support multipoint, later may */

arch/arm/boot/dts/dm816x.dtsi

+14 −4
Original line number Diff line number Diff line
@@ -150,17 +150,27 @@ 
		};



		gpio1: gpio@48032000 {

			compatible = "ti,omap3-gpio";

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio1";

			ti,gpio-always-on;

			reg = <0x48032000 0x1000>;

			interrupts = <97>;

			interrupts = <96>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@4804c000 {

			compatible = "ti,omap3-gpio";

			compatible = "ti,omap4-gpio";

			ti,hwmods = "gpio2";

			ti,gpio-always-on;

			reg = <0x4804c000 0x1000>;

			interrupts = <99>;

			interrupts = <98>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpmc: gpmc@50000000 {

arch/arm/boot/dts/dra7.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -1111,7 +1111,6 @@ 
					      "wkupclk", "refclk",

					      "div-clk", "phy-div";

				#phy-cells = <0>;

				ti,hwmods = "pcie1-phy";

			};



			pcie2_phy: pciephy@4a095000 {
@@ -1130,7 +1129,6 @@ 
					      "wkupclk", "refclk",

					      "div-clk", "phy-div";

				#phy-cells = <0>;

				ti,hwmods = "pcie2-phy";

				status = "disabled";

			};

		};