diff options
author | Douglas Anderson <dianders@chromium.org> | 2016-04-22 14:23:43 -0700 |
---|---|---|
committer | Huang, Tao <huangtao@rock-chips.com> | 2016-04-25 14:41:08 +0800 |
commit | a26d11616858a0f2ad8e2eabfeaf75c0b96bec7d (patch) | |
tree | 76b109020d8c4c23d4b1f100dcbb212e258191f7 /arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts | |
parent | eb8a871c2c1d38e92426c3f2fb37da83af0d321b (diff) |
ARM64: dts: rockchip: Fixup revisions for kevin
Turns out that we got mixed up. Old stuff should just be rev 0. New
stuff should be rev 1+. Fix all that.
BUG=None
TEST=Boot rev 0.
Change-Id: I41b38893f1e4224df4e3646cd268179307b3476b
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chrome-internal-review.googlesource.com/256507
Commit-Ready: Doug Anderson <dianders@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Brian Norris <briannorris@google.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts | 66 |
1 files changed, 18 insertions, 48 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts index 8e2f59d4cedb..cf8a4fb6dde2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -46,55 +46,25 @@ #include "rk3399-gru.dtsi" / { - model = "Google Kevin Rev 1"; - compatible = "google,kevin-rev1", "google,kevin-rev0", - "google,kevin", "google,veyron", "rockchip,rk3399"; + model = "Google Kevin"; + compatible = "google,kevin-rev15", "google,kevin-rev14", + "google,kevin-rev13", "google,kevin-rev12", + "google,kevin-rev11", "google,kevin-rev10", + "google,kevin-rev9", "google,kevin-rev8", + "google,kevin-rev7", "google,kevin-rev6", + "google,kevin-rev5", "google,kevin-rev4", + "google,kevin-rev3", "google,kevin-rev2", + "google,kevin-rev1", "google,kevin", + "google,veyron", "rockchip,rk3399"; }; -&pp3000 { - gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>; -}; - -&pp1800_audio { - gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>; -}; - -&pp1800_pcie { - gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; -}; - -&sdmmc { - cd-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; -}; - -&cros_ec { - interrupts = <2 IRQ_TYPE_LEVEL_LOW>; -}; - -&ec_ap_int_l { - rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>; -}; - -&pp1500_en { - rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO &pcfg_pull_none>; -}; - -&pp1800_audio_en { - rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO - &pcfg_pull_none>; -}; - -&pp3000_en { - rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO - &pcfg_pull_none>; -}; - -&wlan_module_pd_l { - rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO - &pcfg_pull_none>; -}; +/* PINCTRL: always below everything else */ -/* This is where we actually hook up CD; has external pull */ -&sdmmc_cd_gpio { - rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>; +&pinctrl { + pen-eject { + pen_eject_l: pen-eject-l { + rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO + &pcfg_pull_up>; + }; + }; }; |