Commit 5665ab3a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.19-rockchip-dts64-1' of... 

Merge tag 'v4.19-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

SPDX conversion for existing devicetree files. New board is Gru-Bob
the Chromebook Flip C101PA which also got some stuff moved around
to make room for Scarlet once its display pipeline makes some more
advances.
Also included are some general sound improvements for rk3399
including enabling hdmi-sound on the sapphire board and some
misc fixes like missing cooling device properties and wrong
clock-names for the uart1 on rk3328.

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

:
  arm64: dts: rockchip: corrected uart1 clock-names for rk3328
  arm64: dts: rockchip: add Google Bob
  arm64: dts: rockchip: move core edp from rk3399-kevin to shared chromebook
  arm64: dts: rockchip: move Chromebook-specific Gru-parts to a separate file
  arm64: dts: rockchip: add phandles to some nodes on rk3399-gru
  arm64: dts: rockchip: add some common pin-settings to rk3399
  arm64: dts: rockchip: generalize rk3399 #sound-dai-cells
  arm64: dts: rockchip: Add missing cooling device properties for CPUs
  arm64: dts: rockchip: enable hdmi sound on rk3399-sapphire
  arm64: dts: rockchip: connect hdmi sound in rk3399
  arm64: dts: rockchip: use SPDX-License-Identifier

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9fcad3b6 d0414fdd

Documentation/devicetree/bindings/arm/rockchip.txt

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,15 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "geekbuying,geekbox", "rockchip,rk3368";



- Google Bob (Asus Chromebook Flip C101PA):

    Required root node properties:

	compatible = "google,bob-rev13", "google,bob-rev12",

		     "google,bob-rev11", "google,bob-rev10",

		     "google,bob-rev9", "google,bob-rev8",

		     "google,bob-rev7", "google,bob-rev6",

		     "google,bob-rev5", "google,bob-rev4",

		     "google,bob", "google,gru", "rockchip,rk3399";



- Google Brain (dev-board):

    Required root node properties:

      - compatible = "google,veyron-brain-rev0", "google,veyron-brain",

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb

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

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * 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/;

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

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2017 PINE64

 *

 * 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/;

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

+5 −39
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

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

 */



#include <dt-bindings/clock/rk3328-cru.h>
@@ -89,6 +52,7 @@ cpu1: cpu@1 { 
			compatible = "arm,cortex-a53", "arm,armv8";

			reg = <0x0 0x1>;

			clocks = <&cru ARMCLK>;

			#cooling-cells = <2>;

			dynamic-power-coefficient = <120>;

			enable-method = "psci";

			next-level-cache = <&l2>;
@@ -100,6 +64,7 @@ cpu2: cpu@2 { 
			compatible = "arm,cortex-a53", "arm,armv8";

			reg = <0x0 0x2>;

			clocks = <&cru ARMCLK>;

			#cooling-cells = <2>;

			dynamic-power-coefficient = <120>;

			enable-method = "psci";

			next-level-cache = <&l2>;
@@ -111,6 +76,7 @@ cpu3: cpu@3 { 
			compatible = "arm,cortex-a53", "arm,armv8";

			reg = <0x0 0x3>;

			clocks = <&cru ARMCLK>;

			#cooling-cells = <2>;

			dynamic-power-coefficient = <120>;

			enable-method = "psci";

			next-level-cache = <&l2>;
@@ -331,7 +297,7 @@ uart1: serial@ff120000 { 
		reg = <0x0 0xff120000 0x0 0x100>;

		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;

		clock-names = "sclk_uart", "pclk_uart";

		clock-names = "baudclk", "apb_pclk";

		dmas = <&dmac 4>, <&dmac 5>;

		dma-names = "tx", "rx";

		pinctrl-names = "default";