From 57faa510c23d4883510c97456a5e069711d80274 Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Wed, 5 Apr 2017 15:59:39 +0800 Subject: [PATCH] arm: dts: rockchip: rk3288 use android dtsi Change-Id: I7ec75cca855d6c4a697584cec33cb0ac45f00364 Signed-off-by: Jianqun Xu --- arch/arm/boot/dts/rk3288-android.dtsi | 4 + arch/arm/boot/dts/rk3288-evb-act8846.dts | 1 + arch/arm/boot/dts/rk3288-evb.dtsi | 140 ----------------------- 3 files changed, 5 insertions(+), 140 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi index 60363287cbc1..9877d571d310 100644 --- a/arch/arm/boot/dts/rk3288-android.dtsi +++ b/arch/arm/boot/dts/rk3288-android.dtsi @@ -189,6 +189,10 @@ }; }; +&panel { + backlight = <&backlight>; +}; + &cpu0 { enable-method = "psci"; }; diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts index abd6fb7881c3..bfdf8625c2eb 100644 --- a/arch/arm/boot/dts/rk3288-evb-act8846.dts +++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts @@ -40,6 +40,7 @@ /dts-v1/; #include "rk3288-evb.dtsi" +#include "rk3288-android.dtsi" / { compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288"; diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 45950680fc40..9cd8a9d6da56 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -49,135 +49,8 @@ bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - drm_logo: drm-logo@00000000 { - compatible = "rockchip,drm-logo"; - reg = <0x0 0x0>; - }; - - /* global autoconfigured region for contiguous allocations */ - linux,cma { - compatible = "shared-dma-pool"; - reusable; - size = <0x0 0x2000000>; - linux,cma-default; - }; - }; - - ion { - compatible = "rockchip,ion"; - #address-cells = <1>; - #size-cells = <0>; - - cma-heap { - reg = <0x00000000 0x2000000>; - }; - - system-heap { - }; - }; - - backlight: backlight { - compatible = "pwm-backlight"; - brightness-levels = < - 0 1 2 3 4 5 6 7 - 8 9 10 11 12 13 14 15 - 16 17 18 19 20 21 22 23 - 24 25 26 27 28 29 30 31 - 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 - 48 49 50 51 52 53 54 55 - 56 57 58 59 60 61 62 63 - 64 65 66 67 68 69 70 71 - 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 - 88 89 90 91 92 93 94 95 - 96 97 98 99 100 101 102 103 - 104 105 106 107 108 109 110 111 - 112 113 114 115 116 117 118 119 - 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 - 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 - 152 153 154 155 156 157 158 159 - 160 161 162 163 164 165 166 167 - 168 169 170 171 172 173 174 175 - 176 177 178 179 180 181 182 183 - 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 - 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 - 216 217 218 219 220 221 222 223 - 224 225 226 227 228 229 230 231 - 232 233 234 235 236 237 238 239 - 240 241 242 243 244 245 246 247 - 248 249 250 251 252 253 254 255>; - default-brightness-level = <128>; - enable-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en>; - pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; - }; - - rk_key: rockchip-key { - compatible = "rockchip,key"; - status = "okay"; - - io-channels = <&saradc 1>; - - vol-up-key { - linux,code = <115>; - label = "volume up"; - rockchip,adc_value = <1>; - }; - - vol-down-key { - linux,code = <114>; - label = "volume down"; - rockchip,adc_value = <170>; - }; - - power-key { - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; - pinctrl-names = "default"; - pinctrl-0 = <&pwrbtn>; - label = "power"; - gpio-key,wakeup; - }; - - menu-key { - linux,code = <59>; - label = "menu"; - rockchip,adc_value = <355>; - }; - - home-key { - linux,code = <102>; - label = "home"; - rockchip,adc_value = <746>; - }; - - back-key { - linux,code = <158>; - label = "back"; - rockchip,adc_value = <560>; - }; - - camera-key { - linux,code = <212>; - label = "camera"; - rockchip,adc_value = <450>; - }; - }; - panel: panel { compatible ="lg,lp079qx1-sp0v", "simple-panel"; - backlight = <&backlight>; enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&lcd_cs>; ports { @@ -229,7 +102,6 @@ lvds_panel: lvds_panel { compatible ="auo,b101ew05","simple-panel"; - backlight = <&backlight>; enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&lcd_cs>; status = "disabled"; @@ -587,18 +459,6 @@ drive-strength = <8>; }; - backlight { - bl_en: bl-en { - rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - buttons { - pwrbtn: pwrbtn { - rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - pmic { pmic_int: pmic-int { rockchip,pins = ; -- 2.34.1