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

Commit 76d25a5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-for-v3.11-2' of... 

Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:
 - Driver fixes for AM33xx, SIRF and PFC pin controllers
 - Fix a compile warning from the pinctrl single-register driver
 - Fix a little nasty memory leak

* tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: fix a memleak when freeing maps
  pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM
  pinctrl: sh-pfc: fix SDHI0 VccQ regulator on sh73a0 with DT
  arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
  pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
  pinctrl: sirf: fix the pin number and mux bit for usp0
  pinctrl: am33xx dt binding: correct include path
parents 6803f37e db6c2c69

arch/arm/boot/dts/atlas6.dtsi

+14 −8
Original line number Original line Diff line number Diff line
@@ -485,6 +485,12 @@ 
                                                sirf,function = "usp0";

                                                sirf,function = "usp0";

                                        };

                                        };

                                };

                                };

				usp0_uart_nostreamctrl_pins_a: usp0@1 {

                                        usp0 {

                                                sirf,pins = "usp0_uart_nostreamctrl_grp";

                                                sirf,function = "usp0_uart_nostreamctrl";

                                        };

                                };

                                usp1_pins_a: usp1@0 {

                                usp1_pins_a: usp1@0 {

                                        usp1 {

                                        usp1 {

                                                sirf,pins = "usp1grp";

                                                sirf,pins = "usp1grp";
@@ -515,16 +521,16 @@ 
                                                sirf,function = "pulse_count";

                                                sirf,function = "pulse_count";

                                        };

                                        };

                                };

                                };

                                cko0_rst_pins_a: cko0_rst@0 {

                                cko0_pins_a: cko0@0 {

                                        cko0_rst {

                                        cko0 {

                                                sirf,pins = "cko0_rstgrp";

                                                sirf,pins = "cko0grp";

                                                sirf,function = "cko0_rst";

                                                sirf,function = "cko0";

                                        };

                                        };

                                };

                                };

                                cko1_rst_pins_a: cko1_rst@0 {

                                cko1_pins_a: cko1@0 {

                                        cko1_rst {

                                        cko1 {

                                                sirf,pins = "cko1_rstgrp";

                                                sirf,pins = "cko1grp";

                                                sirf,function = "cko1_rst";

                                                sirf,function = "cko1";

                                        };

                                        };

                                };

                                };

			};

			};

arch/arm/boot/dts/prima2.dtsi

+8 −8
Original line number Original line Diff line number Diff line
@@ -515,16 +515,16 @@ 
                                                sirf,function = "pulse_count";

                                                sirf,function = "pulse_count";

                                        };

                                        };

                                };

                                };

                                cko0_rst_pins_a: cko0_rst@0 {

                                cko0_pins_a: cko0@0 {

                                        cko0_rst {

                                        cko0 {

                                                sirf,pins = "cko0_rstgrp";

                                                sirf,pins = "cko0grp";

                                                sirf,function = "cko0_rst";

                                                sirf,function = "cko0";

                                        };

                                        };

                                };

                                };

                                cko1_rst_pins_a: cko1_rst@0 {

                                cko1_pins_a: cko1@0 {

                                        cko1_rst {

                                        cko1 {

                                                sirf,pins = "cko1_rstgrp";

                                                sirf,pins = "cko1grp";

                                                sirf,function = "cko1_rst";

                                                sirf,function = "cko1";

                                        };

                                        };

                                };

                                };

			};

			};

drivers/pinctrl/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1193,6 +1193,7 @@ void pinctrl_unregister_map(struct pinctrl_map const *map) 
	list_for_each_entry(maps_node, &pinctrl_maps, node) {

	list_for_each_entry(maps_node, &pinctrl_maps, node) {

		if (maps_node->maps == map) {

		if (maps_node->maps == map) {

			list_del(&maps_node->node);

			list_del(&maps_node->node);

			kfree(maps_node);

			mutex_unlock(&pinctrl_maps_mutex);

			mutex_unlock(&pinctrl_maps_mutex);

			return;

			return;

		}

		}

drivers/pinctrl/pinctrl-single.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1483,6 +1483,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs) 
	return ret;

	return ret;

}

}





#ifdef CONFIG_PM

static int pinctrl_single_suspend(struct platform_device *pdev,

static int pinctrl_single_suspend(struct platform_device *pdev,

					pm_message_t state)

					pm_message_t state)

{

{
@@ -1505,6 +1506,7 @@ static int pinctrl_single_resume(struct platform_device *pdev) 




	return pinctrl_force_default(pcs->pctl);

	return pinctrl_force_default(pcs->pctl);

}

}

#endif





static int pcs_probe(struct platform_device *pdev)

static int pcs_probe(struct platform_device *pdev)

{

{

drivers/pinctrl/sh-pfc/pfc-sh73a0.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -3785,6 +3785,7 @@ static const struct regulator_desc sh73a0_vccq_mc0_desc = { 




static struct regulator_consumer_supply sh73a0_vccq_mc0_consumers[] = {

static struct regulator_consumer_supply sh73a0_vccq_mc0_consumers[] = {

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),

	REGULATOR_SUPPLY("vqmmc", "ee100000.sdhi"),

};

};





static const struct regulator_init_data sh73a0_vccq_mc0_init_data = {

static const struct regulator_init_data sh73a0_vccq_mc0_init_data = {