Commit 6b381a8e authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: consolidate veyron panel and backlight settings 



veyron jaq, jerry, minnie and speedy have mostly redundant regulator
and pinctrl configurations for the panel/backlight. Consolidate these
pieces in the eDP .dtsi.

Also change the default power supply for the panel to
'panel_regulator', instead of overriding it in all the board files.
pinky is the only device that uses 'vcc33_lcd' (the prior default),
so overwrite it in this case. pinky doesn't have a complete display
configuration, to keep things as they were delete the common nodes
that didn't exist previously in pinky's board file.

Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent ab964000

arch/arm/boot/dts/rk3288-veyron-edp.dtsi

+50 −1
Original line number Diff line number Diff line
@@ -6,6 +6,40 @@ 
 */



/ {

	backlight_regulator: backlight-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_pwr_en>;

		regulator-name = "backlight_regulator";

		vin-supply = <&vcc33_sys>;

		startup-delay-us = <15000>;

	};



	panel_regulator: panel-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&lcd_enable_h>;

		regulator-name = "panel_regulator";

		startup-delay-us = <100000>;

		vin-supply = <&vcc33_sys>;

	};



	vcc18_lcd: vcc18-lcd {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&avdd_1v8_disp_en>;

		regulator-name = "vcc18_lcd";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc18_wl>;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		brightness-levels = <
@@ -48,12 +82,13 @@ 
		pwms = <&pwm0 0 1000000 0>;

		post-pwm-on-delay-ms = <10>;

		pwm-off-delay-ms = <10>;

		power-supply = <&backlight_regulator>;

	};



	panel: panel {

		compatible ="innolux,n116bge", "simple-panel";

		status = "okay";

		power-supply = <&vcc33_lcd>;

		power-supply = <&panel_regulator>;

		backlight = <&backlight>;



		panel-timing {
@@ -117,8 +152,22 @@ 


&pinctrl {

	backlight {

		bl_pwr_en: bl_pwr_en {

			rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		bl_en: bl-en {

			rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	lcd {

		lcd_enable_h: lcd-en {

			rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		avdd_1v8_disp_en: avdd-1v8-disp-en {

			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

arch/arm/boot/dts/rk3288-veyron-jaq.dts

+0 −55
Original line number Diff line number Diff line
@@ -16,40 +16,6 @@ 
		     "google,veyron-jaq-rev3", "google,veyron-jaq-rev2",

		     "google,veyron-jaq-rev1", "google,veyron-jaq",

		     "google,veyron", "rockchip,rk3288";



	panel_regulator: panel-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&lcd_enable_h>;

		regulator-name = "panel_regulator";

		startup-delay-us = <100000>;

		vin-supply = <&vcc33_sys>;

	};



	vcc18_lcd: vcc18-lcd {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&avdd_1v8_disp_en>;

		regulator-name = "vcc18_lcd";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc18_wl>;

	};



	backlight_regulator: backlight-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_pwr_en>;

		regulator-name = "backlight_regulator";

		vin-supply = <&vcc33_sys>;

		startup-delay-us = <15000>;

	};

};



&backlight {
@@ -87,11 +53,6 @@ 
		232 233 234 235 236 237 238 239

		240 241 242 243 244 245 246 247

		248 249 250 251 252 253 254 255>;

	power-supply = <&backlight_regulator>;

};



&panel {

	power-supply = <&panel_regulator>;

};



&rk808 {
@@ -343,12 +304,6 @@ 
};



&pinctrl {

	backlight {

		bl_pwr_en: bl_pwr_en {

			rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	buck-5v {

		drv_5v: drv-5v {

			rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -361,16 +316,6 @@ 
		};

	};



	lcd {

		lcd_enable_h: lcd-en {

			rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		avdd_1v8_disp_en: avdd-1v8-disp-en {

			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		dvs_1: dvs-1 {

			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

arch/arm/boot/dts/rk3288-veyron-jerry.dts

+0 −58
Original line number Diff line number Diff line
@@ -18,48 +18,6 @@ 
		     "google,veyron-jerry-rev5", "google,veyron-jerry-rev4",

		     "google,veyron-jerry-rev3", "google,veyron-jerry",

		     "google,veyron", "rockchip,rk3288";



	panel_regulator: panel-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&lcd_enable_h>;

		regulator-name = "panel_regulator";

		startup-delay-us = <100000>;

		vin-supply = <&vcc33_sys>;

	};



	vcc18_lcd: vcc18-lcd {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&avdd_1v8_disp_en>;

		regulator-name = "vcc18_lcd";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc18_wl>;

	};



	backlight_regulator: backlight-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_pwr_en>;

		regulator-name = "backlight_regulator";

		vin-supply = <&vcc33_sys>;

		startup-delay-us = <15000>;

	};

};



&backlight {

	power-supply = <&backlight_regulator>;

};



&panel {

	power-supply= <&panel_regulator>;

};



&rk808 {
@@ -460,12 +418,6 @@ 
};



&pinctrl {

	backlight {

		bl_pwr_en: bl_pwr_en {

			rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	buck-5v {

		drv_5v: drv-5v {

			rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -478,16 +430,6 @@ 
		};

	};



	lcd {

		lcd_enable_h: lcd-en {

			rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		avdd_1v8_disp_en: avdd-1v8-disp-en {

			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		dvs_1: dvs-1 {

			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+0 −52
Original line number Diff line number Diff line
@@ -15,40 +15,6 @@ 
		     "google,veyron-minnie-rev0", "google,veyron-minnie",

		     "google,veyron", "rockchip,rk3288";



	backlight_regulator: backlight-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_pwr_en>;

		regulator-name = "backlight_regulator";

		vin-supply = <&vcc33_sys>;

		startup-delay-us = <15000>;

	};



	panel_regulator: panel-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&lcd_enable_h>;

		regulator-name = "panel_regulator";

		startup-delay-us = <100000>;

		vin-supply = <&vcc33_sys>;

	};



	vcc18_lcd: vcc18-lcd {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&avdd_1v8_disp_en>;

		regulator-name = "vcc18_lcd";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc18_wl>;

	};



	volume_buttons: volume-buttons {

		compatible = "gpio-keys";

		pinctrl-names = "default";
@@ -105,7 +71,6 @@ 
			232 233 234 235 236 237 238 239

			240 241 242 243 244 245 246 247

			248 249 250 251 252 253 254 255>;

	power-supply = <&backlight_regulator>;

};



&i2c_tunnel {
@@ -137,7 +102,6 @@ 


&panel {

	compatible = "auo,b101ean01", "simple-panel";

	power-supply= <&panel_regulator>;



	/delete-node/ panel-timing;
@@ -411,12 +375,6 @@ 
};



&pinctrl {

	backlight {

		bl_pwr_en: bl_pwr_en {

			rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	buck-5v {

		drv_5v: drv-5v {

			rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -439,16 +397,6 @@ 
		};

	};



	lcd {

		lcd_enable_h: lcd-en {

			rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		avdd_1v8_disp_en: avdd-1v8-disp-en {

			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		dvs_1: dvs-1 {

			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;

arch/arm/boot/dts/rk3288-veyron-pinky.dts

+17 −0
Original line number Diff line number Diff line
@@ -14,7 +14,14 @@ 
	compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",

		     "google,veyron", "rockchip,rk3288";



	/delete-node/backlight-regulator;

	/delete-node/panel-regulator;

	/delete-node/emmc-pwrseq;

	/delete-node/vcc18-lcd;

};



&backlight {

	/delete-property/power-supply;

};



&emmc {
@@ -52,7 +59,17 @@ 
	i2c-scl-rising-time-ns = <300>;

};



&panel {

	power-supply = <&vcc33_lcd>;

};



&pinctrl {

	/delete-node/ lcd;



	backlight {

		/delete-node/ bl_pwr_en;

	};



	buttons {

		pwr_key_h: pwr-key-h {

			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;