Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c959ab8b authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: use pin constants to describe gpios on Popmetal-RK3288 



Use definition in rockchip pinctrl header to describe
gpios, this will make it more clear.

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 85a063ec

arch/arm/boot/dts/rk3288-popmetal.dts

+12 −12
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ 
		pinctrl-0 = <&pwrbtn>;

		pinctrl-0 = <&pwrbtn>;





		power {

		power {

			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			linux,code = <KEY_POWER>;

			label = "GPIO Key Power";

			label = "GPIO Key Power";

			linux,input-type = <1>;

			linux,input-type = <1>;
@@ -79,7 +79,7 @@ 




	ir: ir-receiver {

	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		compatible = "gpio-ir-receiver";

		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

		gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&ir_int>;

		pinctrl-0 = <&ir_int>;

	};

	};
@@ -94,7 +94,7 @@ 




	vcc_sd: sdmmc-regulator {

	vcc_sd: sdmmc-regulator {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;

		gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc_pwr>;

		pinctrl-0 = <&sdmmc_pwr>;

		regulator-name = "vcc_sd";

		regulator-name = "vcc_sd";
@@ -128,7 +128,7 @@ 
	vcc28_dvp: vcc28-dvp-regulator {

	vcc28_dvp: vcc28-dvp-regulator {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		enable-active-high;

		enable-active-high;

		gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&dvp_pwr>;

		pinctrl-0 = <&dvp_pwr>;

		regulator-name = "vcc28_dvp";

		regulator-name = "vcc28_dvp";
@@ -180,7 +180,7 @@ 
	phy-supply = <&vcc_lan>;

	phy-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	phy-mode = "rgmii";

	clock_in_out = "input";

	clock_in_out = "input";

	snps,reset-gpio = <&gpio4 7 0>;

	snps,reset-gpio = <&gpio4 RK_PB0 0>;

	snps,reset-active-low;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	snps,reset-delays-us = <0 10000 1000000>;

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clocks = <&cru SCLK_MAC>;
@@ -449,43 +449,43 @@ 
&pinctrl {

&pinctrl {

	ak8963 {

	ak8963 {

		comp_int: comp-int {

		comp_int: comp-int {

			rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;

		};

		};

	};

	};





	buttons {

	buttons {

		pwrbtn: pwrbtn {

		pwrbtn: pwrbtn {

			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;

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

		};

		};

	};

	};





	dvp {

	dvp {

		dvp_pwr: dvp-pwr {

		dvp_pwr: dvp-pwr {

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

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

		};

		};

	};

	};





	ir {

	ir {

		ir_int: ir-int {

		ir_int: ir-int {

			rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;

		};

		};

	};

	};





	mma8452 {

	mma8452 {

		gsensor_int: gsensor-int {

		gsensor_int: gsensor-int {

			rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;

		};

		};

	};

	};





	pmic {

	pmic {

		pmic_int: pmic-int {

		pmic_int: pmic-int {

			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;

		};

		};

	};

	};





	sdmmc {

	sdmmc {

		sdmmc_pwr: sdmmc-pwr {

		sdmmc_pwr: sdmmc-pwr {

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

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

		};

		};

	};

	};

};

};