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

Commit c17dfb01 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 first real batch of fixes for this release cycle, so there are a
  few more than usual.

  Most of these are fixes and tweaks to board support (DT bugfixes,
  etc).  I've also picked up a couple of small cleanups that seemed
  innocent enough that there was little reason to wait (const/
  __initconst and Kconfig deps).

  Quite a bit of the changes on OMAP were due to fixes to no longer
  write to rodata from assembly when ARM_KERNMEM_PERMS was enabled, but
  there were also other fixes.

  Kirkwood had a bunch of gpio fixes for some boards.  OMAP had RTC
  fixes on OMAP5, and Nomadik had changes to MMC parameters in DT.

  All in all, mostly the usual mix of various fixes"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits)
  ARM: multi_v7_defconfig: enable DW_WATCHDOG
  ARM: nomadik: fix up SD/MMC DT settings
  ARM64: tegra: Add chosen node for tegra132 norrin
  ARM: realview: use "depends on" instead of "if" after prompt
  ARM: tango: use "depends on" instead of "if" after prompt
  ARM: tango: use const and __initconst for smp_operations
  ARM: realview: use const and __initconst for smp_operations
  bus: uniphier-system-bus: revive tristate prompt
  arm64: dts: Add missing DMA Abort interrupt to Juno
  bus: vexpress-config: Add missing of_node_put
  ARM: dts: am57xx: sbc-am57x: correct Eth PHY settings
  ARM: dts: am57xx: cl-som-am57x: fix CPSW EMAC pinmux
  ARM: dts: am57xx: sbc-am57x: fix UART3 pinmux
  ARM: dts: am57xx: cl-som-am57x: update SPI Flash frequency
  ARM: dts: am57xx: cl-som-am57x: set HOST mode for USB2
  ARM: dts: am57xx: sbc-am57x: fix SB-SOM EEPROM I2C address
  ARM: dts: LogicPD Torpedo: Revert Duplicative Entries
  ARM: dts: am437x: pixcir_tangoc: use correct flags for irq types
  ARM: dts: am4372: fix irq type for arm twd and global timer
  ARM: dts: at91: sama5d4 xplained: fix phy0 IRQ type
  ...
parents 63fee123 381a65c2

arch/arm/boot/dts/am33xx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ 
			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

			mbox_wkupm3: wkup_m3 {

				ti,mbox-send-noirq;

				ti,mbox-tx = <0 0 0>;

				ti,mbox-rx = <0 0 3>;

			};

arch/arm/boot/dts/am4372.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
	global_timer: timer@48240200 {

		compatible = "arm,cortex-a9-global-timer";

		reg = <0x48240200 0x100>;

		interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

		interrupt-parent = <&gic>;

		clocks = <&mpu_periphclk>;

	};
@@ -81,7 +81,7 @@ 
	local_timer: timer@48240600 {

		compatible = "arm,cortex-a9-twd-timer";

		reg = <0x48240600 0x100>;

		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;

		interrupt-parent = <&gic>;

		clocks = <&mpu_periphclk>;

	};
@@ -290,6 +290,7 @@ 
			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

			mbox_wkupm3: wkup_m3 {

				ti,mbox-send-noirq;

				ti,mbox-tx = <0 0 0>;

				ti,mbox-rx = <0 0 3>;

			};

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −3
Original line number Diff line number Diff line
@@ -590,8 +590,6 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&pixcir_ts_pins>;

		reg = <0x5c>;

		interrupt-parent = <&gpio3>;

		interrupts = <22 0>;



		attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
@@ -599,7 +597,7 @@ 
		 * 0x264 represents the offset of padconf register of

		 * gpio3_22 from am43xx_pinmux base.

		 */

		interrupts-extended = <&gpio3 22 IRQ_TYPE_NONE>,

		interrupts-extended = <&gpio3 22 IRQ_TYPE_EDGE_FALLING>,

				      <&am43xx_pinmux 0x264>;

		interrupt-names = "tsc", "wakeup";

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ 
		pinctrl-0 = <&pixcir_ts_pins>;

		reg = <0x5c>;

		interrupt-parent = <&gpio1>;

		interrupts = <17 0>;

		interrupts = <17 IRQ_TYPE_EDGE_FALLING>;



		attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/am57xx-cl-som-am57x.dts

+6 −6
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
			DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d20.rgmii1_rd3 */

			DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d21.rgmii1_rd2 */

			DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d22.rgmii1_rd1 */

			DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLUP | MUX_MODE3)	/* vin2a_d23.rgmii1_rd0 */

			DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d23.rgmii1_rd0 */

		>;

	};
@@ -492,14 +492,14 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&qspi1_pins>;



	spi-max-frequency = <20000000>;

	spi-max-frequency = <48000000>;



	spi_flash: spi_flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,m25p80", "jedec,spi-nor";

		reg = <0>;				/* CS0 */

		spi-max-frequency = <20000000>;

		spi-max-frequency = <48000000>;



		partition@0 {

			label = "uboot";
@@ -559,13 +559,13 @@ 


&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <0>;

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <1>;

};
@@ -588,7 +588,7 @@ 
};



&usb2 {

	dr_mode = "peripheral";

	dr_mode = "host";

};



&mcasp3 {