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

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

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

This contains the rk3368-geekbox as new board, mailbox device
nodes for the core rk3368 and some cleanups for gpio-keys,
mmc and tsadc.

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

:
  Documentation: devicetree: rockchip: Document rk3368-GeekBox
  arm64: dts: rockchip: Add rk3368 GeekBox dts
  arm64: dts: rockchip: Clean up gpio-keys nodes
  dt-bindings: Add vendor prefix for GeekBuying.com
  arm64: dts: rockchip: Add rk3368 mailbox device nodes
  arm64: dts: rockchip: remove broken-cd from emmc and sdio
  arm64: dts: rockchip: fix the incorrect otp-out pin on rk3368

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 56a0eccd 40ac568d

Documentation/devicetree/bindings/arm/rockchip.txt

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

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



- GeekBuying GeekBox:

    Required root node properties:

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



- Google Brain (dev-board):

    Required root node properties:

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

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ firefly Firefly 
focaltech	FocalTech Systems Co.,Ltd

fsl	Freescale Semiconductor

ge	General Electric Company

geekbuying	GeekBuying

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

geniatech	Geniatech, Inc.

arch/arm64/boot/dts/rockchip/Makefile

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

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

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



always		:= $(dtb-y)

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+3 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include <dt-bindings/input/input.h>

#include <dt-bindings/pwm/pwm.h>

#include "rk3368.dtsi"
@@ -105,16 +106,14 @@ 


	keys: gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		button@0 {

		power {

			wakeup-source;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <116>;

			linux,code = <KEY_POWER>;

		};

	};
@@ -152,7 +151,6 @@ 
};



&emmc {

	broken-cd;

	bus-width = <8>;

	cap-mmc-highspeed;

	disable-wp;

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts

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

 * Copyright (c) 2016 Andreas Färber

 *

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

 */



/dts-v1/;

#include "rk3368.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "GeekBox";

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



	chosen {

		stdout-path = "serial2:115200n8";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};



	ext_gmac: gmac-clk {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

		#clock-cells = <0>;

	};



	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&ir_int>;

	};



	keys: gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		power {

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

			wakeup-source;

		};

	};



	leds: gpio-leds {

		compatible = "gpio-leds";



		blue {

			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;

			label = "geekbox:blue:led";

			default-state = "on";

		};



		red {

			gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

			label = "geekbox:red:led";

			default-state = "off";

		};

	};



	vcc_sys: vcc-sys-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&emmc {

	status = "okay";

	bus-width = <8>;

	cap-mmc-highspeed;

	clock-frequency = <150000000>;

	disable-wp;

	keep-power-in-suspend;

	non-removable;

	num-slots = <1>;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc18_flash>;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_bus8>;

};



&gmac {

	status = "okay";

	phy-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	clock_in_out = "input";

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clock-parents = <&ext_gmac>;

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

};



&i2c0 {

	status = "okay";



	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		reg = <0x1b>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int>, <&pmic_sleep>;

		interrupt-parent = <&gpio0>;

		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;

		rockchip,system-power-controller;

		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

		vcc3-supply = <&vcc_sys>;

		vcc4-supply = <&vcc_sys>;

		vcc6-supply = <&vcc_sys>;

		vcc7-supply = <&vcc_sys>;

		vcc8-supply = <&vcc_io>;

		vcc9-supply = <&vcc_sys>;

		vcc10-supply = <&vcc_sys>;

		vcc11-supply = <&vcc_sys>;

		vcc12-supply = <&vcc_io>;

		clock-output-names = "xin32k", "rk808-clkout2";

		#clock-cells = <1>;



		regulators {

			vdd_cpu: DCDC_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <1500000>;

				regulator-name = "vdd_cpu";

			};



			vdd_log: DCDC_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <1500000>;

				regulator-name = "vdd_log";

			};



			vcc_ddr: DCDC_REG3 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_ddr";

			};



			vcc_io: DCDC_REG4 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc_io";

			};



			vcc18_flash: LDO_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc18_flash";

			};



			vcc33_lcd: LDO_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc33_lcd";

			};



			vdd_10: LDO_REG3 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd_10";

			};



			vcca_18: LDO_REG4 {

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcca_18";

			};



			vccio_sd: LDO_REG5 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_sd";

			};



			vdd10_lcd: LDO_REG6 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd10_lcd";

			};



			vcc_18: LDO_REG7 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc_18";

			};



			vcc18_lcd: LDO_REG8 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc18_lcd";

			};



			vcc_sd: SWITCH_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_sd";

			};



			vcc_lan: SWITCH_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_lan";

			};

		};

	};

};



&pinctrl {

	ir {

		ir_int: ir-int {

			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	keys {

		pwr_key: pwr-key {

			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		pmic_sleep: pmic-sleep {

			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;

		};



		pmic_int: pmic-int {

			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};

};



&tsadc {

	status = "okay";

	rockchip,hw-tshut-mode = <0>; /* CRU */

	rockchip,hw-tshut-polarity = <1>; /* high */

};



&uart2 {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_otg {

	status = "okay";

};



&wdt {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE