ARM: dts: rockchip: add initial support for rk3288 Chrome-devices
Subsystems (4)
Heiko Stuebner
maintainercover ARM: dts: rockchip: add initial support for rk3288 Chrome-devices
This adds the basic support for two RK3288 Chrome-devices. Of course the internal display does not yet work, because we're missing the edp driver in mainline currently.
But we're nevertheless able to boot to a rootfs on the devices.
Alexandru M Stan (2):
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: rockchip: add veyron-jerry board
Chris Zhong (1):
ARM: dts: Add sbs-battery dts fragment used by chromebooks
Heiko Stuebner (1):
ARM: dts: rockchip: add Pinky board
Documentation/devicetree/bindings/arm/rockchip.txt | 12 + arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/cros-ec-sbs.dtsi | 18 + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 234 +++++++++ arch/arm/boot/dts/rk3288-veyron-jerry.dts | 199 +++++++ arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 +++++ arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 +++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 583 +++++++++++++++++++++ 8 files changed, 1299 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi
Signature · 1 line
2.1.4
Heiko Stuebner
maintainerPATCH 1/4 ARM: dts: Add sbs-battery dts fragment used by chromebooks
From: Chris Zhong <[email protected]>
This patch creates a sbs-battery fragment for batteries connected to the i2c tunnel of the cros-ec embedded controller.
--- arch/arm/boot/dts/cros-ec-sbs.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi
arch/arm/boot/dts/cros-ec-sbs.dtsi new file +18 -0
@@ -0,0 +1,18 @@ +/* + * Smart battery dts fragment for devices that use cros-ec-sbs + * + * Copyright (c) 2015 Google, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +&i2c_tunnel { + battery: sbs-battery at b { + compatible = "sbs,sbs-battery"; + reg = <0xb>; + sbs,i2c-retry-count = <2>; + sbs,poll-retry-count = <1>; + }; +};
Signature · 1 line
2.1.4
Heiko Stübner
maintainerPATCH 1/4 ARM: dts: Add sbs-battery dts fragment used by chromebooks
This patch creates a sbs-battery fragment for batteries connected to the i2c tunnel of the cros-ec embedded controller.
---
changes since v1:
- correct license
arch/arm/boot/dts/cros-ec-sbs.dtsi | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi
arch/arm/boot/dts/cros-ec-sbs.dtsi new file +52 -0
@@ -0,0 +1,52 @@ +/* + * 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 at b { + compatible = "sbs,sbs-battery"; + reg = <0xb>; + sbs,i2c-retry-count = <2>; + sbs,poll-retry-count = <1>; + }; +};
Signature · 1 line
2.1.4
PATCH 1/4 ARM: dts: Add sbs-battery dts fragment used by chromebooks
Heiko,
Quoted 11 lines · Heiko St?bner
This patch creates a sbs-battery fragment for batteries connected to the i2c tunnel of the cros-ec embedded controller.
Signed-off-by Chris Zhong <[email protected]>Signed-off-by Heiko Stuebner <[email protected]>---
changes since v1:
- correct licensearch/arm/boot/dts/cros-ec-sbs.dtsi | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
Heiko Stuebner
maintainerPATCH 2/4 ARM: dts: rockchip: add shared rk3288-veyron files
In reply to Heiko StuebnerFrom: Alexandru M Stan <[email protected]>
This adds the shared devicetree files for the Veyron device family. They are split, as not all veyron devices are chromebooks and not all contain a sd-card slot.
--- arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 234 ++++++++++ arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 +++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 583 ++++++++++++++++++++++++ 3 files changed, 939 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi new file +234 -0
@@ -0,0 +1,234 @@ +/* + * Google Veyron (and derivatives) board device tree source + * Chromebook specific parts + * + * Copyright 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. + */ + +#include <dt-bindings/clock/rockchip,rk808.h> +#include <dt-bindings/input/input.h> +#include "rk3288-veyron.dtsi" +#include "rk3288-veyron-sdmmc.dtsi" + +/ { + aliases { + /* Assign 20 so we don't get confused w/ builtin ones */ + i2c20 = &i2c_tunnel; + }; + + gpio-charger { + compatible = "gpio-charger"; + charger-type = "mains"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&ac_present_ap>; + }; + + /* A non-regulated voltage from power supply or battery */ + vccsys: vccsys { + compatible = "regulator-fixed"; + regulator-name = "vccsys"; + regulator-boot-on; + regulator-always-on; + }; + + vcc33_sys: vcc33-sys { + vin-supply = <&vccsys>; + }; + + vcc_5v: vcc-5v { + vin-supply = <&vccsys>; + }; + + /* This turns on vbus for host1 (dwc2) */ + vcc5_host1: vcc5-host1-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&host1_pwr_en>; + regulator-name = "vcc5_host1"; + regulator-always-on; + regulator-boot-on; + }; + + /* This turns on vbus for otg for host mode (dwc2) */ + vcc5v_otg: vcc5v-otg-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usbotg_pwren_h>; + regulator-name = "vcc5_host2"; + regulator-always-on; + regulator-boot-on; + }; +}; + +&gpio_keys { + pinctrl-0 = <&pwr_key_l &ap_lid_int_l>; + lid { + label = "Lid"; + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + gpio-key,wakeup; + linux,code = <0>; /* SW_LID */ + linux,input-type = <5>; /* EV_SW */ + debounce-interval = <1>; + }; +}; + +&rk808 { + vcc11-supply = <&vcc_5v>; + + regulators { + vcc33_ccd: LDO_REG8 { + regulator-name = "vcc33_ccd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + }; +}; + +&spi0 { + status = "okay"; + + cros_ec: ec at 0 { + compatible = "google,cros-ec-spi"; + reg = <0>; + google,cros-ec-spi-pre-delay = <30>; + interrupt-parent = <&gpio7>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&ec_int>; + spi-max-frequency = <3000000>; + + i2c_tunnel: i2c-tunnel { + compatible = "google,cros-ec-i2c-tunnel"; + google,remote-bus = <0>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; +}; + +&i2c4 { + trackpad at 15 { + compatible = "elan,ekth3000"; + reg = <0x15>; + interrupt-parent = <&gpio7>; + interrupts = <3 IRQ_TYPE_EDGE_FALLING>; + pinctrl-names = "default"; + pinctrl-0 = <&trackpad_int>; + vcc-supply = <&vcc33_io>; + wakeup-source; + }; +}; + +&pinctrl { + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &global_pwroff + + /* Wake only */ + &suspend_l_wake + &bt_dev_wake_awake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + &bt_dev_wake_sleep + >; + + buttons { + ap_lid_int_l: ap-lid-int-l { + rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + charger { + ac_present_ap: ac-present-ap { + rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + cros-ec { + ec_int: ec-int { + rockchip,pins = <7 7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + suspend { + suspend_l_wake: suspend-l-wake { + rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_output_low>; + }; + + suspend_l_sleep: suspend-l-sleep { + rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_output_high>; + }; + }; + + trackpad { + trackpad_int: trackpad-int { + rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + usb-host { + host1_pwr_en: host1-pwr-en { + rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + usbotg_pwren_h: usbotg-pwren-h { + rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +#include "cros-ec-keyboard.dtsi"
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi new file +122 -0
122 lines not on this page · raw message
arch/arm/boot/dts/rk3288-veyron.dtsi new file +583 -0
583 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH 2/4 ARM: dts: rockchip: add shared rk3288-veyron files
Heiko,
Quoted 4 lines · Heiko Stuebner
+&rk808 {
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi new file +3
-0+ vcc11-supply = <&vcc_5v>; + + regulators {
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi line 131
Quoted 10 lines
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi new file +10
-0+ vcc33_ccd: LDO_REG8 { + regulator-name = "vcc33_ccd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + };
Technically I think vcc33_ccd can be off since we have 'needs-reset-on-resume' down in the EHCI port (this regulator is for the USB webcam that's connected to the EHCI port).
...but leaving it on for now seems fine until we get suspend/resume more solid.
arch/arm/boot/dts/rk3288-veyron.dtsi line 76
Quoted 6 lines
arch/arm/boot/dts/rk3288-veyron.dtsi new file +6
-0+ gpio-restart { + compatible = "gpio-restart"; + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&ap_warm_reset_h>; + priority = /bits/ 8 <200>;
In downstream Chrome OS tree, the "/bits/ 8" is there. Not in upstream.
Quoted 5 lines
+&pinctrl {
arch/arm/boot/dts/rk3288-veyron.dtsi new file +4
-0+ pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &global_pwroff
arch/arm/boot/dts/rk3288-veyron.dtsi line 442
Quoted 10 lines
arch/arm/boot/dts/rk3288-veyron.dtsi new file +10
-0+ + /* Wake only */ + &bt_dev_wake_awake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &global_pwroff + + /* Sleep only */ + &bt_dev_wake_sleep
Optional: the bt_dev_wake_awake and bt_dev_wake_sleep are sorta hacks that are there till Broadcom gets an LPM driver. From upstream these hacks could be safely removed and you'd just notice a 50mW hit in power in S3. Since upstream S3 is awful in power anyway, it's probably worth it to leave the hacks out.
Upon fixing the gpio-restart, you can add my reviewed-by tag.
-Doug
Heiko Stuebner
maintainerPATCH 3/4 ARM: dts: rockchip: add veyron-jerry board
In reply to Heiko StuebnerFrom: Alexandru M Stan <[email protected]>
The Hisense Chromebook C11, also named jerry.
--- Documentation/devicetree/bindings/arm/rockchip.txt | 7 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/rk3288-veyron-jerry.dts | 199 +++++++++++++++++++++ 3 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts
Documentation/devicetree/bindings/arm/rockchip.txt +7 -0
@@ -26,3 +26,10 @@ Rockchip platforms device tree bindings - ChipSPARK PopMetal-RK3288 board: Required root node properties: - compatible = "chipspark,popmetal-rk3288", "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";
arch/arm/boot/dts/Makefile +2 -1
@@ -488,7 +488,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-evb-act8846.dtb \ rk3288-evb-rk808.dtb \ rk3288-firefly-beta.dtb \ - rk3288-firefly.dtb + rk3288-firefly.dtb \ + rk3288-veyron-jerry.dtb dtb-$(CONFIG_ARCH_S3C24XX) += \ s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += \
arch/arm/boot/dts/rk3288-veyron-jerry.dts new file +199 -0
199 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH 3/4 ARM: dts: rockchip: add veyron-jerry board
Heiko,
arch/arm/boot/dts/rk3288-veyron-jerry.dts line 92
Quoted 3 lines · Heiko Stuebner
+&rk808 {
arch/arm/boot/dts/rk3288-veyron-jerry.dts new file +2
-0+ dvs-gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>, + <&gpio7 15 GPIO_ACTIVE_HIGH>;
dvs-gpios never made it upstream. ...which actually means that upstream is probably ramping its CPU/GPU lines a bit too fast and overshooting. Eventually we should figure out how to fix that, but for now we should remove dvs-gpios since it's not in the bindings.
Quoted 7 lines
+&i2c4 {
arch/arm/boot/dts/rk3288-veyron-jerry.dts new file +6
-0+ status = "okay"; + + /* + * Trackpad pin control is shared between Elan and Synaptics devices + * so we have to pull it up to the bus level. + */
arch/arm/boot/dts/rk3288-veyron-jerry.dts line 187
Quoted 10 lines
arch/arm/boot/dts/rk3288-veyron-jerry.dts new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&i2c4_xfer &trackpad_int>; + + trackpad at 15 { + /* + * Remove the inherited pinctrl settings to avoid clashing + * with bus-wide ones. + */ + /delete-property/pinctrl-names; + /delete-property/pinctrl-0;
Eventually this would be nice to solve, but doesn't seem like it should block this patch.
After removing dvs-gpios, you can add my Reviewed-by tag.
-Doug
Heiko Stuebner
maintainerPATCH 4/4 ARM: dts: rockchip: add Pinky board
In reply to Heiko StuebnerWhile pinky was one of the earlier development models, is on the list of endangered species today and nearly extinct, I want to keep mine around for the foreseeable future after spending all the time making a nice hole into the base below the dut-connector.
--- Documentation/devicetree/bindings/arm/rockchip.txt | 5 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 +++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts
Documentation/devicetree/bindings/arm/rockchip.txt +5 -0
@@ -33,3 +33,8 @@ Rockchip platforms device tree bindings "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";
arch/arm/boot/dts/Makefile +2 -1
@@ -489,7 +489,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-evb-rk808.dtb \ rk3288-firefly-beta.dtb \ rk3288-firefly.dtb \ - rk3288-veyron-jerry.dtb + rk3288-veyron-jerry.dtb \ + rk3288-veyron-pinky.dtb dtb-$(CONFIG_ARCH_S3C24XX) += \ s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += \
arch/arm/boot/dts/rk3288-veyron-pinky.dts new file +128 -0
128 lines not on this page · raw message
Signature · 1 line
2.1.4
Heiko Stübner
maintainercover ARM: dts: rockchip: add initial support for rk3288 Chrome-devices
In reply to Heiko StuebnerAm Samstag, 11. Juli 2015, 02:29:18 schrieb Heiko Stuebner:
Quoted 10 lines
This adds the basic support for two RK3288 Chrome-devices. Of course the internal display does not yet work, because we're missing the edp driver in mainline currently.
But we're nevertheless able to boot to a rootfs on the devices.Alexandru M Stan (2):
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: rockchip: add veyron-jerry board
Quoted 5 lines
Chris Zhong (1):
ARM: dts: Add sbs-battery dts fragment used by chromebooksHeiko Stuebner (1):
ARM: dts: rockchip: add Pinky board
applied these 4 with Dougs Acks/Reviews after addressing Dougs comments by
- removing /bits/ 8 from gpio-restart
- removing the bt_dev_wake pin for now
- removing dvs-pins from the rk808 node
- fixing missing newline in the pinky patch