Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab719074 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.12-rockchip-dts64-2' of... 

Merge tag 'v4.12-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

Basic support for new rk3328, a 4-core Cortex-A53 soc and a fix for the
default memory definition on the px5 eval board. While the bootloader
should already override it with the actual amount, it's better to not
carry around wrong values.

* tag 'v4.12-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: fix the memory size of PX5 Evaluation board
  arm64: dts: rockchip: add RK3328 eavluation board devicetree
  dt-bindings: document rockchip rk3328-evb board
  arm64: dts: rockchip: add core dtsi file for RK3328 SoCs
  dt-bindings: add binding for rk3328-grf

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eeef69c9 2f513bd9

Documentation/devicetree/bindings/arm/rockchip.txt

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ Rockchip platforms device tree bindings 
    Required root node properties:

     - compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";



- Rockchip RK3328 evb:

    Required root node properties:

      - compatible = "rockchip,rk3328-evb", "rockchip,rk3328";



- Rockchip RK3399 evb:

    Required root node properties:

      - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";

Documentation/devicetree/bindings/soc/rockchip/grf.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required Properties: 
   - "rockchip,rk3188-grf", "syscon": for rk3188

   - "rockchip,rk3228-grf", "syscon": for rk3228

   - "rockchip,rk3288-grf", "syscon": for rk3288

   - "rockchip,rk3328-grf", "syscon": for rk3328

   - "rockchip,rk3368-grf", "syscon": for rk3368

   - "rockchip,rk3399-grf", "syscon": for rk3399

- compatible: PMUGRF should be one of the following:

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb

arch/arm64/boot/dts/rockchip/rk3328-evb.dts

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd

 *

 * 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 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.

 *

 * 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.

 */



/dts-v1/;

#include "rk3328.dtsi"



/ {

	model = "Rockchip RK3328 EVB";

	compatible = "rockchip,rk3328-evb", "rockchip,rk3328";



	chosen {

		stdout-path = "serial2:1500000n8";

	};

};



&uart2 {

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3328.dtsi

0 → 100644
+1264 −0

File added.

Preview size limit exceeded, changes collapsed.