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

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

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

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

Freescale arm64 device tree updates for 4.11:
 - Add support for LS1012A SoC which is an ARMv8 SoC with single
   Cortex-A53 core, and the corresponding board support: FRDM, QDS
   and RDB.
 - Enable TMU (Thermal Monitoring Unit) support for LS1046A SoC.
 - Enable PCA9547 device for ls2080a-rdb board by removing 'disabled'
   status setting.

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

:
  dt-bindings: clockgen: Add compatible string for LS1012A
  Documentation: DT: add LS1012A compatible for SCFG and DCFG
  Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
  arm64: dts: ls1046a: Add TMU device tree support
  arm64: dts: Add support for FSL's LS1012A SoC
  arm64: dts: ls2080a-rdb: remove disable status of pca9547

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bb414fc1 73447f68

Documentation/devicetree/bindings/arm/fsl.txt

+18 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ status. 
  - compatible: Should contain a chip-specific compatible string,

	Chip-specific strings are of the form "fsl,<chip>-scfg",

	The following <chip>s are known to be supported:

	ls1021a, ls1043a, ls1046a, ls2080a.

	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.



  - reg: should contain base address and length of SCFG memory-mapped registers
@@ -126,7 +126,7 @@ core start address and release the secondary core from holdoff and startup. 
  - compatible: Should contain a chip-specific compatible string,

	Chip-specific strings are of the form "fsl,<chip>-dcfg",

	The following <chip>s are known to be supported:

	ls1021a, ls1043a, ls1046a, ls2080a.

	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.



  - reg : should contain base address and length of DCFG memory-mapped registers
@@ -139,6 +139,22 @@ Example: 
Freescale ARMv8 based Layerscape SoC family Device Tree Bindings

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



LS1012A SoC

Required root node properties:

    - compatible = "fsl,ls1012a";



LS1012A ARMv8 based RDB Board

Required root node properties:

    - compatible = "fsl,ls1012a-rdb", "fsl,ls1012a";



LS1012A ARMv8 based FRDM Board

Required root node properties:

    - compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";



LS1012A ARMv8 based QDS Board

Required root node properties:

    - compatible = "fsl,ls1012a-qds", "fsl,ls1012a";



LS1043A SoC

Required root node properties:

    - compatible = "fsl,ls1043a";

Documentation/devicetree/bindings/clock/qoriq-clock.txt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Required properties: 
	* "fsl,t4240-clockgen"

	* "fsl,b4420-clockgen"

	* "fsl,b4860-clockgen"

	* "fsl,ls1012a-clockgen"

	* "fsl,ls1021a-clockgen"

	* "fsl,ls1043a-clockgen"

	* "fsl,ls1046a-clockgen"

arch/arm64/boot/dts/freescale/Makefile

+3 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb

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

0 → 100644
+115 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Freescale LS1012A Freedom Board.

 *

 * Copyright 2016, Freescale Semiconductor

 *

 * 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

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

/dts-v1/;



#include "fsl-ls1012a.dtsi"



/ {

	model = "LS1012A Freedom Board";

	compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";



	sys_mclk: clock-mclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <25000000>;

	};



	reg_1p8v: regulator-1p8v {

		compatible = "regulator-fixed";

		regulator-name = "1P8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";

		simple-audio-card,widgets =

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Speaker", "Speaker Ext",

			"Line", "Line In Jack";

		simple-audio-card,routing =

			"MIC_IN", "Microphone Jack",

			"Microphone Jack", "Mic Bias",

			"LINE_IN", "Line In Jack",

			"Headphone Jack", "HP_OUT",

			"Speaker Ext", "LINE_OUT";



		simple-audio-card,cpu {

			sound-dai = <&sai2>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&codec>;

			frame-master;

			bitclock-master;

			system-clock-frequency = <25000000>;

		};

	};

};



&duart0 {

	status = "okay";

};



&i2c0 {

	status = "okay";



	codec: sgtl5000@a {

		#sound-dai-cells = <0>;

		compatible = "fsl,sgtl5000";

		reg = <0xa>;

		VDDA-supply = <&reg_1p8v>;

		VDDIO-supply = <&reg_1p8v>;

		clocks = <&sys_mclk>;

	};

};



&sai2 {

	status = "okay";

};

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

0 → 100644
+128 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Freescale LS1012A QDS Board.

 *

 * Copyright 2016, Freescale Semiconductor

 *

 * 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

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

/dts-v1/;



#include "fsl-ls1012a.dtsi"



/ {

	model = "LS1012A QDS Board";

	compatible = "fsl,ls1012a-qds", "fsl,ls1012a";



	sys_mclk: clock-mclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <24576000>;

	};



	reg_3p3v: regulator-3p3v {

		compatible = "regulator-fixed";

		regulator-name = "3P3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";

		simple-audio-card,widgets =

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Speaker", "Speaker Ext",

			"Line", "Line In Jack";

		simple-audio-card,routing =

			"MIC_IN", "Microphone Jack",

			"Microphone Jack", "Mic Bias",

			"LINE_IN", "Line In Jack",

			"Headphone Jack", "HP_OUT",

			"Speaker Ext", "LINE_OUT";



		simple-audio-card,cpu {

			sound-dai = <&sai2>;

			frame-master;

			bitclock-master;

		};



		simple-audio-card,codec {

			sound-dai = <&codec>;

			frame-master;

			bitclock-master;

			system-clock-frequency = <24576000>;

		};

	};

};



&duart0 {

	status = "okay";

};



&i2c0 {

	status = "okay";



	pca9547@77 {

		compatible = "nxp,pca9547";

		reg = <0x77>;

		#address-cells = <1>;

		#size-cells = <0>;



		i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x4>;



			codec: sgtl5000@a {

				#sound-dai-cells = <0>;

				compatible = "fsl,sgtl5000";

				reg = <0xa>;

				VDDA-supply = <&reg_3p3v>;

				VDDIO-supply = <&reg_3p3v>;

				clocks = <&sys_mclk>;

			};

		};

	};

};



&sai2 {

	status = "okay";

};