Merge "ODROID-COMMON: arm64/dts: Add GPIO pinctrl for PWM pins back" into odroidg12-4.9.y

This commit is contained in:
Deokgyu Yang
2021-04-14 12:53:43 +09:00
committed by Gerrit Code Review
11 changed files with 52 additions and 9 deletions

View File

@@ -923,6 +923,26 @@
};
&pinctrl_periphs {
pwmab_to_gpios: pwmab_gpio {
mux {
groups = "GPIOX_6", "GPIOX_19";
function = "gpio_periphs";
};
};
pwmcd_to_gpios: pwmcd_gpio {
mux {
groups = "GPIOX_5", "GPIOX_3";
function = "gpio_periphs";
};
};
pwmef_to_gpios: pwmef_gpio {
mux {
groups = "GPIOX_16", "GPIOX_7";
function = "gpio_periphs";
};
};
};
&pinctrl_aobus {

View File

@@ -637,6 +637,20 @@
function = "spdif_out";
};
};
pwmcd_to_gpios: pwmcd_gpio {
mux {
groups = "GPIOX_5", "GPIOX_6";
function = "gpio_periphs";
};
};
pwmef_to_gpios: pwmef_gpio {
mux {
groups = "GPIOX_16", "GPIOX_7";
function = "gpio_periphs";
};
};
}; /* end of pinctrl_periphs */
&pinctrl_aobus {

View File

@@ -13,8 +13,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
pinctrl-1 = <&pwmab_to_gpios>;
};
};

View File

@@ -9,8 +9,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
pinctrl-1 = <&pwmab_to_gpios>;
};
};
};

View File

@@ -12,8 +12,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
pinctrl-1 = <&pwmab_to_gpios>;
};
};

View File

@@ -9,8 +9,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins1>;
pinctrl-1 = <&pwmcd_to_gpios>;
};
};
};

View File

@@ -9,8 +9,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
pinctrl-1 = <&pwmef_to_gpios>;
};
};
};

View File

@@ -13,8 +13,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
pinctrl-1 = <&pwmcd_to_gpios>;
};
};

View File

@@ -9,8 +9,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
pinctrl-1 = <&pwmcd_to_gpios>;
};
};
};

View File

@@ -12,8 +12,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
pinctrl-1 = <&pwmcd_to_gpios>;
};
};

View File

@@ -9,8 +9,9 @@
__overlay__ {
status = "okay";
pinctrl-names = "pwm_pins";
pinctrl-names = "pwm_pins", "gpio_periphs";
pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
pinctrl-1 = <&pwmef_to_gpios>;
};
};
};