Commit 752e8545 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: s5pv210: align pinctrl with dtschema 



Align the pin controller related nodes with dtschema.  No functional
change expected.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20220111201722.327219-17-krzysztof.kozlowski@canonical.com
parent 9e47ccc0

arch/arm/boot/dts/s5pv210-aquila.dts

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ timing0: timing { 
};



&pinctrl0 {

	t_flash_detect: t-flash-detect {

	t_flash_detect: t-flash-detect-pins {

		samsung,pins = "gph3-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

arch/arm/boot/dts/s5pv210-aries.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -645,21 +645,21 @@ &mfc { 
};



&pinctrl0 {

	bt_reset: bt-reset {

	bt_reset: bt-reset-pins {

		samsung,pins = "gpb-3";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	wlan_bt_en: wlan-bt-en {

	wlan_bt_en: wlan-bt-en-pins {

		samsung,pins = "gpb-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-val = <1>;

	};



	codec_ldo: codec-ldo {

	codec_ldo: codec-ldo-pins {

		samsung,pins = "gpf3-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
@@ -671,19 +671,19 @@ prox_i2c_pins: gp2a-i2c-pins { 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	wlan_gpio_rst: wlan-gpio-rst {

	wlan_gpio_rst: wlan-gpio-rst-pins {

		samsung,pins = "gpg1-2";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	bt_wake: bt-wake {

	bt_wake: bt-wake-pins {

		samsung,pins = "gpg3-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	gp2a_irq: gp2a-irq {

	gp2a_irq: gp2a-irq-pins {

		samsung,pins = "gph0-2";

		samsung,pin-function = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>;
@@ -698,67 +698,67 @@ pmic_dvs_pins: pmic-dvs-pins { 
		samsung,pin-val = <0>;

	};



	pmic_irq: pmic-irq {

	pmic_irq: pmic-irq-pins {

		samsung,pins = "gph0-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	wifi_host_wake: wifi-host-wake {

	wifi_host_wake: wifi-host-wake-pins {

		samsung,pins = "gph2-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	bt_host_wake: bt-host-wake {

	bt_host_wake: bt-host-wake-pins {

		samsung,pins = "gph2-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	musb_irq: musq-irq {

	musb_irq: musq-irq-pins {

		samsung,pins = "gph2-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	tf_detect: tf-detect {

	tf_detect: tf-detect-pins {

		samsung,pins = "gph3-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_DOWN>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	wifi_wake: wifi-wake {

	wifi_wake: wifi-wake-pins {

		samsung,pins = "gph3-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	magnetometer_i2c_pins: yas529-i2c-pins {

	magnetometer_i2c_pins: yas529-i2c-pins-pins {

		samsung,pins = "gpj0-0", "gpj0-1";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	ts_irq: ts-irq {

	ts_irq: ts-irq-pins {

		samsung,pins = "gpj0-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	vibrator_ena: vibrator-ena {

	vibrator_ena: vibrator-ena-pins {

		samsung,pins = "gpj1-1";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	gp2a_power: gp2a-power {

	gp2a_power: gp2a-power-pins {

		samsung,pins = "gpj1-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
@@ -771,7 +771,7 @@ touchkey_i2c_pins: touchkey-i2c-pins { 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	touchkey_vdd_ena: touchkey-vdd-ena {

	touchkey_vdd_ena: touchkey-vdd-ena-pins {

		samsung,pins = "gpj3-2";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
@@ -789,13 +789,13 @@ accel_i2c_pins: accel-i2c-pins { 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pmic_i2c_pins: pmic-i2c-pins {

	pmic_i2c_pins: pmic-i2c-pins-pins {

		samsung,pins = "gpj4-0", "gpj4-3";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	touchkey_irq: touchkey-irq {

	touchkey_irq: touchkey-irq-pins {

		samsung,pins = "gpj4-1";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
@@ -820,7 +820,7 @@ sound_i2c_pins: sound-i2c-pins { 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	panel_rst: panel-rst {

	panel_rst: panel-rst-pins {

		samsung,pins = "mp05-5";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

arch/arm/boot/dts/s5pv210-fascinate4g.dts

+6 −6
Original line number Diff line number Diff line
@@ -126,39 +126,39 @@ &pinctrl0 { 
	pinctrl-names = "default";

	pinctrl-0 = <&sleep_cfg>;



	headset_det: headset-det {

	headset_det: headset-det-pins {

		samsung,pins = "gph0-6", "gph3-6";

		samsung,pin-function = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	fg_irq: fg-irq {

	fg_irq: fg-irq-pins {

		samsung,pins = "gph3-3";

		samsung,pin-function = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	headset_micbias_ena: headset-micbias-ena {

	headset_micbias_ena: headset-micbias-ena-pins {

		samsung,pins = "gpj2-5";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	earpath_sel: earpath-sel {

	earpath_sel: earpath-sel-pins {

		samsung,pins = "gpj2-6";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	main_micbias_ena: main-micbias-ena {

	main_micbias_ena: main-micbias-ena-pins {

		samsung,pins = "gpj4-2";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	/* Based on vendor kernel v2.6.35.7 */

	sleep_cfg: sleep-cfg {

	sleep_cfg: sleep-state {

		PIN_SLP(gpa0-0, PREV, NONE);

		PIN_SLP(gpa0-1, PREV, NONE);

		PIN_SLP(gpa0-2, PREV, NONE);

arch/arm/boot/dts/s5pv210-galaxys.dts

+8 −8
Original line number Diff line number Diff line
@@ -150,53 +150,53 @@ &pinctrl0 { 
	pinctrl-names = "default";

	pinctrl-0 = <&sleep_cfg>;



	fm_i2c_pins: fm-i2c-pins {

	fm_i2c_pins: fm-i2c-pins-pins {

		samsung,pins = "gpd1-2", "gpd1-3";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	headset_det: headset-det {

	headset_det: headset-det-pins {

		samsung,pins = "gph0-6", "gph3-6";

		samsung,pin-function = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

	};



	fm_irq: fm-irq {

	fm_irq: fm-irq-pins {

		samsung,pins = "gpj2-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	fm_rst: fm-rst {

	fm_rst: fm-rst-pins {

		samsung,pins = "gpj2-5";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	earpath_sel: earpath-sel {

	earpath_sel: earpath-sel-pins {

		samsung,pins = "gpj2-6";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	massmemory_en: massmemory-en {

	massmemory_en: massmemory-en-pins {

		samsung,pins = "gpj2-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	micbias_reg_ena: micbias-reg-ena {

	micbias_reg_ena: micbias-reg-ena-pins {

		samsung,pins = "gpj4-2";

		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	/* Based on CyanogenMod 3.0.101 kernel */

	sleep_cfg: sleep-cfg {

	sleep_cfg: sleep-state {

		PIN_SLP(gpa0-0, PREV, NONE);

		PIN_SLP(gpa0-1, PREV, NONE);

		PIN_SLP(gpa0-2, PREV, NONE);

arch/arm/boot/dts/s5pv210-pinctrl.dtsi

+113 −113

File changed.

Preview size limit exceeded, changes collapsed.