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

Commit b23b0ea3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more ARM SoC updates from Olof Johansson:
 "A few updates that we merged late but are low risk for regressions for
  other platforms (and a few other straggling patches):

   - I mis-tagged the 'drivers' branch, and missed 3 patches. Merged in
     here. They're for a driver for the PL353 SRAM controller and a
     build fix for the qualcomm scm driver.

   - A new platform, RDA Micro RDA8810PL (Cortex-A5 w/ integrated
     Vivante GPU, 256MB RAM, Wifi). This includes some acked
     platform-specific drivers (serial, etc). This also include DTs for
     two boards with this SoC, OrangePi 2G and OrangePi i86.

   - i.MX8 is another new platform (NXP, 4x Cortex-A53 + Cortex-M4, 4K
     video playback offload). This is the first i.MX 64-bit SoC.

   - Some minor updates to Samsung boards (adding a few peripherals in
     DTs).

   - Small rework for SMP bootup on STi platforms.

   - A couple of TEE driver fixes.

   - A couple of new config options (bcm2835 thermal, Uniphier MDMAC)
     enabled in defconfigs"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (27 commits)
  ARM: multi_v7_defconfig: enable CONFIG_UNIPHIER_MDMAC
  arm64: defconfig: Re-enable bcm2835-thermal driver
  MAINTAINERS: Add entry for RDA Micro SoC architecture
  tty: serial: Add RDA8810PL UART driver
  ARM: dts: rda8810pl: Add interrupt support for UART
  dt-bindings: serial: Document RDA Micro UART
  ARM: dts: rda8810pl: Add timer support
  ARM: dts: Add devicetree for OrangePi i96 board
  ARM: dts: Add devicetree for OrangePi 2G IoT board
  ARM: dts: Add devicetree for RDA8810PL SoC
  ARM: Prepare RDA8810PL SoC
  dt-bindings: arm: Document RDA8810PL and reference boards
  dt-bindings: Add RDA Micro vendor prefix
  ARM: sti: remove pen_release and boot_lock
  arm64: dts: exynos: Add Bluetooth chip to TM2(e) boards
  arm64: dts: imx8mq-evk: enable watchdog
  arm64: dts: imx8mq: add watchdog devices
  MAINTAINERS: add i.MX8 DT path to i.MX architecture
  arm64: add support for i.MX8M EVK board
  arm64: add basic DTS for i.MX8MQ
  ...
parents 078a5a4f 00f8ccd0

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,12 @@ 
			specified address. The serial port must already be

			setup and configured. Options are not yet supported.



		rda,<addr>

			Start an early, polled-mode console on a serial port

			of an RDA Micro SoC, such as RDA8810PL, at the

			specified address. The serial port must already be

			setup and configured. Options are not yet supported.



		smh	Use ARM semihosting calls for early console.



		s3c2410,<addr>

Documentation/devicetree/bindings/arm/rda.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
RDA Micro platforms device tree bindings

----------------------------------------



RDA8810PL SoC

=============



Required root node properties:



 - compatible :  must contain "rda,8810pl"





Boards:



Root node property compatible must contain, depending on board:



 - Orange Pi 2G-IoT: "xunlong,orangepi-2g-iot"

 - Orange Pi i96: "xunlong,orangepi-i96"

Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Device tree bindings for ARM PL353 static memory controller



PL353 static memory controller supports two kinds of memory

interfaces.i.e NAND and SRAM/NOR interfaces.

The actual devices are instantiated from the child nodes of pl353 smc node.



Required properties:

- compatible		: Should be "arm,pl353-smc-r2p1", "arm,primecell".

- reg			: Controller registers map and length.

- clock-names		: List of input clock names - "memclk", "apb_pclk"

			  (See clock bindings for details).

- clocks		: Clock phandles (see clock bindings for details).

- address-cells		: Must be 2.

- size-cells		: Must be 1.



Child nodes:

 For NAND the "arm,pl353-nand-r2p1" and for NOR the "cfi-flash" drivers are

supported as child nodes.



for NAND partition information please refer the below file

Documentation/devicetree/bindings/mtd/partition.txt



Example:

	smcc: memory-controller@e000e000

			compatible = "arm,pl353-smc-r2p1", "arm,primecell";

			clock-names = "memclk", "apb_pclk";

			clocks = <&clkc 11>, <&clkc 44>;

			reg = <0xe000e000 0x1000>;

			#address-cells = <2>;

			#size-cells = <1>;

			ranges = <0x0 0x0 0xe1000000 0x1000000 //Nand CS Region

				  0x1 0x0 0xe2000000 0x2000000 //SRAM/NOR CS Region

				  0x2 0x0 0xe4000000 0x2000000>; //SRAM/NOR CS Region

			nand_0: flash@e1000000 {

				compatible = "arm,pl353-nand-r2p1"

				reg = <0 0 0x1000000>;

				(...)

			};

			nor0: flash@e2000000 {

				compatible = "cfi-flash";

				reg = <1 0 0x2000000>;

			};

			nor1: flash@e4000000 {

				compatible = "cfi-flash";

				reg = <2 0 0x2000000>;

			};

	};

Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
RDA Micro UART



Required properties:

- compatible :  "rda,8810pl-uart" for RDA8810PL SoCs.

- reg        :  Offset and length of the register set for the device.

- interrupts :  Should contain UART interrupt.

- clocks     :  Phandle to the input clock.





Example:



		uart2: serial@20a90000 {

			compatible = "rda,8810pl-uart";

			reg = <0x20a90000 0x1000>;

			interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&uart_clk>;

		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ ralink Mediatek/Ralink Technology Corp. 
ramtron	Ramtron International

raspberrypi	Raspberry Pi Foundation

raydium	Raydium Semiconductor Corp.

rda	Unisoc Communications, Inc.

realtek Realtek Semiconductor Corp.

renesas	Renesas Electronics Corporation

richtek	Richtek Technology Corporation