Commit ecbe5086 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Olof Johansson:
 "Likely our final small batch of fixes for 5.2:

   - Some fixes for USB on davinci, regressions were due to the recent
     conversion of the OCHI driver to use GPIO regulators

   - A fixup of kconfig dependencies for a TI irq controller

   - A switch of armada-38x to avoid dropped characters on uart, caused
     by switch of base inherited platform description earlier this year"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: davinci: da830-evm: fix GPIO lookup for OHCI
  ARM: davinci: omapl138-hawk: add missing regulator constraints for OHCI
  ARM: davinci: da830-evm: add missing regulator constraints for OHCI
  soc: ti: fix irq-ti-sci link error
  ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
parents cde357c3 2659dc8d

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -336,3 +336,11 @@ 
	status = "disabled";

};



&uart0 {

	compatible = "marvell,armada-38x-uart";

};



&uart1 {

	compatible = "marvell,armada-38x-uart";

};

arch/arm/mach-davinci/board-da830-evm.c

+4 −1
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ static struct regulator_consumer_supply da830_evm_usb_supplies[] = { 
static struct regulator_init_data da830_evm_usb_vbus_data = {

	.consumer_supplies	= da830_evm_usb_supplies,

	.num_consumer_supplies	= ARRAY_SIZE(da830_evm_usb_supplies),

	.constraints    = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

};



static struct fixed_voltage_config da830_evm_usb_vbus = {
@@ -88,7 +91,7 @@ static struct gpiod_lookup_table da830_evm_usb_oc_gpio_lookup = { 
static struct gpiod_lookup_table da830_evm_usb_vbus_gpio_lookup = {

	.dev_id		= "reg-fixed-voltage.0",

	.table = {

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0),

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, NULL, 0),

		{ }

	},

};

arch/arm/mach-davinci/board-omapl138-hawk.c

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ static struct regulator_consumer_supply hawk_usb_supplies[] = { 
static struct regulator_init_data hawk_usb_vbus_data = {

	.consumer_supplies	= hawk_usb_supplies,

	.num_consumer_supplies	= ARRAY_SIZE(hawk_usb_supplies),

	.constraints    = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

};



static struct fixed_voltage_config hawk_usb_vbus = {

drivers/soc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ 
obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/

obj-y				+= sunxi/

obj-$(CONFIG_ARCH_TEGRA)	+= tegra/

obj-$(CONFIG_SOC_TI)		+= ti/

obj-y				+= ti/

obj-$(CONFIG_ARCH_U8500)	+= ux500/

obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/

obj-y				+= xilinx/

drivers/soc/ti/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ config TI_SCI_PM_DOMAINS 
	  called ti_sci_pm_domains. Note this is needed early in boot before

	  rootfs may be available.



endif # SOC_TI



config TI_SCI_INTA_MSI_DOMAIN

	bool

	select GENERIC_MSI_IRQ_DOMAIN

	help

	  Driver to enable Interrupt Aggregator specific MSI Domain.
 


endif # SOC_TI

CRA Git | Maintained and supported by SUSTech CRA and CCSE