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

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

Merge tag 'imx-dt64-4.13' of... 

Merge tag 'imx-dt64-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64

The Freescale arm64 device tree updates for 4.13:
 - A series from NXP employee Li Yang that updates the copyright claims
   to comply with company policy.
 - A patch-set from Madalin Bucur that adds Data Path Acceleration
   Architecture (DPAA) QBMan and FMan.  Quite a few .dtsi files are
   created for SoCs with different DPAA configuration to include the
   devices as needed.
 - Enable UHS-I SD and eMMC support for LS1046A and LS208xA RDB/QDS
   boards.
 - Enable TMU device for thermal management support on LS1088A.
 - Update SATA device node for LS1088A with correct compatible and ECC
   register bit.
 - A few small random device tree updates.

* tag 'imx-dt64-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (22 commits)
  arm64: dts: ls1088a: update sata node
  dt-bindings: ahci-fsl-qoriq: add ls1088a chip name to the list
  arm64: dts: ls1012a: Add coreclk
  arm64: dts: ls1046a: Add dis_rxdet_inp3_quirk property to USB3 node
  arm64: dts: ls208xa: disable SD UHS-I modes by default on RDB
  arm64: dts: ls1043a: Add generic compatible string for I2C EEPROM
  arm64: dts: add LS1046A DPAA FMan nodes
  arm64: dts: add LS1043A DPAA FMan support
  arm64: dts: add DPAA FMan nodes
  arm64: dts: add LS1046A DPAA QBMan nodes
  arm64: dts: add LS1043A DPAA QBMan nodes
  arm64: dts: add DPAA QBMan portals
  arm64: dts: ls1088a: Add TMU device tree support
  arm64: dts: ls1088a: update the sata node
  arm64: dts: Add flash node for ls1088a qds and rdb
  arm64: dts: ls1088a: add esdhc node
  arm64: dts: ls1012a: add eSDHC nodes
  arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS
  arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB
  mmc: dt: add compatible into eSDHC required properties
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4623e69d 375b6755

Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller 
Required properties:

  - reg: Physical base address and size of the controller's register area.

  - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where

    chip could be ls1021a, ls1043a, ls1046a, ls2080a etc.

    chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a etc.

  - clocks: Input clock specifier. Refer to common clock bindings.

  - interrupts: Interrupt specifier. Refer to interrupt binding.

Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

+14 −0
Original line number Diff line number Diff line
@@ -7,6 +7,20 @@ This file documents differences between the core properties described 
by mmc.txt and the properties used by the sdhci-esdhc driver.



Required properties:

  - compatible : should be "fsl,esdhc", or "fsl,<chip>-esdhc".

    Possible compatibles for PowerPC:

	"fsl,mpc8536-esdhc"

	"fsl,mpc8378-esdhc"

	"fsl,p2020-esdhc"

	"fsl,p4080-esdhc"

	"fsl,t1040-esdhc"

	"fsl,t4240-esdhc"

    Possible compatibles for ARM:

	"fsl,ls1012a-esdhc"

	"fsl,ls1088a-esdhc"

	"fsl,ls1043a-esdhc"

	"fsl,ls1046a-esdhc"

	"fsl,ls2080a-esdhc"

  - interrupt-parent : interrupt source phandle.

  - clock-frequency : specifies eSDHC base clock frequency.

arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts

+1 −1
Original line number Diff line number Diff line 
/*

 * Device Tree file for Freescale LS1012A Freedom Board.

 *

 * Copyright 2016, Freescale Semiconductor

 * Copyright 2016 Freescale Semiconductor, Inc.

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPLv2 or the X11 license, at your option. Note that this dual

arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts

+9 −1
Original line number Diff line number Diff line 
/*

 * Device Tree file for Freescale LS1012A QDS Board.

 *

 * Copyright 2016, Freescale Semiconductor

 * Copyright 2016 Freescale Semiconductor, Inc.

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPLv2 or the X11 license, at your option. Note that this dual
@@ -97,6 +97,14 @@ 
	status = "okay";

};



&esdhc0 {

	status = "okay";

};



&esdhc1 {

	status = "okay";

};



&i2c0 {

	status = "okay";

arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts

+14 −1
Original line number Diff line number Diff line 
/*

 * Device Tree file for Freescale LS1012A RDB Board.

 *

 * Copyright 2016, Freescale Semiconductor

 * Copyright 2016 Freescale Semiconductor, Inc.

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPLv2 or the X11 license, at your option. Note that this dual
@@ -54,6 +54,19 @@ 
	status = "okay";

};



&esdhc0 {

	sd-uhs-sdr104;

	sd-uhs-sdr50;

	sd-uhs-sdr25;

	sd-uhs-sdr12;

	status = "okay";

};



&esdhc1 {

	mmc-hs200-1_8v;

	status = "okay";

};



&i2c0 {

	status = "okay";

};