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

Commit e0127662 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:
 "A batch of fixes for -rc4, for various platforms.

  Nothing really substantial and worth pointing out in particular; small
  fixes for various bugs, see shortlog for details"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: sa1100: remove references to the defunct handhelds.org
  bus: uniphier-system-bus: fix condition of overlap check
  ARM: uniphier: drop weird sizeof()
  ARM: dts: am335x-baltos-ir5221: fix cpsw_emac0 link type
  ARM: OMAP: Correct interrupt type for ARM TWD
  ARM: DRA722: Add ID detect for Silicon Rev 2.0
  ARM: dts: am43xx: fix edma memcpy channel allocation
  ARM: dts: AM43x-epos: Fix clk parent for synctimer
  ARM: OMAP2: Fix up interconnect barrier initialization for DRA7
  documentation: Fix pinctrl documentation for Meson8 / Meson8b
  ARM: dts: amlogic: Split pinctrl device for Meson8 / Meson8b
  ARM: mvebu: Correct unit address for linksys
  bus: mvebu-mbus: use %pa to print phys_addr_t
  arm64: dts: vulcan: Update PCI ranges
  ARM: u8500_defconfig: turn on the Synaptics RMI4 driver
  ARM: pxa: fix the number of DMA requestor lines
  ARM: OMAP2+: hwmod: Fix updating of sysconfig register
  ARM: OMAP2+: Use srst_udelay for USB on dm814x
parents 5e1b59ab 0b24f7a8

Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

+7 −31
Original line number Diff line number Diff line 
== Amlogic Meson pinmux controller ==



Required properties for the root node:

 - compatible: "amlogic,meson8-pinctrl" or "amlogic,meson8b-pinctrl"

 - compatible: one of "amlogic,meson8-cbus-pinctrl"

		      "amlogic,meson8b-cbus-pinctrl"

		      "amlogic,meson8-aobus-pinctrl"

		      "amlogic,meson8b-aobus-pinctrl"

 - reg: address and size of registers controlling irq functionality



=== GPIO sub-nodes ===



The 2 power domains of the controller (regular and always-on) are

represented as sub-nodes and each of them acts as a GPIO controller.

The GPIO bank for the controller is represented as a sub-node and it acts as a

GPIO controller.



Required properties for sub-nodes are:

 - reg: should contain address and size for mux, pull-enable, pull and
@@ -18,10 +21,6 @@ Required properties for sub-nodes are: 
 - gpio-controller: identifies the node as a gpio controller

 - #gpio-cells: must be 2



Valid sub-node names are:

 - "banks" for the regular domain

 - "ao-bank" for the always-on domain



=== Other sub-nodes ===



Child nodes without the "gpio-controller" represent some desired
@@ -45,7 +44,7 @@ pinctrl-bindings.txt 
=== Example ===



	pinctrl: pinctrl@c1109880 {

		compatible = "amlogic,meson8-pinctrl";

		compatible = "amlogic,meson8-cbus-pinctrl";

		reg = <0xc1109880 0x10>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -61,15 +60,6 @@ pinctrl-bindings.txt 
			#gpio-cells = <2>;

               };



		gpio_ao: ao-bank@c1108030 {

			reg = <0xc8100014 0x4>,

			      <0xc810002c 0x4>,

			      <0xc8100024 0x8>;

			reg-names = "mux", "pull", "gpio";

			gpio-controller;

			#gpio-cells = <2>;

		};



		nand {

			mux {

				groups = "nand_io", "nand_io_ce0", "nand_io_ce1",
@@ -79,18 +69,4 @@ pinctrl-bindings.txt 
				function = "nand";

			};

		};



		uart_ao_a {

			mux {

				groups = "uart_tx_ao_a", "uart_rx_ao_a",

					 "uart_cts_ao_a", "uart_rts_ao_a";

				function = "uart_ao";

			};



			conf {

				pins = "GPIOAO_0", "GPIOAO_1",

				       "GPIOAO_2", "GPIOAO_3";

				bias-disable;

			};

		};

	};

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+4 −1
Original line number Diff line number Diff line
@@ -470,9 +470,12 @@ 
};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	fixed-link {

		speed = <100>;

		full-duplex;

	};

};



&cpsw_emac1 {

arch/arm/boot/dts/am4372.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
			ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,

				   <&edma_tptc2 0>;



			ti,edma-memcpy-channels = <32 33>;

			ti,edma-memcpy-channels = <58 59>;

		};



		edma_tptc0: tptc@49800000 {

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

+5 −0
Original line number Diff line number Diff line
@@ -794,3 +794,8 @@ 
	tx-num-evt = <32>;

	rx-num-evt = <32>;

};



&synctimer_32kclk {

	assigned-clocks = <&mux_synctimer32k_ck>;

	assigned-clock-parents = <&clkdiv32k_ick>;

};

arch/arm/boot/dts/armada-385-linksys.dtsi

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



			/* USB part of the eSATA/USB 2.0 port */

			usb@50000 {

			usb@58000 {

				status = "okay";

			};