openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: tegra: Device tree changes for v5.2-rc1 

This contains a set of changes to move PLL power supplies to the XUSB
 pad controller, which is necessary to ensure the proper sequencing
 during boot. Other patches in this set clean up usage of SPDX license
 identifiers in device tree files as well as add support for the ACTMON
 hardware on Tegra30.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAly4jj0THHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zoVtzEACmrojN8vh3Au0dZ8m7h+DyscYFlOFW
 nQ+sSav8SR9j+MhpUGfMOPY7Hk4AjGwOM0zV5EW91hfnRl0BdyWPhAhD8xiT0lnG
 sa/alwIScWSWpAHvoJ7jro0/8pLkNh5G98mpxJlHcyNOQWXW/L35H/8XdtgLMXng
 mgoQpLigzwpS6Q31TA6BdhelRPJ6pibkHsy1FErrMheHdyRAhlS+mJTfgOGp0OP4
 T/cMn5gc/Shdy4mJl4K6t/vQ7fMkxNnfqOCa2q4mDDo254tuOU5GPG5pG16yw6Xp
 2p9JYXa9sdTLFTfa4QcQubujm1DVqTml11yOStuetYOklWTowbxyqGoCggHZZZTi
 FiLKylnfwVlDEaCUu+IP6bsW2zgmovfKuZooKYDT2A8yimZYixYPZbmMmYyGIDEr
 GxtP++f9GSqgqDSQLOYfPgtoOAWe74nhPEZFzlyeC/CKZQvZeEG/OiVEIUdfglkj
 SMrvQ9Wb8K/sqjlj2p5p0/SLdUHAz/DgTBm7MDz0IAdurYL5bGwE0qULZDQPeF3s
 43mkuX/E4F31S2yUelyi7GkMAZVdo5WqqKN+Fq8S3QTm8QUuZTx4bVBgdJhzOnVS
 WniclDYTguK4LNCE9ryGNXsN5/T9f1RE5JTd4VqMW9+oLu8e32EGP5QxWYTGpD/5
 R3EF+VYdwK60Zw==
 =Gc2T
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-5.2-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.2-rc1

This contains a set of changes to move PLL power supplies to the XUSB
pad controller, which is necessary to ensure the proper sequencing
during boot. Other patches in this set clean up usage of SPDX license
identifiers in device tree files as well as add support for the ACTMON
hardware on Tegra30.

* tag 'tegra-for-5.2-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Add ACTMON support on Tegra30
  ARM: tegra: venice2: Move PLL power supplies to XUSB pad controller
  ARM: tegra: nyan: Move PLL power supplies to XUSB pad controller
  ARM: tegra: jetson-tk1: Move PLL power supplies to XUSB pad controller
  ARM: tegra: apalis: Move PLL power supplies to XUSB pad controller
  ARM: tegra: Remove gratuitous parentheses in SPDX license identifier
  ARM: tegra: Convert to SPDX license tags for Tegra124 Apalis

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 12:39:33 -07:00
parent 7996313656 1078946b4b
commit c076dd723e
9 changed files with 46 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/arm/boot/dts/tegra124-apalis-emc.dtsi
View File

@ -1,42 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016 Toradex AG
* Copyright 2016-2019 Toradex AG
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL 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 file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file 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 , 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.
*/
/ {

40
arch/arm/boot/dts/tegra124-apalis-eval.dts
View File

@ -1,42 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016-2018 Toradex AG
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL 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 file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file 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 , 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.
* Copyright 2016-2019 Toradex AG
*/
/dts-v1/;

2
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright 2016-2018 Toradex AG
*/

9
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright 2016-2018 Toradex AG
*/
@ -17,6 +17,7 @@ memory@80000000 {
pcie@1003000 {
status = "okay";
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pex-pll-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
@ -1796,6 +1797,7 @@ usb@70090000 {
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
<&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
avdd-pll-utmip-supply = <&reg_1v8_vddio>;
@ -1807,6 +1809,11 @@ usb@70090000 {
};
padctl@7009f000 {
avdd-pll-utmip-supply = <&reg_1v8_vddio>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
avdd-pex-pll-supply = <&reg_1v05_vdd>;
hvdd-pex-pll-e-supply = <&reg_module_3v3>;
pads {
usb2 {
status = "okay";

45
arch/arm/boot/dts/tegra124-apalis.dtsi
View File

@ -1,42 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016-2018 Toradex AG
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL 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 file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file 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 , 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.
* Copyright 2016-2019 Toradex AG
*/
#include "tegra124.dtsi"
@ -1837,6 +1801,11 @@ usb@70090000 {
};
padctl@7009f000 {
avdd-pll-utmip-supply = <&reg_1v8_vddio>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
avdd-pex-pll-supply = <&reg_1v05_vdd>;
hvdd-pex-pll-e-supply = <&reg_module_3v3>;
pads {
usb2 {
status = "okay";

5
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View File

@ -1721,6 +1721,11 @@ usb@70090000 {
padctl@7009f000 {
status = "okay";
avdd-pll-utmip-supply = <&vddio_1v8>;
avdd-pll-erefe-supply = <&avdd_1v05_run>;
avdd-pex-pll-supply = <&vdd_1v05_run>;
hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
pads {
usb2 {
status = "okay";

5
arch/arm/boot/dts/tegra124-nyan.dtsi
View File

@ -414,6 +414,11 @@ usb@70090000 {
padctl@7009f000 {
status = "okay";
avdd-pll-utmip-supply = <&vddio_1v8>;
avdd-pll-erefe-supply = <&avdd_1v05_run>;
avdd-pex-pll-supply = <&vdd_1v05_run>;
hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
pads {
usb2 {
status = "okay";

5
arch/arm/boot/dts/tegra124-venice2.dts
View File

@ -921,6 +921,11 @@ usb@70090000 {
};
padctl@7009f000 {
avdd-pll-utmip-supply = <&vddio_1v8>;
avdd-pll-erefe-supply = <&avdd_1v05_run>;
avdd-pex-pll-supply = <&vdd_1v05_run>;
hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
pads {
usb2 {
status = "okay";

11
arch/arm/boot/dts/tegra30.dtsi
View File

@ -370,6 +370,17 @@ ahb: ahb@6000c000 {
reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
};
actmon@6000c800 {
compatible = "nvidia,tegra30-actmon";
reg = <0x6000c800 0x400>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA30_CLK_ACTMON>,
<&tegra_car TEGRA30_CLK_EMC>;
clock-names = "actmon", "emc";
resets = <&tegra_car TEGRA30_CLK_ACTMON>;
reset-names = "actmon";
};
gpio: gpio@6000d000 {
compatible = "nvidia,tegra30-gpio";
reg = <0x6000d000 0x1000>;