tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ecbe5086 cde357c3

+18 -4
+8
arch/arm/boot/dts/armada-xp-98dx3236.dtsi
··· 336 336 status = "disabled"; 337 337 }; 338 338 339 + &uart0 { 340 + compatible = "marvell,armada-38x-uart"; 341 + }; 342 + 343 + &uart1 { 344 + compatible = "marvell,armada-38x-uart"; 345 + }; 346 +
+4 -1
arch/arm/mach-davinci/board-da830-evm.c
··· 61 61 static struct regulator_init_data da830_evm_usb_vbus_data = { 62 62 .consumer_supplies = da830_evm_usb_supplies, 63 63 .num_consumer_supplies = ARRAY_SIZE(da830_evm_usb_supplies), 64 + .constraints = { 65 + .valid_ops_mask = REGULATOR_CHANGE_STATUS, 66 + }, 64 67 }; 65 68 66 69 static struct fixed_voltage_config da830_evm_usb_vbus = { ··· 91 88 static struct gpiod_lookup_table da830_evm_usb_vbus_gpio_lookup = { 92 89 .dev_id = "reg-fixed-voltage.0", 93 90 .table = { 94 - GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0), 91 + GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, NULL, 0), 95 92 { } 96 93 }, 97 94 };
+3
arch/arm/mach-davinci/board-omapl138-hawk.c
··· 306 306 static struct regulator_init_data hawk_usb_vbus_data = { 307 307 .consumer_supplies = hawk_usb_supplies, 308 308 .num_consumer_supplies = ARRAY_SIZE(hawk_usb_supplies), 309 + .constraints = { 310 + .valid_ops_mask = REGULATOR_CHANGE_STATUS, 311 + }, 309 312 }; 310 313 311 314 static struct fixed_voltage_config hawk_usb_vbus = {
+1 -1
drivers/soc/Makefile
··· 22 22 obj-$(CONFIG_SOC_SAMSUNG) += samsung/ 23 23 obj-y += sunxi/ 24 24 obj-$(CONFIG_ARCH_TEGRA) += tegra/ 25 - obj-$(CONFIG_SOC_TI) += ti/ 25 + obj-y += ti/ 26 26 obj-$(CONFIG_ARCH_U8500) += ux500/ 27 27 obj-$(CONFIG_PLAT_VERSATILE) += versatile/ 28 28 obj-y += xilinx/
+2 -2
drivers/soc/ti/Kconfig
··· 75 75 called ti_sci_pm_domains. Note this is needed early in boot before 76 76 rootfs may be available. 77 77 78 + endif # SOC_TI 79 + 78 80 config TI_SCI_INTA_MSI_DOMAIN 79 81 bool 80 82 select GENERIC_MSI_IRQ_DOMAIN 81 83 help 82 84 Driver to enable Interrupt Aggregator specific MSI Domain. 83 - 84 - endif # SOC_TI