Skip to content

Commit 500af1d

Browse files
torvaldstorvalds
committed
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
2 parents 297d911 + 16066e2 commit 500af1d

File tree

24 files changed

+67
-970
lines changed

24 files changed

+67
-970
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4634,6 +4634,7 @@ F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
46344634
F: drivers/pci/controller/pcie-brcmstb.c
46354635
F: drivers/staging/vc04_services
46364636
N: bcm2711
4637+
N: bcm2712
46374638
N: bcm283*
46384639
N: raspberrypi
46394640

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
sync-edge = <0>;
6161
sync-ctrl = <1>;
6262
raster-order = <0>;
63-
fifo-th = <0>;
63+
fifo-th = <1>;
6464
};
6565

6666
display-timings {

‎arch/arm/common/sa1111.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ static int sa1111_gpio_get(struct gpio_chip *gc, unsigned offset)
563563
return !!(readl_relaxed(reg + SA1111_GPIO_PXDRR) & mask);
564564
}
565565

566-
static void sa1111_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
566+
static int sa1111_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)
567567
{
568568
struct sa1111 *sachip = gc_to_sa1111(gc);
569569
unsigned long flags;
@@ -574,6 +574,8 @@ static void sa1111_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
574574
sa1111_gpio_modify(reg + SA1111_GPIO_PXDWR, mask, value ? mask : 0);
575575
sa1111_gpio_modify(reg + SA1111_GPIO_PXSSR, mask, value ? mask : 0);
576576
spin_unlock_irqrestore(&sachip->lock, flags);
577+
578+
return 0;
577579
}
578580

579581
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)
613615
sachip->gc.direction_input = sa1111_gpio_direction_input;
614616
sachip->gc.direction_output = sa1111_gpio_direction_output;
615617
sachip->gc.get = sa1111_gpio_get;
616-
sachip->gc.set = sa1111_gpio_set;
618+
sachip->gc.set_rv = sa1111_gpio_set;
617619
sachip->gc.set_multiple = sa1111_gpio_set_multiple;
618620
sachip->gc.to_irq = sa1111_gpio_to_irq;
619621
sachip->gc.base = -1;

‎arch/arm/common/scoop.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ static void __scoop_gpio_set(struct scoop_dev *sdev,
6363
iowrite16(gpwr, sdev->base + SCOOP_GPWR);
6464
}
6565

66-
static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
66+
static int scoop_gpio_set(struct gpio_chip *chip, unsigned int offset,
67+
int value)
6768
{
6869
struct scoop_dev *sdev = gpiochip_get_data(chip);
6970
unsigned long flags;
@@ -73,6 +74,8 @@ static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
7374
__scoop_gpio_set(sdev, offset, value);
7475

7576
spin_unlock_irqrestore(&sdev->scoop_lock, flags);
77+
78+
return 0;
7679
}
7780

7881
static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -215,7 +218,7 @@ static int scoop_probe(struct platform_device *pdev)
215218
devptr->gpio.label = dev_name(&pdev->dev);
216219
devptr->gpio.base = inf->gpio_base;
217220
devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */
218-
devptr->gpio.set = scoop_gpio_set;
221+
devptr->gpio.set_rv = scoop_gpio_set;
219222
devptr->gpio.get = scoop_gpio_get;
220223
devptr->gpio.direction_input = scoop_gpio_direction_input;
221224
devptr->gpio.direction_output = scoop_gpio_direction_output;

‎arch/arm/configs/davinci_all_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
1414
CONFIG_ARCH_MULTI_V5=y
1515
# CONFIG_ARCH_MULTI_V7 is not set
1616
CONFIG_ARCH_DAVINCI=y
17-
CONFIG_ARCH_DAVINCI_DA830=y
1817
CONFIG_ARCH_DAVINCI_DA850=y
1918
CONFIG_DAVINCI_MUX_DEBUG=y
2019
CONFIG_DAVINCI_MUX_WARNINGS=y

‎arch/arm/configs/multi_v5_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_MACH_ASPEED_G4=y
1212
CONFIG_ARCH_AT91=y
1313
CONFIG_SOC_AT91SAM9=y
1414
CONFIG_ARCH_DAVINCI=y
15-
CONFIG_ARCH_DAVINCI_DA830=y
1615
CONFIG_ARCH_DAVINCI_DA850=y
1716
CONFIG_ARCH_MXC=y
1817
CONFIG_SOC_IMX25=y

‎arch/arm/configs/omap2plus_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,7 @@ CONFIG_LEDS_LP5523=m
608608
CONFIG_LEDS_PCA963X=m
609609
CONFIG_LEDS_PWM=m
610610
CONFIG_LEDS_BD2606MVV=m
611+
CONFIG_LEDS_TCA6507=m
611612
CONFIG_LEDS_TRIGGERS=y
612613
CONFIG_LEDS_TRIGGER_TIMER=m
613614
CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -642,17 +643,24 @@ CONFIG_TI_EMIF_SRAM=m
642643
CONFIG_IIO=m
643644
CONFIG_IIO_SW_DEVICE=m
644645
CONFIG_IIO_SW_TRIGGER=m
646+
CONFIG_BMA180=m
647+
CONFIG_BMC150_ACCEL=m
645648
CONFIG_IIO_ST_ACCEL_3AXIS=m
646649
CONFIG_KXCJK1013=m
647650
CONFIG_CPCAP_ADC=m
648651
CONFIG_INA2XX_ADC=m
649652
CONFIG_TI_AM335X_ADC=m
650653
CONFIG_TWL4030_MADC=m
651654
CONFIG_TWL6030_GPADC=m
655+
CONFIG_BMG160=m
652656
CONFIG_MPU3050_I2C=m
657+
CONFIG_ITG3200=m
658+
CONFIG_BOSCH_BNO055_I2C=m
653659
CONFIG_INV_MPU6050_I2C=m
654660
CONFIG_SENSORS_ISL29028=m
655661
CONFIG_AK8975=m
662+
CONFIG_BMC150_MAGN_I2C=m
663+
CONFIG_SENSORS_HMC5843_I2C=m
656664
CONFIG_BMP280=m
657665
CONFIG_PWM=y
658666
CONFIG_PWM_OMAP_DMTIMER=m

‎arch/arm/mach-davinci/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ if ARCH_DAVINCI
1919

2020
comment "DaVinci Core Type"
2121

22-
config ARCH_DAVINCI_DA830
23-
bool "DA830/OMAP-L137/AM17x based system"
24-
select ARCH_DAVINCI_DA8XX
25-
# needed on silicon revs 1.0, 1.1:
26-
select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
27-
select DAVINCI_CP_INTC
28-
2922
config ARCH_DAVINCI_DA850
3023
bool "DA850/OMAP-L138/AM18x based system"
3124
select ARCH_DAVINCI_DA8XX

‎arch/arm/mach-davinci/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ obj-y := common.o sram.o devices-da8xx.o
1010
obj-$(CONFIG_DAVINCI_MUX) += mux.o
1111

1212
# Chip specific
13-
obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o
1413
obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o pdata-quirks.o
1514

1615
obj-y += da8xx-dt.o

‎arch/arm/mach-davinci/cputype.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ struct davinci_id {
2525
};
2626

2727
/* Can use lower 16 bits of cpu id for a variant when required */
28-
#define DAVINCI_CPU_ID_DA830 0x08300000
2928
#define DAVINCI_CPU_ID_DA850 0x08500000
3029

3130
#endif

0 commit comments

Comments
 (0)