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

Commit 6e87b703 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next 

Conflicts:
	arch/arm64/kernel/early_printk.c
parents eafd370d e26f1db9

Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
* NXP SC16IS7xx advanced Universal Asynchronous Receiver-Transmitter (UART)



Required properties:

- compatible: Should be one of the following:

  - "nxp,sc16is740" for NXP SC16IS740,

  - "nxp,sc16is741" for NXP SC16IS741,

  - "nxp,sc16is750" for NXP SC16IS750,

  - "nxp,sc16is752" for NXP SC16IS752,

  - "nxp,sc16is760" for NXP SC16IS760,

  - "nxp,sc16is762" for NXP SC16IS762.

- reg: I2C address of the SC16IS7xx device.

- interrupt-parent: The phandle for the interrupt controller that

  services interrupts for this IC.

- interrupts: Should contain the UART interrupt

- clocks: Reference to the IC source clock.



Optional properties:

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be two. The first cell is the GPIO number and

  the second cell is used to specify the GPIO polarity:

    0 = active high,

    1 = active low.



Example:

        sc16is750: sc16is750@51 {

                compatible = "nxp,sc16is750";

                reg = <0x51>;

                clocks = <&clk20m>;

                interrupt-parent = <&gpio3>;

                interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

                gpio-controller;

                #gpio-cells = <2>;

        };

Documentation/kernel-parameters.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -883,6 +883,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			which are not unmapped.

			which are not unmapped.





	earlycon=	[KNL] Output early console device and options.

	earlycon=	[KNL] Output early console device and options.



		uart[8250],io,<addr>[,options]

		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]
@@ -892,6 +893,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			(mmio) or 32-bit (mmio32).

			(mmio) or 32-bit (mmio32).

			The options are the same as for ttyS, above.

			The options are the same as for ttyS, above.





		pl011,<addr>

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

			port at the specified address. The pl011 serial port

			must already be setup and configured. Options are not

			yet supported.



		smh	Use ARM semihosting calls for early console.



	earlyprintk=	[X86,SH,BLACKFIN,ARM]

	earlyprintk=	[X86,SH,BLACKFIN,ARM]

			earlyprintk=vga

			earlyprintk=vga

			earlyprintk=efi

			earlyprintk=efi

arch/arm64/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,9 @@ config IOMMU_HELPER 
config KERNEL_MODE_NEON

config KERNEL_MODE_NEON

	def_bool y

	def_bool y





config FIX_EARLYCON_MEM

	def_bool y



source "init/Kconfig"

source "init/Kconfig"





source "kernel/Kconfig.freezer"

source "kernel/Kconfig.freezer"

arch/arm64/Kconfig.debug

+0 −9
Original line number Original line Diff line number Diff line
@@ -20,15 +20,6 @@ config STRICT_DEVMEM 




	  If in doubt, say Y.

	  If in doubt, say Y.





config EARLY_PRINTK

	bool "Early printk support"

	default y

	help

	  Say Y here if you want to have an early console using the

	  earlyprintk=<name>[,<addr>][,<options>] kernel parameter. It

	  is assumed that the early console device has been initialised

	  by the boot loader prior to starting the Linux kernel.



config PID_IN_CONTEXTIDR

config PID_IN_CONTEXTIDR

	bool "Write the current PID to the CONTEXTIDR register"

	bool "Write the current PID to the CONTEXTIDR register"

	help

	help

arch/arm64/kernel/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o topology.o 
arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o

arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o

arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o

arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o

arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

arm64-obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o

arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o

arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o

arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o

arm64-obj-$(CONFIG_KGDB)		+= kgdb.o

arm64-obj-$(CONFIG_KGDB)		+= kgdb.o