[BACK]Return to rk3399-puma.dtsi CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / external / gpl2 / dts / dist / arch / arm64 / boot / dts / rockchip

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi between version 1.1.1.3 and 1.1.1.3.2.2

version 1.1.1.3, 2018/06/27 16:27:08 version 1.1.1.3.2.2, 2020/04/08 14:08:42
Line 1 
Line 1 
   // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*  /*
  * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH   * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
  *  
  * 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.  
  */   */
   
 #include <dt-bindings/pwm/pwm.h>  #include <dt-bindings/pwm/pwm.h>
Line 183 
Line 146 
   
 &emmc_phy {  &emmc_phy {
         status = "okay";          status = "okay";
           drive-impedance-ohm = <33>;
 };  };
   
 &gmac {  &gmac {
Line 201 
Line 165 
         status = "okay";          status = "okay";
 };  };
   
   &gpu {
           mali-supply = <&vdd_gpu>;
           status = "okay";
   };
   
 &i2c0 {  &i2c0 {
         status = "okay";          status = "okay";
         i2c-scl-rising-time-ns = <168>;          i2c-scl-rising-time-ns = <168>;
Line 406 
Line 375 
         fan: fan@18 {          fan: fan@18 {
                 compatible = "ti,amc6821";                  compatible = "ti,amc6821";
                 reg = <0x18>;                  reg = <0x18>;
                 cooling-min-state = <0>;  
                 cooling-max-state = <9>;  
                 #cooling-cells = <2>;                  #cooling-cells = <2>;
         };          };
   
Line 439 
Line 406 
         pinctrl-0 = <&i2s0_2ch_bus>;          pinctrl-0 = <&i2s0_2ch_bus>;
         rockchip,playback-channels = <2>;          rockchip,playback-channels = <2>;
         rockchip,capture-channels = <2>;          rockchip,capture-channels = <2>;
         #sound-dai-cells = <0>;  
         status = "okay";          status = "okay";
 };  };
   
Line 451 
Line 417 
  */   */
 &i2s0_2ch_bus {  &i2s0_2ch_bus {
         rockchip,pins =          rockchip,pins =
                 <RK_GPIO3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,                  <3 RK_PD0 1 &pcfg_pull_none>,
                 <RK_GPIO3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>,                  <3 RK_PD2 1 &pcfg_pull_none>,
                 <RK_GPIO3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>,                  <3 RK_PD3 1 &pcfg_pull_none>,
                 <RK_GPIO3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>;                  <3 RK_PD7 1 &pcfg_pull_none>;
 };  };
   
 &io_domains {  &io_domains {
Line 478 
Line 444 
         i2c8 {          i2c8 {
                 i2c8_xfer_a: i2c8-xfer {                  i2c8_xfer_a: i2c8-xfer {
                         rockchip,pins =                          rockchip,pins =
                           <RK_GPIO1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>,                            <1 RK_PC4 1 &pcfg_pull_up>,
                           <RK_GPIO1 RK_PC5 RK_FUNC_1 &pcfg_pull_up>;                            <1 RK_PC5 1 &pcfg_pull_up>;
                 };                  };
         };          };
   
         leds {          leds {
                 led_pin_module: led-module-gpio {                  led_pin_module: led-module-gpio {
                         rockchip,pins =                          rockchip,pins =
                           <RK_GPIO2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;                            <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
                 };                  };
         };          };
   
         pmic {          pmic {
                 pmic_int_l: pmic-int-l {                  pmic_int_l: pmic-int-l {
                         rockchip,pins =                          rockchip,pins =
                           <RK_GPIO1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;                            <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
                 };                  };
         };          };
   
         usb2 {          usb2 {
                 vcc5v0_host_en: vcc5v0-host-en {                  vcc5v0_host_en: vcc5v0-host-en {
                         rockchip,pins =                          rockchip,pins =
                           <RK_GPIO4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;                            <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
                 };                  };
         };          };
 };  };

Legend:
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.3.2.2

CVSweb <webmaster@jp.NetBSD.org>