Module Name: src Committed By: jmcneill Date: Sat Oct 28 10:35:04 UTC 2017
Modified Files: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext: uniphier-pinctrl.dtsi uniphier-ref-daughter.dtsi uniphier-support-card.dtsi src/sys/external/gpl2/dts/dist/include/dt-bindings/input: linux-event-codes.h Removed Files: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: imx6ul-geam-kit.dts imx6ul-geam.dtsi imx6ul-isiot-common.dtsi mt7623-evb.dts rk1108-evb.dts rk1108.dtsi tegra20-whistler.dts uniphier-sld3-ref.dts uniphier-sld3.dtsi src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom: bcm2835-rpi.dtsi bcm2837.dtsi bcm283x-rpi-smsc9514.dtsi bcm283x-rpi-usb-host.dtsi bcm283x.dtsi ns2-clock.dtsi ns2-svk.dts ns2-xmc.dts ns2.dtsi src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd: k2g.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam-kit.dts \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-isiot-common.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623-evb.dts \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108-evb.dts \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-whistler.dts cvs rdiff -u -r1.1.1.2 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3-ref.dts \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3.dtsi cvs rdiff -u -r1.3 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x.dtsi cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2837.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi cvs rdiff -u -r1.1.1.2 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-svk.dts \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-xmc.dts \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2.dtsi cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd/k2g.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.4 --- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi:1.3 Sat Jul 29 23:09:10 2017 +++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi Sat Oct 28 10:35:04 2017 @@ -1,141 +1 @@ -/* - * Device Tree Source for UniPhier SoCs default pinctrl settings - * - * Copyright (C) 2015-2017 Socionext Inc. - * Author: Masahiro Yamada <yamada.masah...@socionext.com> - * - * 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 as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 "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. - */ - -&pinctrl { - pinctrl_emmc: emmc_grp { - groups = "emmc", "emmc_dat8"; - function = "emmc"; - }; - - pinctrl_i2c0: i2c0_grp { - groups = "i2c0"; - function = "i2c0"; - }; - - pinctrl_i2c1: i2c1_grp { - groups = "i2c1"; - function = "i2c1"; - }; - - pinctrl_i2c2: i2c2_grp { - groups = "i2c2"; - function = "i2c2"; - }; - - pinctrl_i2c3: i2c3_grp { - groups = "i2c3"; - function = "i2c3"; - }; - - pinctrl_i2c4: i2c4_grp { - groups = "i2c4"; - function = "i2c4"; - }; - - pinctrl_nand: nand_grp { - groups = "nand"; - function = "nand"; - }; - - pinctrl_nand2cs: nand2cs_grp { - groups = "nand", "nand_cs1"; - function = "nand"; - }; - - pinctrl_sd: sd_grp { - groups = "sd"; - function = "sd"; - }; - - pinctrl_sd1: sd1_grp { - groups = "sd1"; - function = "sd1"; - }; - - pinctrl_system_bus: system_bus_grp { - groups = "system_bus", "system_bus_cs1"; - function = "system_bus"; - }; - - pinctrl_uart0: uart0_grp { - groups = "uart0"; - function = "uart0"; - }; - - pinctrl_uart1: uart1_grp { - groups = "uart1"; - function = "uart1"; - }; - - pinctrl_uart2: uart2_grp { - groups = "uart2"; - function = "uart2"; - }; - - pinctrl_uart3: uart3_grp { - groups = "uart3"; - function = "uart3"; - }; - - pinctrl_usb0: usb0_grp { - groups = "usb0"; - function = "usb0"; - }; - - pinctrl_usb1: usb1_grp { - groups = "usb1"; - function = "usb1"; - }; - - pinctrl_usb2: usb2_grp { - groups = "usb2"; - function = "usb2"; - }; - - pinctrl_usb3: usb3_grp { - groups = "usb3"; - function = "usb3"; - }; -}; +#include <arm/uniphier-pinctrl.dtsi> Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi:1.4 --- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi:1.3 Sat Jul 29 23:09:10 2017 +++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi Sat Oct 28 10:35:04 2017 @@ -1,52 +1 @@ -/* - * Device Tree Source for UniPhier Reference Daughter Board - * - * Copyright (C) 2015-2017 Socionext Inc. - * Author: Masahiro Yamada <yamada.masah...@socionext.com> - * - * 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 as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 "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. - */ - -&i2c0 { - eeprom@50 { - compatible = "microchip,24lc128"; - reg = <0x50>; - pagesize = <64>; - }; -}; +#include <arm/uniphier-ref-daughter.dtsi> Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi:1.4 --- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi:1.3 Sat Jul 29 23:09:10 2017 +++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi Sat Oct 28 10:35:04 2017 @@ -1,70 +1 @@ -/* - * Device Tree Source for UniPhier Support Card (Expansion Board) - * - * Copyright (C) 2015-2017 Socionext Inc. - * Author: Masahiro Yamada <yamada.masah...@socionext.com> - * - * 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 as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 "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. - */ - -&system_bus { - status = "okay"; - ranges = <1 0x00000000 0x42000000 0x02000000>; - - support_card: support_card@1,1f00000 { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x00000000 1 0x01f00000 0x00100000>; - - ethsc: ethernet@00000000 { - compatible = "smsc,lan9118", "smsc,lan9115"; - reg = <0x00000000 0x1000>; - phy-mode = "mii"; - reg-io-width = <4>; - }; - - serialsc: uart@000b0000 { - compatible = "ns16550a"; - reg = <0x000b0000 0x20>; - clock-frequency = <12288000>; - reg-shift = <1>; - }; - }; -}; +#include <arm/uniphier-support-card.dtsi> Index: src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.3 src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.4 --- src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.3 Sat Jul 29 23:09:10 2017 +++ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h Sat Oct 28 10:35:04 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: linux-event-codes.h,v 1.3 2017/07/29 23:09:10 jmcneill Exp $ */ +/* $NetBSD: linux-event-codes.h,v 1.4 2017/10/28 10:35:04 jmcneill Exp $ */ /* * Input event codes @@ -602,6 +602,7 @@ #define KEY_APPSELECT 0x244 /* AL Select Task/Application */ #define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ +#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */