* [PATCH 0/2] pinctrl: meson-gxbb: Export pins for PWMs @ 2016-08-22 12:54 Neil Armstrong 2016-08-22 12:54 ` [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM Neil Armstrong 2016-08-22 12:54 ` [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes Neil Armstrong 0 siblings, 2 replies; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 12:54 UTC (permalink / raw) To: linus-amlogic Add PWM pins in the meson-gxbb pinctrl driver and export then in the GXBB dtsi. Neil Armstrong (2): ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM ARM64: dts: meson-gxbb: Add PWM pinctrl nodes arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 77 ++++++++++++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 79 +++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) -- 1.9.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 12:54 [PATCH 0/2] pinctrl: meson-gxbb: Export pins for PWMs Neil Armstrong @ 2016-08-22 12:54 ` Neil Armstrong 2016-08-22 14:02 ` Linus Walleij 2016-08-22 12:54 ` [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes Neil Armstrong 1 sibling, 1 reply; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 12:54 UTC (permalink / raw) To: linus-amlogic Add support for PWM pins, for EE and AO domains. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index cb4d6ad..2227507 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -193,6 +193,14 @@ static const unsigned int eth_txd1_pins[] = { PIN(GPIOZ_11, EE_OFF) }; static const unsigned int eth_txd2_pins[] = { PIN(GPIOZ_12, EE_OFF) }; static const unsigned int eth_txd3_pins[] = { PIN(GPIOZ_13, EE_OFF) }; +static const unsigned int pwm_a_x_pins[] = { PIN(GPIOX_6, EE_OFF) }; +static const unsigned int pwm_a_y_pins[] = { PIN(GPIOY_16, EE_OFF) }; +static const unsigned int pwm_b_pins[] = { PIN(GPIODV_29, EE_OFF) }; +static const unsigned int pwm_d_pins[] = { PIN(GPIODV_28, EE_OFF) }; +static const unsigned int pwm_e_pins[] = { PIN(GPIOX_19, EE_OFF) }; +static const unsigned int pwm_f_x_pins[] = { PIN(GPIOX_7, EE_OFF) }; +static const unsigned int pwm_f_y_pins[] = { PIN(GPIOY_15, EE_OFF) }; + static const struct pinctrl_pin_desc meson_gxbb_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -225,6 +233,11 @@ static const unsigned int i2c_sda_ao_pins[] = {PIN(GPIOAO_5, 0) }; static const unsigned int i2c_slave_sck_ao_pins[] = {PIN(GPIOAO_4, 0) }; static const unsigned int i2c_slave_sda_ao_pins[] = {PIN(GPIOAO_5, 0) }; +static const unsigned int pwm_ao_a_3_pins[] = { PIN(GPIOAO_3, 0) }; +static const unsigned int pwm_ao_a_6_pins[] = { PIN(GPIOAO_6, 0) }; +static const unsigned int pwm_ao_a_12_pins[] = { PIN(GPIOAO_12, 0) }; +static const unsigned int pwm_ao_b_pins[] = { PIN(GPIOAO_13, 0) }; + static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GPIO_GROUP(GPIOZ_0, EE_OFF), GPIO_GROUP(GPIOZ_1, EE_OFF), @@ -359,12 +372,17 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(uart_rx_a, 4, 12), GROUP(uart_cts_a, 4, 11), GROUP(uart_rts_a, 4, 10), + GROUP(pwm_a_x, 3, 17), + GROUP(pwm_e, 2, 30), + GROUP(pwm_f_x, 3, 18), /* Bank Y */ GROUP(uart_cts_c, 1, 19), GROUP(uart_rts_c, 1, 18), GROUP(uart_tx_c, 1, 17), GROUP(uart_rx_c, 1, 16), + GROUP(pwm_a_y, 1, 20), + GROUP(pwm_f_y, 1, 21), /* Bank Z */ GROUP(eth_mdio, 6, 1), @@ -387,6 +405,8 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(uart_rx_b, 2, 28), GROUP(uart_cts_b, 2, 27), GROUP(uart_rts_b, 2, 26), + GROUP(pwm_b, 3, 21), + GROUP(pwm_d, 3, 20), /* Bank BOOT */ GROUP(emmc_nand_d07, 4, 30), @@ -432,6 +452,10 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = { GROUP(i2c_sda_ao, 0, 5), GROUP(i2c_slave_sck_ao, 0, 2), GROUP(i2c_slave_sda_ao, 0, 1), + GROUP(pwm_ao_a_3, 0, 22), + GROUP(pwm_ao_a_6, 0, 18), + GROUP(pwm_ao_a_12, 0, 17), + GROUP(pwm_ao_b, 0, 3), }; static const char * const gpio_periphs_groups[] = { @@ -499,6 +523,34 @@ static const char * const eth_groups[] = { "eth_txd0", "eth_txd1", "eth_txd2", "eth_txd3", }; +static const char * const pwm_a_x_groups[] = { + "pwm_a_x", +}; + +static const char * const pwm_a_y_groups[] = { + "pwm_a_y", +}; + +static const char * const pwm_b_groups[] = { + "pwm_b", +}; + +static const char * const pwm_d_groups[] = { + "pwm_d", +}; + +static const char * const pwm_e_groups[] = { + "pwm_e", +}; + +static const char * const pwm_f_x_groups[] = { + "pwm_f_x", +}; + +static const char * const pwm_f_y_groups[] = { + "pwm_f_y", +}; + static const char * const gpio_aobus_groups[] = { "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", @@ -521,6 +573,22 @@ static const char * const i2c_slave_ao_groups[] = { "i2c_slave_sdk_ao", "i2c_slave_sda_ao", }; +static const char * const pwm_ao_a_3_groups[] = { + "pwm_ao_a_3", +}; + +static const char * const pwm_ao_a_6_groups[] = { + "pwm_ao_a_6", +}; + +static const char * const pwm_ao_a_12_groups[] = { + "pwm_ao_a_12", +}; + +static const char * const pwm_ao_b_groups[] = { + "pwm_ao_b", +}; + static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), @@ -529,6 +597,13 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(uart_b), FUNCTION(uart_c), FUNCTION(eth), + FUNCTION(pwm_a_x), + FUNCTION(pwm_a_y), + FUNCTION(pwm_b), + FUNCTION(pwm_d), + FUNCTION(pwm_e), + FUNCTION(pwm_f_x), + FUNCTION(pwm_f_y), }; static struct meson_pmx_func meson_gxbb_aobus_functions[] = { @@ -537,6 +612,10 @@ static struct meson_pmx_func meson_gxbb_aobus_functions[] = { FUNCTION(uart_ao_b), FUNCTION(i2c_ao), FUNCTION(i2c_slave_ao), + FUNCTION(pwm_ao_a_3), + FUNCTION(pwm_ao_a_6), + FUNCTION(pwm_ao_a_12), + FUNCTION(pwm_ao_b), }; static struct meson_bank meson_gxbb_periphs_banks[] = { -- 1.9.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 12:54 ` [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM Neil Armstrong @ 2016-08-22 14:02 ` Linus Walleij 2016-08-22 14:04 ` Neil Armstrong 0 siblings, 1 reply; 9+ messages in thread From: Linus Walleij @ 2016-08-22 14:02 UTC (permalink / raw) To: linus-amlogic On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > Add support for PWM pins, for EE and AO domains. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> The $SUBJECT of this patch is titallyt wrong, it should be just pinctrl: (something). Should I fix it up or would you like to resend? It looks nice otherwise. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 14:02 ` Linus Walleij @ 2016-08-22 14:04 ` Neil Armstrong 2016-08-22 14:10 ` Linus Walleij 0 siblings, 1 reply; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 14:04 UTC (permalink / raw) To: linus-amlogic On 08/22/2016 04:02 PM, Linus Walleij wrote: > On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > >> Add support for PWM pins, for EE and AO domains. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > The $SUBJECT of this patch is titallyt wrong, it should be > just pinctrl: (something). > > Should I fix it up or would you like to resend? > > It looks nice otherwise. > > Yours, > Linus Walleij > Hi Linus, Yes, sorry I missed the subject. If you can fixup, it would be great ! Thanks, Neil ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 14:04 ` Neil Armstrong @ 2016-08-22 14:10 ` Linus Walleij 2016-08-22 14:11 ` Neil Armstrong 2016-08-22 14:28 ` Neil Armstrong 0 siblings, 2 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-22 14:10 UTC (permalink / raw) To: linus-amlogic On Mon, Aug 22, 2016 at 4:04 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > On 08/22/2016 04:02 PM, Linus Walleij wrote: >> On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >>> Add support for PWM pins, for EE and AO domains. >>> >>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> >> The $SUBJECT of this patch is titallyt wrong, it should be >> just pinctrl: (something). >> >> Should I fix it up or would you like to resend? >> >> It looks nice otherwise. >> >> Yours, >> Linus Walleij >> > > Hi Linus, > > Yes, sorry I missed the subject. > > If you can fixup, it would be great ! Hm I tried but the patch does not apply on my "devel" branch in pinctrl. I chicken out and ask you to rebase it, there are a few other patches to this driver in the devel branch. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 14:10 ` Linus Walleij @ 2016-08-22 14:11 ` Neil Armstrong 2016-08-22 14:28 ` Neil Armstrong 1 sibling, 0 replies; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 14:11 UTC (permalink / raw) To: linus-amlogic On 08/22/2016 04:10 PM, Linus Walleij wrote: > On Mon, Aug 22, 2016 at 4:04 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: >> On 08/22/2016 04:02 PM, Linus Walleij wrote: >>> On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: >>> >>>> Add support for PWM pins, for EE and AO domains. >>>> >>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>> >>> The $SUBJECT of this patch is titallyt wrong, it should be >>> just pinctrl: (something). >>> >>> Should I fix it up or would you like to resend? >>> >>> It looks nice otherwise. >>> >>> Yours, >>> Linus Walleij >>> >> >> Hi Linus, >> >> Yes, sorry I missed the subject. >> >> If you can fixup, it would be great ! > > Hm I tried but the patch does not apply on my "devel" branch > in pinctrl. I chicken out and ask you to rebase it, there are a few > other patches to this driver in the devel branch. > > Yours, > Linus Walleij > Ok no problem, I'll repost. Neil ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM 2016-08-22 14:10 ` Linus Walleij 2016-08-22 14:11 ` Neil Armstrong @ 2016-08-22 14:28 ` Neil Armstrong 1 sibling, 0 replies; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 14:28 UTC (permalink / raw) To: linus-amlogic On 08/22/2016 04:10 PM, Linus Walleij wrote: > On Mon, Aug 22, 2016 at 4:04 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: >> On 08/22/2016 04:02 PM, Linus Walleij wrote: >>> On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: >>> >>>> Add support for PWM pins, for EE and AO domains. >>>> >>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>> >>> The $SUBJECT of this patch is titallyt wrong, it should be >>> just pinctrl: (something). >>> >>> Should I fix it up or would you like to resend? >>> >>> It looks nice otherwise. >>> >>> Yours, >>> Linus Walleij >>> >> >> Hi Linus, >> >> Yes, sorry I missed the subject. >> >> If you can fixup, it would be great ! > > Hm I tried but the patch does not apply on my "devel" branch > in pinctrl. I chicken out and ask you to rebase it, there are a few > other patches to this driver in the devel branch. > > Yours, > Linus Walleij > Hi, This patch applies perfectly on the current kernel/git/linusw/linux-gpio.git devel branch at 7d9e59ce761f2ebe0bf57e6467cc13d932ee109b "gpio: wcove-gpio: add get_direction method". When I rebase, the patch stays identical. Neil ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes 2016-08-22 12:54 [PATCH 0/2] pinctrl: meson-gxbb: Export pins for PWMs Neil Armstrong 2016-08-22 12:54 ` [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM Neil Armstrong @ 2016-08-22 12:54 ` Neil Armstrong 2016-08-22 14:03 ` Linus Walleij 1 sibling, 1 reply; 9+ messages in thread From: Neil Armstrong @ 2016-08-22 12:54 UTC (permalink / raw) To: linus-amlogic Add DT nodes for PWMs in EE and AO domains. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 77 +++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index e3f4d36..0677eca 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -224,6 +224,34 @@ function = "uart_ao"; }; }; + + pwm_ao_a_3_pins: pwm_ao_a_3 { + mux { + groups = "pwm_ao_a_3"; + function = "pwm_ao_a_3"; + }; + }; + + pwm_ao_a_6_pins: pwm_ao_a_6 { + mux { + groups = "pwm_ao_a_6"; + function = "pwm_ao_a_6"; + }; + }; + + pwm_ao_a_12_pins: pwm_ao_a_12 { + mux { + groups = "pwm_ao_a_12"; + function = "pwm_ao_a_12"; + }; + }; + + pwm_ao_b_pins: pwm_ao_b { + mux { + groups = "pwm_ao_b"; + function = "pwm_ao_b"; + }; + }; }; uart_AO: serial at 4c0 { @@ -334,6 +362,55 @@ function = "eth"; }; }; + + pwm_a_x_pins: pwm_a_x { + mux { + groups = "pwm_a_x"; + function = "pwm_a_x"; + }; + }; + + pwm_a_y_pins: pwm_a_y { + mux { + groups = "pwm_a_y"; + function = "pwm_a_y"; + }; + }; + + pwm_b_pins: pwm_b { + mux { + groups = "pwm_b"; + function = "pwm_b"; + }; + }; + + pwm_d_pins: pwm_d { + mux { + groups = "pwm_d"; + function = "pwm_d"; + }; + }; + + pwm_e_pins: pwm_e { + mux { + groups = "pwm_e"; + function = "pwm_e"; + }; + }; + + pwm_f_x_pins: pwm_f_x { + mux { + groups = "pwm_f_x"; + function = "pwm_f_x"; + }; + }; + + pwm_f_y_pins: pwm_f_y { + mux { + groups = "pwm_f_y"; + function = "pwm_f_y"; + }; + }; }; }; -- 1.9.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes 2016-08-22 12:54 ` [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes Neil Armstrong @ 2016-08-22 14:03 ` Linus Walleij 0 siblings, 0 replies; 9+ messages in thread From: Linus Walleij @ 2016-08-22 14:03 UTC (permalink / raw) To: linus-amlogic On Mon, Aug 22, 2016 at 2:54 PM, Neil Armstrong <narmstrong@baylibre.com> wrote: > Add DT nodes for PWMs in EE and AO domains. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Please merge this through the ARM SoC tree. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-08-22 14:28 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-08-22 12:54 [PATCH 0/2] pinctrl: meson-gxbb: Export pins for PWMs Neil Armstrong 2016-08-22 12:54 ` [PATCH 1/2] ARM64: dts: amlogic: gxbb: pinctrl: add pins for PWM Neil Armstrong 2016-08-22 14:02 ` Linus Walleij 2016-08-22 14:04 ` Neil Armstrong 2016-08-22 14:10 ` Linus Walleij 2016-08-22 14:11 ` Neil Armstrong 2016-08-22 14:28 ` Neil Armstrong 2016-08-22 12:54 ` [PATCH 2/2] ARM64: dts: meson-gxbb: Add PWM pinctrl nodes Neil Armstrong 2016-08-22 14:03 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®