summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/rk3288-veyron.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-09 18:10:27 +0300
committerArnd Bergmann <arnd@arndb.de>2015-10-09 18:10:27 +0300
commitd27199cb033c21988a32ab17dd417c6b4db70a19 (patch)
tree9e763a00f899d643e3b7eca5aaba3bcb678045d6 /arch/arm/boot/dts/rk3288-veyron.dtsi
parenta3e2ed443df0db5cbfc9b6f532a8a6392a03fe62 (diff)
parentb63af764ca5134341aa3a2836b356a65902ea9d4 (diff)
downloadlinux-d27199cb033c21988a32ab17dd417c6b4db70a19.tar.xz
Merge tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "Rockchip dts32 changes for 4.4" from Heiko Stuebner: DTS changes including one new Veyron-board and the Radxa Rock2 system-on-module as well as the square baseboard. On top of that a lot of mmc-related changes to improve speeds on the Cortex-A9 socs and also setting up the supplies for rk3288 mmc-controllers for the following mmc-tuning support. And of course the dts-part of the rk3288 power-domains. * tag 'v4.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add the support power-domain node on RK3288 SoCs ARM: dts: rockchip: add rk3288-firefly iodomains ARM: dts: rockchip: fixup firefly mmc supplies ARM: dts: rockchip: add rk3288-popmetal iodomains ARM: dts: rockchip: add rk3288-popmetal mmc supplies ARM: dts: rockchip: add rk3288-popmetal board to dtb list ARM: dts: rockchip: Add dtb for the Radxa Rock 2 Square board ARM: dts: rockchip: support highspeed sd-cards on rk3066a boards ARM: dts: rockchip: support highspeed sd-cards for rk3188-radxarock ARM: dts: rockchip: Add the hdmi-ddc pinctrl settings for rk3288 ARM: dts: rockchip: Remove specific cts pullup from veyron ARM: dts: rockchip: pull up cts lines on rk3288 ARM: dts: rockchip: add veyron-jaq board ARM: dts: rockchip: Add support for SD/MMC on MarsBoard-RK3066 dt-bindings: add power-domain header for RK3288 SoCs
Diffstat (limited to 'arch/arm/boot/dts/rk3288-veyron.dtsi')
-rw-r--r--arch/arm/boot/dts/rk3288-veyron.dtsi12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 275c78ccc0f3..d4263ed7031c 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -544,18 +544,6 @@
};
};
- /*
- * On Marvell-based hardware this is a no-connect. Make sure we enable
- * the pullup so that the line doesn't float. The pullup shouldn't
- * hurt on Broadcom-based hardware since the other side is actively
- * driving this signal. As proof: we've already got a pullup on RX.
- */
- uart0 {
- uart0_cts: uart0-cts {
- rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_up>;
- };
- };
-
write-protect {
fw_wp_ap: fw-wp-ap {
rockchip,pins = <7 6 RK_FUNC_GPIO &pcfg_pull_none>;