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

Commit 5f63517c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pincontrol fixes from Linus Walleij:
 "A first set of pin control fixes for the v3.15 series:

   - Fix a couple of barnsjukdomar on the Rockchip driver.

   - Remove an idiotic debug print I happened to leave behind in the
     Nomadik driver.

   - Fixup the Qualcomm MSM interrupt handling code for the TLMM v2.

   - Three patches renaming the Broadcom Capri driver to BCM28155.  This
     has been falling between the chairs for some time due to some
     cross-tree synchronization misunderstandings, now I'm fed up with
     this and just rename it in this -rc1 phase"

* tag 'pinctrl-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: fix typo in bindings documentation
  Update bcm_defconfig with new pinctrl CONFIG
  pinctrl: Rename Broadcom Capri pinctrl driver
  pinctrl: msm: Correct interrupt code for TLMM v2
  pinctrl: nomadik: delete stray debug print
  pinctrl: rockchip: handle first half of rk3188-bank0 correctly
  pinctrl: rockchip: add return value to rockchip_set_mux
  pinctrl: rockchip: fix offset of mux registers for rk3188
parents 0f689a33 dc4bb474

Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ Optional Properties (for HDMI pins): 
Example:

// pin controller node

pinctrl@35004800 {

	compatible = "brcmbcm11351-pinctrl";

	compatible = "brcm,bcm11351-pinctrl";

	reg = <0x35004800 0x430>;



	// pin configuration node

arch/arm/configs/bcm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ CONFIG_CRC_ITU_T=y 
CONFIG_CRC7=y

CONFIG_XZ_DEC=y

CONFIG_AVERAGE=y

CONFIG_PINCTRL_CAPRI=y

CONFIG_PINCTRL_BCM281XX=y

CONFIG_WATCHDOG=y

CONFIG_BCM_KONA_WDT=y

CONFIG_BCM_KONA_WDT_DEBUG=y

drivers/pinctrl/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -104,16 +104,16 @@ config PINCTRL_BCM2835 
	select PINMUX

	select PINCONF



config PINCTRL_CAPRI

	bool "Broadcom Capri pinctrl driver"

config PINCTRL_BCM281XX

	bool "Broadcom BCM281xx pinctrl driver"

	depends on OF

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select REGMAP_MMIO

	help

	  Say Y here to support Broadcom Capri pinctrl driver, which is used for

	  the BCM281xx SoC family, including BCM11130, BCM11140, BCM11351,

	  Say Y here to support Broadcom BCM281xx pinctrl driver, which is used

	  for the BCM281xx SoC family, including BCM11130, BCM11140, BCM11351,

	  BCM28145, and BCM28155 SoCs.  This driver requires the pinctrl

	  framework.  GPIO is provided by a separate GPIO driver.

drivers/pinctrl/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ obj-$(CONFIG_PINCTRL_BF60x) += pinctrl-adi2-bf60x.o 
obj-$(CONFIG_PINCTRL_AT91)	+= pinctrl-at91.o

obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o

obj-$(CONFIG_PINCTRL_BAYTRAIL)	+= pinctrl-baytrail.o

obj-$(CONFIG_PINCTRL_CAPRI)	+= pinctrl-capri.o

obj-$(CONFIG_PINCTRL_BCM281XX)	+= pinctrl-bcm281xx.o

obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o

obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o

obj-$(CONFIG_PINCTRL_IMX27)	+= pinctrl-imx27.o

drivers/pinctrl/pinctrl-bcm281xx.c

0 → 100644
+1461 −0

File added.

Preview size limit exceeded, changes collapsed.