Commit 500af1de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-arm-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC updates from Arnd Bergmann:
 "The main update in size is the removal of the TI DaVinci DA830 SoC
  support. DA830 is similar to DA850, which remain supported, but only
  the reference board was ever supported, and we removed that one 3
  years ago as it had never been converted to devicetree.

  There are some other cleanups for OMAP4 and a few boards using old
  GPIO interfaces"

* tag 'soc-arm-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: s3c: stop including gpio.h
  ARM: dts: davinci: da850-evm: Increase fifo threshold
  ARM: OMAP2+: Fix l4ls clk domain handling in STANDBY
  ARM: broadcom: MAINTAINERS: Cover bcm2712 files
  bus: ti-sysc: PRUSS OCP configuration
  ARM: davinci: remove support for da830
  ARM: omap: pmic-cpcap: do not mess around without CPCAP or OMAP4
  ARM: omap2plus_defconfig: enable I2C devices of GTA04
  ARM: s3c/gpio: use new line value setter callbacks
  ARM: scoop/gpio: use new line value setter callbacks
  ARM: sa1100/gpio: use new line value setter callbacks
  ARM: orion/gpio: use new line value setter callbacks
parents 297d9111 16066e29

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4634,6 +4634,7 @@ F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml 
F:	drivers/pci/controller/pcie-brcmstb.c

F:	drivers/staging/vc04_services

N:	bcm2711

N:	bcm2712

N:	bcm283*

N:	raspberrypi
































arch/arm/boot/dts/ti/davinci/da850-evm.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -60,7 +60,7 @@ panel-info {







			sync-edge = <0>;









			sync-ctrl = <1>;









			raster-order = <0>;









			fifo-th = <0>;









			fifo-th = <1>;









		};



















		display-timings {
































arch/arm/common/sa1111.c



+4
−2






























Original line number
Diff line number
Diff line







@@ -563,7 +563,7 @@ static int sa1111_gpio_get(struct gpio_chip *gc, unsigned offset)







	return !!(readl_relaxed(reg + SA1111_GPIO_PXDRR) & mask);









}



















static void sa1111_gpio_set(struct gpio_chip *gc, unsigned offset, int value)









static int sa1111_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)









{









	struct sa1111 *sachip = gc_to_sa1111(gc);









	unsigned long flags;








@@ -574,6 +574,8 @@ static void sa1111_gpio_set(struct gpio_chip *gc, unsigned offset, int value)







	sa1111_gpio_modify(reg + SA1111_GPIO_PXDWR, mask, value ? mask : 0);









	sa1111_gpio_modify(reg + SA1111_GPIO_PXSSR, mask, value ? mask : 0);









	spin_unlock_irqrestore(&sachip->lock, flags);



















	return 0;









}



















static void sa1111_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,








@@ -613,7 +615,7 @@ static int sa1111_setup_gpios(struct sa1111 *sachip)







	sachip->gc.direction_input = sa1111_gpio_direction_input;









	sachip->gc.direction_output = sa1111_gpio_direction_output;









	sachip->gc.get = sa1111_gpio_get;









	sachip->gc.set = sa1111_gpio_set;









	sachip->gc.set_rv = sa1111_gpio_set;









	sachip->gc.set_multiple = sa1111_gpio_set_multiple;









	sachip->gc.to_irq = sa1111_gpio_to_irq;









	sachip->gc.base = -1;
































arch/arm/common/scoop.c



+5
−2






























Original line number
Diff line number
Diff line







@@ -63,7 +63,8 @@ static void __scoop_gpio_set(struct scoop_dev *sdev,







	iowrite16(gpwr, sdev->base + SCOOP_GPWR);









}



















static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)









static int scoop_gpio_set(struct gpio_chip *chip, unsigned int offset,









			  int value)









{









	struct scoop_dev *sdev = gpiochip_get_data(chip);









	unsigned long flags;








@@ -73,6 +74,8 @@ static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)







	__scoop_gpio_set(sdev, offset, value);



















	spin_unlock_irqrestore(&sdev->scoop_lock, flags);



















	return 0;









}



















static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)








@@ -215,7 +218,7 @@ static int scoop_probe(struct platform_device *pdev)







		devptr->gpio.label = dev_name(&pdev->dev);









		devptr->gpio.base = inf->gpio_base;









		devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */









		devptr->gpio.set = scoop_gpio_set;









		devptr->gpio.set_rv = scoop_gpio_set;









		devptr->gpio.get = scoop_gpio_get;









		devptr->gpio.direction_input = scoop_gpio_direction_input;









		devptr->gpio.direction_output = scoop_gpio_direction_output;
































arch/arm/configs/davinci_all_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -14,7 +14,6 @@ CONFIG_ARCH_MULTIPLATFORM=y







CONFIG_ARCH_MULTI_V5=y









# CONFIG_ARCH_MULTI_V7 is not set









CONFIG_ARCH_DAVINCI=y









CONFIG_ARCH_DAVINCI_DA830=y









CONFIG_ARCH_DAVINCI_DA850=y









CONFIG_DAVINCI_MUX_DEBUG=y









CONFIG_DAVINCI_MUX_WARNINGS=y