aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 13:41:11 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 13:41:11 +0100
commitd50ce40a5a44f0c9d8f15c700c096c12c657a25f (patch)
treebb8f3eed2270921ebd5f8a6fff88cf728c51d898 /arch
parentMerge tag 'omap-for-v5.0/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (diff)
parentARM: dts: rockchip: remove qos_cif1 from rk3188 power-domain (diff)
downloadlinux-dev-d50ce40a5a44f0c9d8f15c700c096c12c657a25f.tar.xz
linux-dev-d50ce40a5a44f0c9d8f15c700c096c12c657a25f.zip
Merge tag 'v5.0-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Drop one non-existent component from powerdomain list. * tag 'v5.0-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: remove qos_cif1 from rk3188 power-domain
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/rk3188.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 4acb501dd3f8..3ed49898f4b2 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -719,7 +719,6 @@
pm_qos = <&qos_lcdc0>,
<&qos_lcdc1>,
<&qos_cif0>,
- <&qos_cif1>,
<&qos_ipp>,
<&qos_rga>;
};