diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 04:35:30 +0300 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 04:35:30 +0300 | 
| commit | d06e4156430e7c5eb4f04dabcaa0d9e2fba335e3 (patch) | |
| tree | 6a8e0663a501b321655dd12683a48635474c28f0 /scripts/dtc/libfdt/fdt_wip.c | |
| parent | 8931084c0d017314ad025f19353f7c5c1d3782d8 (diff) | |
| parent | f59d261180f3b66367962f1974090815ce710056 (diff) | |
| download | linux-d06e4156430e7c5eb4f04dabcaa0d9e2fba335e3.tar.xz | |
Merge tag 'devicetree-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree updates from Rob Herring:
 - DT binding schema examples are now validated against the schemas.
   Various examples are fixed due to that.
 - Sync dtc with upstream version v1.5.0-30-g702c1b6c0e73
 - Initial schemas for networking bindings. This includes ethernet, phy
   and mdio common bindings with several Allwinner and stmmac converted
   to the schema.
 - Conversion of more Arm top-level SoC/board bindings to DT schema
 - Conversion of PSCI binding to DT schema
 - Rework Arm CPU schema to coexist with other CPU schemas
 - Add a bunch of missing vendor prefixes and new ones for SoChip,
   Sipeed, Kontron, B&R Industrial Automation GmbH, and Espressif
 - Add Mediatek UART RX wakeup support to binding
 - Add reset to ST UART binding
 - Remove some Linuxisms from the endianness common-properties.txt
   binding
 - Make the flattened DT read-only after init
 - Ignore disabled reserved memory nodes
 - Clean-up some dead code in FDT functions
* tag 'devicetree-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (56 commits)
  dt-bindings: vendor-prefixes: add Sipeed
  dt-bindings: vendor-prefixes: add SoChip
  dt-bindings: 83xx-512x-pci: Drop cell-index property
  dt-bindings: serial: add documentation for Rx in-band wakeup support
  dt-bindings: arm: Convert RDA Micro board/soc bindings to json-schema
  of: unittest: simplify getting the adapter of a client
  of/fdt: pass early_init_dt_reserve_memory_arch() with bool type nomap
  of/platform: Drop superfluous cast in of_device_make_bus_id()
  dt-bindings: usb: ehci: Fix example warnings
  dt-bindings: net: Use phy-mode instead of phy-connection-type
  dt-bindings: simple-framebuffer: Add requirement for pipelines
  dt-bindings: display: Fix simple-framebuffer example
  dt-bindings: net: mdio: Add child nodes
  dt-bindings: net: mdio: Add address and size cells
  dt-bindings: net: mdio: Add a nodename pattern
  dt-bindings: mtd: sunxi-nand: Drop 'maxItems' from child 'reg' property
  dt-bindings: arm: Limit cpus schema to only check Arm 'cpu' nodes
  dt-bindings: backlight: lm3630a: correct schema validation
  dt-bindings: net: dwmac: Deprecate the PHY reset properties
  dt-bindings: net: sun8i-emac: Convert the binding to a schemas
  ...
Diffstat (limited to 'scripts/dtc/libfdt/fdt_wip.c')
| -rw-r--r-- | scripts/dtc/libfdt/fdt_wip.c | 47 | 
1 files changed, 1 insertions, 46 deletions
diff --git a/scripts/dtc/libfdt/fdt_wip.c b/scripts/dtc/libfdt/fdt_wip.c index 534c1cbbb2f3..f64139e0b3dc 100644 --- a/scripts/dtc/libfdt/fdt_wip.c +++ b/scripts/dtc/libfdt/fdt_wip.c @@ -1,52 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)  /*   * libfdt - Flat Device Tree manipulation   * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - *  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. - * - *     You should have received a copy of the GNU General Public - *     License along with this library; if not, write to the Free - *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - *     MA 02110-1301 USA - * - * Alternatively, - * - *  b) Redistribution and use in source and binary forms, with or - *     without modification, are permitted provided that the following - *     conditions are met: - * - *     1. Redistributions of source code must retain the above - *        copyright notice, this list of conditions and the following - *        disclaimer. - *     2. Redistributions in binary form must reproduce the above - *        copyright notice, this list of conditions and the following - *        disclaimer in the documentation and/or other materials - *        provided with the distribution. - * - *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   */  #include "libfdt_env.h"  | 
