Commit c7fed591 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-sh-sci3-for-v3.14' of... 

Merge tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

From Simon Horman:
Third Round of Renesas SH SCI Updates for v3.14

* Add Device Tree Support
* Remove platform data mapbase and irqs fields
* Remove platform data scbrr_algo_id field

* tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  serial: sh-sci: Add OF support
  serial: sh-sci: Add device tree bindings documentation
  serial: sh-sci: Remove platform data mapbase and irqs fields
  serial: sh-sci: Remove platform data scbrr_algo_id field

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents efcf3d38 20bdcab8

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
* Renesas SH-Mobile Serial Communication Interface



Required properties:



  - compatible: Must contain one of the following:



    - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

    - "renesas,scifa-r8a7790" for R8A7790 (R-Car H2) SCIFA compatible UART.

    - "renesas,scifb-r8a7790" for R8A7790 (R-Car H2) SCIFB compatible UART.

    - "renesas,hscif-r8a7790" for R8A7790 (R-Car H2) HSCIF compatible UART.

    - "renesas,scif-r8a7791" for R8A7791 (R-Car M2) SCIF compatible UART.

    - "renesas,scifa-r8a7791" for R8A7791 (R-Car M2) SCIFA compatible UART.

    - "renesas,scifb-r8a7791" for R8A7791 (R-Car M2) SCIFB compatible UART.

    - "renesas,hscif-r8a7791" for R8A7791 (R-Car M2) HSCIF compatible UART.

    - "renesas,scif" for generic SCIF compatible UART.

    - "renesas,scifa" for generic SCIFA compatible UART.

    - "renesas,scifb" for generic SCIFB compatible UART.

    - "renesas,hscif" for generic HSCIF compatible UART.



    When compatible with the generic version, nodes must list the

    SoC-specific version corresponding to the platform first followed by the

    generic version.



  - reg: Base address and length of the I/O registers used by the UART.

  - interrupts: Must contain an interrupt-specifier for the SCIx interrupt.



  - clocks: Must contain a phandle and clock-specifier pair for each entry

    in clock-names.

  - clock-names: Must contain "sci_ick" for the SCIx UART interface clock.



Note: Each enabled SCIx UART should have an alias correctly numbered in the

"aliases" node.



Example:

	aliases {

		serial0 = &scifa0;

	};



	scifa0: serial@e6c40000 {

		compatible = "renesas,scifa-r8a7790", "renesas,scifa-generic";

		reg = <0 0xe6c40000 0 64>;

		interrupt-parent = <&gic>;

		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;

		clock-names = "sci_ick";

	};

arch/arm/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -644,8 +644,9 @@ config ARCH_MSM 
	  stack and controls some vital subsystems

	  (clock and power control, etc).



config ARCH_SHMOBILE

	bool "Renesas SH-Mobile / R-Mobile"

config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS
@@ -660,7 +661,8 @@ config ARCH_SHMOBILE 
	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	help

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using

	  a non-multiplatform kernel.



config ARCH_RPC

	bool "RiscPC"
@@ -1614,7 +1616,7 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1799,8 +1801,8 @@ config ARCH_WANT_GENERAL_HUGETLB 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "11"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 
machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE),y)

ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \

	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

CRA Git | Maintained and supported by SUSTech CRA and CCSE