~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/scripts/dtc/include-prefixes/arm64/marvell/armada-70x0.dtsi

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.12 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /scripts/dtc/include-prefixes/arm64/marvell/armada-70x0.dtsi (Version linux-6.12-rc7) and /scripts/dtc/include-prefixes/arm64/marvell/armada-70x0.dtsi (Version linux-4.13.16)


  1 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)  << 
  2 /*                                                  1 /*
  3  * Copyright (C) 2017 Marvell Technology Group      2  * Copyright (C) 2017 Marvell Technology Group Ltd.
  4  *                                                  3  *
                                                   >>   4  * This file is dual-licensed: you can use it either under the terms
                                                   >>   5  * of the GPLv2 or the X11 license, at your option. Note that this dual
                                                   >>   6  * licensing only applies to this file, and not this project as a
                                                   >>   7  * whole.
                                                   >>   8  *
                                                   >>   9  *  a) This library is free software; you can redistribute it and/or
                                                   >>  10  *     modify it under the terms of the GNU General Public License as
                                                   >>  11  *     published by the Free Software Foundation; either version 2 of the
                                                   >>  12  *     License, or (at your option) any later version.
                                                   >>  13  *
                                                   >>  14  *     This library is distributed in the hope that it will be useful,
                                                   >>  15  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
                                                   >>  16  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
                                                   >>  17  *     GNU General Public License for more details.
                                                   >>  18  *
                                                   >>  19  * Or, alternatively,
                                                   >>  20  *
                                                   >>  21  *  b) Permission is hereby granted, free of charge, to any person
                                                   >>  22  *     obtaining a copy of this software and associated documentation
                                                   >>  23  *     files (the "Software"), to deal in the Software without
                                                   >>  24  *     restriction, including without limitation the rights to use,
                                                   >>  25  *     copy, modify, merge, publish, distribute, sublicense, and/or
                                                   >>  26  *     sell copies of the Software, and to permit persons to whom the
                                                   >>  27  *     Software is furnished to do so, subject to the following
                                                   >>  28  *     conditions:
                                                   >>  29  *
                                                   >>  30  *     The above copyright notice and this permission notice shall be
                                                   >>  31  *     included in all copies or substantial portions of the Software.
                                                   >>  32  *
                                                   >>  33  *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
                                                   >>  34  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
                                                   >>  35  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
                                                   >>  36  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
                                                   >>  37  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
                                                   >>  38  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
                                                   >>  39  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
                                                   >>  40  *     OTHER DEALINGS IN THE SOFTWARE.
                                                   >>  41  */
                                                   >>  42 
                                                   >>  43 /*
  5  * Device Tree file for the Armada 70x0 SoC        44  * Device Tree file for the Armada 70x0 SoC
  6  */                                                45  */
  7                                                    46 
                                                   >>  47 #include "armada-cp110-master.dtsi"
                                                   >>  48 
  8 / {                                                49 / {
  9         aliases {                                  50         aliases {
 10                 gpio1 = &cp0_gpio1;            !!  51                 gpio1 = &cpm_gpio1;
 11                 gpio2 = &cp0_gpio2;            !!  52                 gpio2 = &cpm_gpio2;
 12                 spi1 = &cp0_spi0;              << 
 13                 spi2 = &cp0_spi1;              << 
 14         };                                         53         };
 15 };                                                 54 };
 16                                                    55 
 17 /*                                             !!  56 &cpm_gpio1 {
 18  * Instantiate the CP110                       << 
 19  */                                            << 
 20 #define CP11X_NAME              cp0            << 
 21 #define CP11X_BASE              f2000000       << 
 22 #define CP11X_PCIEx_MEM_BASE(iface) (0xf600000 << 
 23 #define CP11X_PCIEx_MEM_SIZE(iface) 0xf00000   << 
 24 #define CP11X_PCIE0_BASE        f2600000       << 
 25 #define CP11X_PCIE1_BASE        f2620000       << 
 26 #define CP11X_PCIE2_BASE        f2640000       << 
 27                                                << 
 28 #include "armada-cp110.dtsi"                   << 
 29                                                << 
 30 #undef CP11X_NAME                              << 
 31 #undef CP11X_BASE                              << 
 32 #undef CP11X_PCIEx_MEM_BASE                    << 
 33 #undef CP11X_PCIEx_MEM_SIZE                    << 
 34 #undef CP11X_PCIE0_BASE                        << 
 35 #undef CP11X_PCIE1_BASE                        << 
 36 #undef CP11X_PCIE2_BASE                        << 
 37                                                << 
 38 &cp0_gpio1 {                                   << 
 39         status = "okay";                           57         status = "okay";
 40 };                                                 58 };
 41                                                    59 
 42 &cp0_gpio2 {                                   !!  60 &cpm_gpio2 {
 43         status = "okay";                           61         status = "okay";
 44 };                                                 62 };
 45                                                    63 
 46 &cp0_syscon0 {                                 !!  64 &cpm_syscon0 {
 47         cp0_pinctrl: pinctrl {                 !!  65         cpm_pinctrl: pinctrl {
 48                 compatible = "marvell,armada-7     66                 compatible = "marvell,armada-7k-pinctrl";
 49                                                << 
 50                 nand_pins: nand-pins {         << 
 51                         marvell,pins =         << 
 52                         "mpp15", "mpp16", "mpp << 
 53                         "mpp19", "mpp20", "mpp << 
 54                         "mpp23", "mpp24", "mpp << 
 55                         "mpp27";               << 
 56                         marvell,function = "de << 
 57                 };                             << 
 58                                                << 
 59                 nand_rb: nand-rb {             << 
 60                         marvell,pins = "mpp13" << 
 61                         marvell,function = "nf << 
 62                 };                             << 
 63         };                                         67         };
 64 };                                                 68 };
                                                      

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php