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

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

Merge tag 'v4.3-rockchip32-dts1' of... 

Merge tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "Rockchip dts changes for 4.3, part1" from Heiko Stuebner:

This adds the board for the Netxeon R89 used in different TV-boxes and
the initial support for two Chromebooks from the veyron family.

Additionally a non-critical fix for the watchdog irq on rk3288, addition
of the gmac reset line, a ramp delay for the cpu regulator on the firefly
board and cpu affinity for the arm-pmu spi irqs.

* tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: add rk3288 arm-pmu irq affinity
  dt-bindings: document rk3368 R88 board from Rockchip
  ARM: dts: rockchip: add missing device_type = "memory" to boards
  ARM: dts: rockchip: add veyron-pinky board
  ARM: dts: rockchip: add veyron-jerry board
  ARM: dts: rockchip: add shared rk3288-veyron files
  ARM: dts: Add sbs-battery dts fragment used by chromebooks
  ARM: dts: rockchip: add Netxeon R89 board
  dt-bindings: add vendor prefix for Netxeon Technology
  ARM: dts: rockchip: fix rk3288 watchdog irq
  ARM: dts: rockchip: Add ramp delay for vdd_cpu in firefly board dts
  ARM: dts: rockchip: Add STMMAC reset signal in GMAC interface for rk3288

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fb61a921 4863dcd3

Documentation/devicetree/bindings/arm/rockchip.txt

+20 −0
Original line number Diff line number Diff line
@@ -26,3 +26,23 @@ Rockchip platforms device tree bindings 
- ChipSPARK PopMetal-RK3288 board:

    Required root node properties:

      - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";



- Netxeon R89 board:

    Required root node properties:

      - compatible = "netxeon,r89", "rockchip,rk3288";



- Google Jerry (Hisense Chromebook C11 and more):

    Required root node properties:

      - compatible = "google,veyron-jerry-rev7", "google,veyron-jerry-rev6",

		     "google,veyron-jerry-rev5", "google,veyron-jerry-rev4",

		     "google,veyron-jerry-rev3", "google,veyron-jerry",

		     "google,veyron", "rockchip,rk3288";



- Google Pinky (dev-board):

    Required root node properties:

      - compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",

		     "google,veyron", "rockchip,rk3288";



- Rockchip R88 board:

    Required root node properties:

      - compatible = "rockchip,r88", "rockchip,rk3368";

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ national National Semiconductor 
neonode		Neonode Inc.

netgear	NETGEAR

netlogic	Broadcom Corporation (formerly NetLogic Microsystems)

netxeon		Shenzhen Netxeon Technology CO., LTD

newhaven	Newhaven Display International

nintendo	Nintendo

nokia	Nokia

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -495,7 +495,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-evb-act8846.dtb \

	rk3288-evb-rk808.dtb \

	rk3288-firefly-beta.dtb \

	rk3288-firefly.dtb

	rk3288-firefly.dtb \

	rk3288-r89.dtb \

	rk3288-veyron-jerry.dtb \

	rk3288-veyron-pinky.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += \

	s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += \

arch/arm/boot/dts/cros-ec-sbs.dtsi

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

 * Smart battery dts fragment for devices that use cros-ec-sbs

 *

 * Copyright (c) 2015 Google, Inc

 *

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

 */



&i2c_tunnel {

	battery: sbs-battery@b {

		compatible = "sbs,sbs-battery";

		reg = <0xb>;

		sbs,i2c-retry-count = <2>;

		sbs,poll-retry-count = <1>;

	};

};

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
	compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";



	memory {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

	};