* [PATCH 00/36] ARM: samsung platform cleanup
@ 2019-10-10 20:28 Arnd Bergmann
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski
0 siblings, 2 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:28 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski
Cc: linux-hwmon, linux-pwm, linux-fbdev, linux-samsung-soc,
Arnd Bergmann, linux-pm, patches, linux-usb, linux-mmc,
linux-kernel, dri-devel, linux-clk, alsa-devel, linux-leds,
linux-serial, linux-input, linux-spi, linux-stm32,
linux-arm-kernel
I've spent some time looking at the remaining ARMv4/ARMv5 platforms
that are not part of ARCH_MULTIPLATFORM, and tried to get them closer
to that. Here is what came out of that for the samsung platforms:
* Exynos and s5pv210 are made independent of plat-samsung
* device drivers stop using mach/*.h headers for s3c24xx
(and other platforms not in this series)
* s3c24xx and s3c64xx get merged into mach-s3c, removing
the need for plat-samsung (I have other patches for the
remaining plat-* directories)
* mach/io.h gets cleaned up to only be needed for BAST
PC104 mode (looking for ideas to proceed)
* mach/irqs.h remains for now, this still needs to be converted
to sparse IRQs.
Some bits are a little ugly, but overall I think this a big
improvement.
The contents are available for testing in
git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git s3c-multiplatform
Given the overall size of the series I expect that there will
be bugs, so at this points I'm looking for reviews, acks and
testing from anyone who still has the hardware, in particular
s3c24xx, but also the other samsung platforms I'm touching.
Arnd
Arnd Bergmann (36):
ARM: samsung: make S3C24XX_MISCCR access indirect
ARM: s3c: simplify mach/io.h
usb: gadget: s3c: use platform resources
usb: gadget: s3c-hsudc: remove platform header dependency
ARM: samsung: make pm-debug platform independent
ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug
ARM: exynos: use private samsung_cpu_id copy
ARM: exynos: stop selecting PLAT_SAMSUNG
ARM: samsung: move pm check code to drivers/soc
ARM: s5pv210: use private pm save/restore
ARM: s5pv210: split from plat-samsung
ARM: s3c64xx: remove mach/hardware.h
ARM: s3c: move regs-spi.h into spi driver
ARM: s3c: move irqchip driver back into platform
ARM: s3c: adc: move header to linux/soc/samsung
ARM: s3c: move spi fiq handler into platform
ARM: s3c: h1940-audio: turn into platform driver
ARM: s3c: gta02-audio: turn into platform driver
ARM: s3c: rx1950: turn into platform driver
ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS
ARM: s3c: move iis pinctrl config into boards
ARM: s3c: leds: move setpull() calls into board files
ARM: s3c: move s3cmci pinctrl handling into board files
ARM: s3c: include mach/irqs.h where needed
ARM: s3c: spi: avoid hardcoding fiq number in driver
ARM: s3c: bast: avoid irq_desc array usage
ARM: s3c: fix mmc gpio lookup tables
fbdev: s3c2410fb: remove mach header dependency
ARM: s3c: cpufreq: split out registers
ARM: s3c: remove cpufreq header dependencies
ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh
ARM: s3c: iotiming: make functions static
ARM: s3c: move low-level clk reg access into platform code
ARM: s3c: stop including mach/hardware.h from mach/io.h
ARM: s3c: move into a common directory
ARM: s3c: make headers local if possible
MAINTAINERS | 16 +-
arch/arm/Kconfig | 5 +-
arch/arm/Kconfig.debug | 18 +-
arch/arm/Makefile | 7 +-
arch/arm/mach-exynos/Makefile | 4 -
arch/arm/mach-exynos/common.h | 6 +-
arch/arm/mach-exynos/exynos.c | 19 +-
arch/arm/mach-exynos/include/mach/map.h | 18 --
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-exynos/pm.c | 8 +-
arch/arm/{plat-samsung => mach-s3c}/Kconfig | 62 +----
.../Kconfig => mach-s3c/Kconfig.s3c24xx} | 0
.../Kconfig => mach-s3c/Kconfig.s3c64xx} | 0
arch/arm/{plat-samsung => mach-s3c}/Makefile | 15 +-
.../{mach-s3c24xx => mach-s3c}/Makefile.boot | 0
.../Makefile => mach-s3c/Makefile.s3c24xx} | 15 +-
.../Makefile => mach-s3c/Makefile.s3c64xx} | 14 +-
.../include/plat => mach-s3c}/adc-core.h | 0
arch/arm/{plat-samsung => mach-s3c}/adc.c | 4 +-
arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h | 0
.../arm/{mach-s3c64xx => mach-s3c}/ata-core.h | 0
.../{mach-s3c64xx => mach-s3c}/backlight.h | 0
.../arm/{mach-s3c24xx => mach-s3c}/bast-ide.c | 3 +-
.../arm/{mach-s3c24xx => mach-s3c}/bast-irq.c | 8 +-
arch/arm/{mach-s3c24xx => mach-s3c}/bast.h | 0
.../{mach-s3c24xx => mach-s3c}/common-smdk.c | 17 +-
.../{mach-s3c24xx => mach-s3c}/common-smdk.h | 0
arch/arm/{plat-samsung => mach-s3c}/cpu.c | 21 +-
.../include/plat => mach-s3c}/cpu.h | 11 -
.../cpufreq-utils.c | 38 +++-
arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c | 4 +-
.../arm/{mach-s3c64xx => mach-s3c}/crag6410.h | 2 +-
.../{mach-s3c64xx => mach-s3c}/dev-audio.c | 9 +-
.../dev-backlight.c | 4 +-
.../dev-uart-s3c64xx.c} | 5 +-
.../arm/{plat-samsung => mach-s3c}/dev-uart.c | 2 +-
arch/arm/{plat-samsung => mach-s3c}/devs.c | 56 +++--
.../include/plat => mach-s3c}/devs.h | 0
.../mach/dma.h => mach-s3c/dma-s3c24xx.h} | 0
.../mach/dma.h => mach-s3c/dma-s3c64xx.h} | 0
arch/arm/mach-s3c/dma.h | 7 +
arch/arm/{mach-s3c24xx => mach-s3c}/fb-core.h | 0
.../include/plat => mach-s3c}/fb.h | 0
.../plat => mach-s3c}/gpio-cfg-helpers.h | 0
.../include/plat => mach-s3c}/gpio-cfg.h | 0
.../include/plat => mach-s3c}/gpio-core.h | 2 +-
.../gpio-samsung-s3c24xx.h} | 2 +
.../gpio-samsung-s3c64xx.h} | 0
.../{plat-samsung => mach-s3c}/gpio-samsung.c | 18 +-
arch/arm/mach-s3c/gpio-samsung.h | 7 +
arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h | 2 +-
.../h1940-bluetooth.c | 7 +-
arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h | 0
.../include/mach => mach-s3c}/hardware.h | 7 -
.../include/plat => mach-s3c}/iic-core.h | 0
arch/arm/mach-s3c/include/mach/io.h | 50 +++++
.../include/mach/irqs-s3c24xx.h} | 0
.../include/mach/irqs-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/irqs.h | 7 +
.../plat => mach-s3c/include/mach}/map-base.h | 0
arch/arm/{plat-samsung => mach-s3c}/init.c | 4 +-
.../iotiming-s3c2410.c | 12 +-
.../iotiming-s3c2412.c | 6 +-
.../irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} | 16 +-
.../irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} | 8 +-
arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 +
.../arm/mach-s3c/irq-s3c24xx-fiq.S | 10 +-
.../arm/mach-s3c}/irq-s3c24xx.c | 23 +-
.../arm/{mach-s3c64xx => mach-s3c}/irq-uart.h | 0
.../include/plat => mach-s3c}/keypad.h | 0
.../mach-amlm5900.c | 37 ++-
.../{mach-s3c24xx => mach-s3c}/mach-anubis.c | 14 +-
.../{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 17 +-
.../mach-at2440evb.c | 28 ++-
.../{mach-s3c24xx => mach-s3c}/mach-bast.c | 22 +-
.../mach-crag6410-module.c | 2 +-
.../mach-crag6410.c | 27 ++-
.../{mach-s3c24xx => mach-s3c}/mach-gta02.c | 57 ++++-
.../{mach-s3c24xx => mach-s3c}/mach-h1940.c | 65 ++++--
.../arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 15 +-
.../{mach-s3c24xx => mach-s3c}/mach-jive.c | 27 ++-
.../mach-mini2440.c | 48 ++--
.../mach-mini6410.c | 22 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 40 +++-
.../arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 13 +-
.../mach-nexcoder.c | 20 +-
.../mach-osiris-dvs.c | 4 +-
.../{mach-s3c24xx => mach-s3c}/mach-osiris.c | 22 +-
.../{mach-s3c24xx => mach-s3c}/mach-otom.c | 17 +-
.../{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 37 ++-
.../mach-real6410.c | 18 +-
.../{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 57 +++--
.../{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 26 ++-
.../mach-s3c2416-dt.c | 8 +-
.../mach-s3c64xx-dt.c | 6 +-
.../{mach-s3c64xx => mach-s3c}/mach-smartq.c | 18 +-
.../{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0
.../{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 18 +-
.../{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 18 +-
.../mach-smdk2410.c | 14 +-
.../mach-smdk2413.c | 21 +-
.../mach-smdk2416.c | 23 +-
.../mach-smdk2440.c | 25 ++-
.../mach-smdk2443.c | 14 +-
.../mach-smdk6400.c | 13 +-
.../mach-smdk6410.c | 23 +-
.../mach-tct_hammer.c | 24 +-
.../{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 20 +-
.../{mach-s3c24xx => mach-s3c}/mach-vstms.c | 20 +-
.../include/plat => mach-s3c}/map-s3c.h | 12 +-
.../mach/map.h => mach-s3c/map-s3c24xx.h} | 6 +-
.../mach/map.h => mach-s3c/map-s3c64xx.h} | 4 +-
.../include/plat => mach-s3c}/map-s5p.h | 4 +-
arch/arm/mach-s3c/map.h | 7 +
.../{mach-s3c24xx => mach-s3c}/nand-core.h | 0
.../{mach-s3c64xx => mach-s3c}/onenand-core.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/otom.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c | 4 +-
.../{plat-samsung => mach-s3c}/platformdata.c | 4 +-
.../{mach-s3c24xx => mach-s3c}/pll-s3c2410.c | 4 +-
.../pll-s3c2440-12000000.c | 4 +-
.../pll-s3c2440-16934400.c | 4 +-
.../{plat-samsung => mach-s3c}/pm-common.c | 2 +-
arch/arm/mach-s3c/pm-common.h | 40 ++++
.../pm-core.h => mach-s3c/pm-core-s3c24xx.h} | 8 +-
.../pm-core.h => mach-s3c/pm-core-s3c64xx.h} | 50 +----
arch/arm/mach-s3c/pm-core.h | 7 +
arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c | 6 +-
.../arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S | 5 +-
.../{mach-s3c24xx => mach-s3c}/pm-s3c2410.c | 11 +-
.../{mach-s3c24xx => mach-s3c}/pm-s3c2412.c | 11 +-
.../{mach-s3c24xx => mach-s3c}/pm-s3c2416.c | 6 +-
.../pm.c => mach-s3c/pm-s3c24xx.c} | 12 +-
.../pm.c => mach-s3c/pm-s3c64xx.c} | 66 +++++-
arch/arm/{plat-samsung => mach-s3c}/pm.c | 20 +-
.../include/plat => mach-s3c}/pm.h | 2 +-
.../include/plat => mach-s3c}/pwm-core.h | 0
.../include/plat => mach-s3c}/regs-adc.h | 0
.../regs-clock-s3c24xx.h} | 2 +
.../regs-clock-s3c64xx.h} | 0
arch/arm/mach-s3c/regs-clock.h | 7 +
.../arm/{mach-s3c24xx => mach-s3c}/regs-dsc.h | 0
.../regs-gpio-memport.h | 0
.../regs-gpio-s3c24xx.h} | 2 +
.../regs-gpio-s3c64xx.h} | 0
arch/arm/mach-s3c/regs-gpio.h | 7 +
.../regs-irq-s3c24xx.h} | 2 +
.../regs-irq-s3c64xx.h} | 0
arch/arm/mach-s3c/regs-irq.h | 7 +
.../include/plat => mach-s3c}/regs-irqtype.h | 0
.../arm/{mach-s3c24xx => mach-s3c}/regs-mem.h | 2 +
.../{mach-s3c64xx => mach-s3c}/regs-modem.h | 0
.../mach => mach-s3c}/regs-s3c2443-clock.h | 50 +++++
.../{mach-s3c64xx => mach-s3c}/regs-srom.h | 0
.../arm/{mach-s3c64xx => mach-s3c}/regs-sys.h | 0
.../regs-syscon-power.h | 0
.../regs-usb-hsotg-phy.h | 0
.../include/mach => mach-s3c}/rtc-core.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c | 21 +-
.../s3c2412-power.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c | 16 +-
.../include/mach => mach-s3c}/s3c2412.h | 2 +
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c | 28 +--
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c | 17 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c | 17 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c | 21 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c | 16 +-
.../common.c => mach-s3c/s3c24xx.c} | 21 +-
.../common.h => mach-s3c/s3c24xx.h} | 1 +
arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c | 14 +-
arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c | 17 +-
.../common.c => mach-s3c/s3c64xx.c} | 24 +-
.../common.h => mach-s3c/s3c64xx.h} | 0
.../include/plat => mach-s3c}/samsung-time.h | 0
.../include/plat => mach-s3c}/sdhci.h | 2 +-
.../{mach-s3c24xx => mach-s3c}/setup-camif.c | 4 +-
.../setup-fb-24bpp.c | 6 +-
.../{mach-s3c24xx => mach-s3c}/setup-i2c.c | 7 +-
.../{mach-s3c64xx => mach-s3c}/setup-i2c0.c | 4 +-
.../{mach-s3c64xx => mach-s3c}/setup-i2c1.c | 4 +-
.../{mach-s3c64xx => mach-s3c}/setup-ide.c | 8 +-
.../{mach-s3c64xx => mach-s3c}/setup-keypad.c | 6 +-
.../setup-sdhci-gpio-s3c24xx.c} | 6 +-
.../setup-sdhci-gpio-s3c64xx.c} | 6 +-
.../setup-spi-s3c24xx.c} | 6 +-
.../setup-spi-s3c64xx.c} | 4 +-
.../arm/{mach-s3c24xx => mach-s3c}/setup-ts.c | 5 +-
.../setup-usb-phy.c | 6 +-
.../{mach-s3c24xx => mach-s3c}/simtec-audio.c | 11 +-
.../{mach-s3c24xx => mach-s3c}/simtec-nor.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/simtec-pm.c | 8 +-
.../{mach-s3c24xx => mach-s3c}/simtec-usb.c | 6 +-
arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h | 0
.../sleep-s3c2410.S | 7 +-
.../sleep-s3c2412.S | 5 +-
.../sleep.S => mach-s3c/sleep-s3c24xx.S} | 7 +-
.../sleep.S => mach-s3c/sleep-s3c64xx.S} | 4 +-
.../arm/{mach-s3c24xx => mach-s3c}/spi-core.h | 0
.../include/plat => mach-s3c}/usb-phy.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h | 0
.../{plat-samsung => mach-s3c}/wakeup-mask.c | 4 +-
.../include/plat => mach-s3c}/wakeup-mask.h | 0
.../watchdog-reset.c | 0
.../watchdog-reset.h | 0
arch/arm/mach-s3c24xx/include/mach/fb.h | 2 -
arch/arm/mach-s3c24xx/include/mach/io.h | 212 ------------------
arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 --
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/Makefile | 7 -
arch/arm/mach-s5pv210/pm.c | 51 ++++-
arch/arm/mach-s5pv210/regs-clock.h | 2 +-
arch/arm/mach-s5pv210/s5pv210.c | 2 -
drivers/clk/samsung/clk-s3c2410-dclk.c | 10 +-
drivers/cpufreq/s3c2410-cpufreq.c | 10 +-
drivers/cpufreq/s3c2412-cpufreq.c | 44 ++--
drivers/cpufreq/s3c2440-cpufreq.c | 29 ++-
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +-
drivers/cpufreq/s3c24xx-cpufreq.c | 14 +-
drivers/hwmon/s3c-hwmon.c | 2 +-
drivers/input/touchscreen/s3c2410_ts.c | 37 ++-
drivers/irqchip/Makefile | 1 -
drivers/leds/leds-s3c24xx.c | 7 -
drivers/mmc/host/Kconfig | 2 +-
drivers/mmc/host/s3cmci.c | 72 ++----
drivers/power/supply/s3c_adc_battery.c | 2 +-
drivers/pwm/Kconfig | 2 +-
drivers/soc/samsung/Kconfig | 48 +++-
drivers/soc/samsung/Makefile | 3 +
.../soc/samsung/s3c-pm-check.c | 2 +-
.../soc/samsung/s3c-pm-debug.c | 26 +--
drivers/spi/Kconfig | 2 +-
drivers/spi/Makefile | 1 -
.../spi/spi-s3c24xx-regs.h | 3 +-
drivers/spi/spi-s3c24xx.c | 28 +--
drivers/tty/serial/Kconfig | 2 +-
drivers/usb/gadget/udc/s3c-hsudc.c | 55 +----
drivers/usb/gadget/udc/s3c2410_udc.c | 31 +--
drivers/usb/gadget/udc/s3c2410_udc.h | 1 +
.../usb/gadget/udc/s3c2410_udc_regs.h | 2 +
.../video/fbdev/s3c2410fb-regs-lcd.h | 28 +--
drivers/video/fbdev/s3c2410fb.c | 16 +-
.../linux/platform_data}/fb-s3c2410.h | 33 ++-
include/linux/platform_data/mmc-s3cmci.h | 2 +
include/linux/platform_data/s3c-hsudc.h | 2 +
.../linux/soc/samsung/s3c-adc.h | 0
.../linux/soc/samsung/s3c-cpu-freq.h | 0
.../linux/soc/samsung/s3c-cpufreq-core.h | 10 +-
.../linux/soc/samsung/s3c-pm.h | 69 +++---
.../linux/spi/s3c24xx-fiq.h | 5 +
include/linux/spi/s3c24xx.h | 2 +-
sound/soc/samsung/Kconfig | 2 +-
sound/soc/samsung/h1940_uda1380.c | 71 ++----
sound/soc/samsung/neo1973_wm8753.c | 85 +++----
sound/soc/samsung/rx1950_uda1380.c | 72 ++----
sound/soc/samsung/s3c-i2s-v2.c | 3 +-
sound/soc/samsung/s3c-i2s-v2.h | 3 +-
sound/soc/samsung/s3c2412-i2s.c | 9 +-
sound/soc/samsung/s3c24xx-i2s.c | 7 -
259 files changed, 1716 insertions(+), 1648 deletions(-)
delete mode 100644 arch/arm/mach-exynos/include/mach/map.h
rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (73%)
rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (100%)
rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/Makefile (67%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%)
rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (86%)
rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (83%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/adc-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/adc.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/ata-core.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/backlight.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (95%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.c (93%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (62%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/cpu.h (91%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/cpufreq-utils.c (70%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c (96%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (95%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-audio.c (97%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-backlight.c (98%)
rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (95%)
rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (97%)
rename arch/arm/{plat-samsung => mach-s3c}/devs.c (96%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/devs.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/dma-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/dma-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/dma.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/fb-core.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/fb.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg-helpers.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-core.h (99%)
rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c24xx.h} (99%)
rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c64xx.h} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (99%)
create mode 100644 arch/arm/mach-s3c/gpio-samsung.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (94%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/hardware.h (76%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/iic-core.h (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/io.h
rename arch/arm/{mach-s3c24xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/irqs.h
rename arch/arm/{plat-samsung/include/plat => mach-s3c/include/mach}/map-base.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/init.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (98%)
rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (93%)
rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (97%)
create mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c
rename drivers/spi/spi-s3c24xx-fiq.S => arch/arm/mach-s3c/irq-s3c24xx-fiq.S (94%)
rename {drivers/irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/irq-uart.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/keypad.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (84%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (97%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (88%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (90%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (92%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (93%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (93%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (92%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (92%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (89%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (88%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (93%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (90%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (92%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (95%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (97%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (93%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (94%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (89%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (90%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (95%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (89%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (93%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (92%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (82%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (95%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (90%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s3c.h (87%)
rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/map-s3c24xx.h} (97%)
rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/map-s3c64xx.h} (98%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s5p.h (85%)
create mode 100644 arch/arm/mach-s3c/map.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/nand-core.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/onenand-core.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/otom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c (99%)
rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (98%)
rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (98%)
create mode 100644 arch/arm/mach-s3c/pm-common.h
rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} (95%)
rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} (58%)
create mode 100644 arch/arm/mach-s3c/pm-core.h
rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (80%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (95%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (95%)
rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (94%)
rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (83%)
rename arch/arm/{plat-samsung => mach-s3c}/pm.c (94%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pm.h (98%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pwm-core.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-adc.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} (99%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/regs-clock.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-dsc.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-gpio-memport.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} (99%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/regs-gpio.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} (98%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/regs-irq.h
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-irqtype.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-mem.h (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-modem.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/regs-s3c2443-clock.h (81%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-srom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-sys.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-syscon-power.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-usb-hsotg-phy.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/rtc-core.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (90%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (94%)
rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/s3c2412.h (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (88%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (85%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (82%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (89%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (93%)
rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (98%)
rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (89%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (89%)
rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (97%)
rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/samsung-time.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/sdhci.h (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-camif.c (95%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-fb-24bpp.c (86%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-i2c.c (79%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c0.c (90%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c1.c (90%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-ide.c (89%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-keypad.c (86%)
rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (90%)
rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (95%)
rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (85%)
rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (89%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-ts.c (88%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-usb-phy.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (86%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (92%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (96%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (92%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (93%)
rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (92%)
rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (97%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/spi-core.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/usb-phy.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (94%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c}/wakeup-mask.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/watchdog-reset.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/watchdog-reset.h (100%)
delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h
delete mode 100644 arch/arm/mach-s3c24xx/include/mach/io.h
delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h
rename arch/arm/plat-samsung/pm-check.c => drivers/soc/samsung/s3c-pm-check.c (99%)
rename arch/arm/plat-samsung/pm-debug.c => drivers/soc/samsung/s3c-pm-debug.c (78%)
rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (95%)
rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (99%)
rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%)
rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%)
rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (100%)
rename arch/arm/plat-samsung/include/plat/cpu-freq.h => include/linux/soc/samsung/s3c-cpu-freq.h (100%)
rename arch/arm/plat-samsung/include/plat/cpu-freq-core.h => include/linux/soc/samsung/s3c-cpufreq-core.h (96%)
rename arch/arm/plat-samsung/include/plat/pm-common.h => include/linux/soc/samsung/s3c-pm.h (55%)
rename drivers/spi/spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h (78%)
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: patches@opensource.cirrus.com
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-clk@vger.kernel.org
Cc: linux-hwmon@vger.kernel.org
Cc: linux-input@vger.kernel.org
Cc: linux-leds@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-pwm@vger.kernel.org
Cc: linux-spi@vger.kernel.org
Cc: linux-serial@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: alsa-devel@alsa-project.org
--
2.20.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 11/36] ARM: s5pv210: split from plat-samsung
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
@ 2019-10-10 20:29 ` Arnd Bergmann
2019-10-11 5:51 ` Uwe Kleine-König
` (3 more replies)
2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann
` (3 subsequent siblings)
4 siblings, 4 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:29 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, Ulf Hansson, Thierry Reding,
Mark Brown, Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim,
Sylwester Nawrocki, Liam Girdwood
Cc: linux-pwm, alsa-devel, linux-samsung-soc, Arnd Bergmann,
Bartlomiej Zolnierkiewicz, linux-kernel, linus.walleij,
linux-mmc, Takashi Iwai, Jaroslav Kysela, Mauro Carvalho Chehab,
Faiz Abbas, Clément Péron, linux-serial,
Uwe Kleine-König, Olof Johansson, linux-spi, Sascha Hauer,
linux-arm-kernel
These can be build completely independently, so split
the two Kconfig symbols.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/Kconfig.debug | 6 +++---
arch/arm/Makefile | 1 -
arch/arm/plat-samsung/Kconfig | 2 +-
drivers/mmc/host/Kconfig | 2 +-
drivers/pwm/Kconfig | 2 +-
drivers/spi/Kconfig | 2 +-
drivers/tty/serial/Kconfig | 2 +-
sound/soc/samsung/Kconfig | 2 +-
8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9c4f2d6deb06..4c4e97ae4fcb 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -998,7 +998,7 @@ choice
via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
config DEBUG_S3C_UART0
- depends on PLAT_SAMSUNG || ARCH_EXYNOS
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
select DEBUG_EXYNOS_UART if ARCH_EXYNOS
select DEBUG_S3C24XX_UART if ARCH_S3C24XX
select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1010,7 +1010,7 @@ choice
by the boot-loader before use.
config DEBUG_S3C_UART1
- depends on PLAT_SAMSUNG || ARCH_EXYNOS
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
select DEBUG_EXYNOS_UART if ARCH_EXYNOS
select DEBUG_S3C24XX_UART if ARCH_S3C24XX
select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1022,7 +1022,7 @@ choice
by the boot-loader before use.
config DEBUG_S3C_UART2
- depends on PLAT_SAMSUNG || ARCH_EXYNOS
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
select DEBUG_EXYNOS_UART if ARCH_EXYNOS
select DEBUG_S3C24XX_UART if ARCH_S3C24XX
select DEBUG_S3C64XX_UART if ARCH_S3C64XX
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index f492d7c338fe..a1bc15cda751 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
# by CONFIG_* macro name.
plat-$(CONFIG_ARCH_OMAP) += omap
plat-$(CONFIG_ARCH_S3C64XX) += samsung
-plat-$(CONFIG_ARCH_S5PV210) += samsung
plat-$(CONFIG_PLAT_ORION) += orion
plat-$(CONFIG_PLAT_PXA) += pxa
plat-$(CONFIG_PLAT_S3C24XX) += samsung
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 740bdb23f38a..1530946cc672 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -4,7 +4,7 @@
config PLAT_SAMSUNG
bool
- depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
+ depends on PLAT_S3C24XX || ARCH_S3C64XX
default y
select GENERIC_IRQ_CHIP
select NO_IOPORT_MAP
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 400a581c918c..16a0e5430b44 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -275,7 +275,7 @@ config MMC_SDHCI_TEGRA
config MMC_SDHCI_S3C
tristate "SDHCI support on Samsung S3C SoC"
- depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_EXYNOS)
+ depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS)
help
This selects the Secure Digital Host Controller Interface (SDHCI)
often referrered to as the HSMMC block in some of the Samsung S3C
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index e3a2518503ed..8eb738cac0c7 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -394,7 +394,7 @@ config PWM_ROCKCHIP
config PWM_SAMSUNG
tristate "Samsung PWM support"
- depends on PLAT_SAMSUNG || ARCH_EXYNOS
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
help
Generic PWM framework driver for Samsung.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 6f7fdcbb9151..355391ee643d 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ
config SPI_S3C64XX
tristate "Samsung S3C64XX series type SPI"
- depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST)
+ depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST)
help
SPI driver for Samsung S3C64XX and newer SoCs.
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 4789b5d62f63..17f01cf3009c 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE
config SERIAL_SAMSUNG
tristate "Samsung SoC serial support"
- depends on PLAT_SAMSUNG || ARCH_EXYNOS
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
select SERIAL_CORE
help
Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 638983123d8f..7a0035dd9995 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
menuconfig SND_SOC_SAMSUNG
tristate "ASoC support for Samsung"
- depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST
+ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
depends on COMMON_CLK
select SND_SOC_GENERIC_DMAENGINE_PCM
---help---
--
2.20.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
@ 2019-10-10 20:29 ` Arnd Bergmann
2019-10-23 12:32 ` Krzysztof Kozlowski
2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann
` (2 subsequent siblings)
4 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:29 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, Andi Shyti, Mark Brown
Cc: linux-samsung-soc, Arnd Bergmann, linus.walleij, linux-kernel,
linux-spi, linux-arm-kernel
The file is mostly specific to the driver, the few bits that
are actually used by the platform code get moved to mach/map.h
instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c24xx/include/mach/map.h | 2 ++
arch/arm/mach-s3c24xx/s3c2412.c | 1 -
arch/arm/plat-samsung/devs.c | 1 -
drivers/spi/spi-s3c24xx-fiq.S | 4 +++-
.../include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 3 ---
drivers/spi/spi-s3c24xx.c | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (95%)
diff --git a/arch/arm/mach-s3c24xx/include/mach/map.h b/arch/arm/mach-s3c24xx/include/mach/map.h
index bca93112f57d..a20c9fd0d855 100644
--- a/arch/arm/mach-s3c24xx/include/mach/map.h
+++ b/arch/arm/mach-s3c24xx/include/mach/map.h
@@ -86,6 +86,8 @@
#define S3C2410_PA_SPI (0x59000000)
#define S3C2443_PA_SPI0 (0x52000000)
#define S3C2443_PA_SPI1 S3C2410_PA_SPI
+#define S3C2410_SPI1 (0x20)
+#define S3C2412_SPI1 (0x100)
/* SDI */
#define S3C2410_PA_SDI (0x5A000000)
diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
index 8fe4d4670dcb..c3fb3e6c0dd8 100644
--- a/arch/arm/mach-s3c24xx/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@ -37,7 +37,6 @@
#include <plat/cpu-freq.h>
#include <plat/devs.h>
#include <plat/pm.h>
-#include <plat/regs-spi.h>
#include "common.h"
#include "nand-core.h"
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 6e4c1cb07104..fd94a35e22f8 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -59,7 +59,6 @@
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/usb-ohci-s3c2410.h>
#include <plat/usb-phy.h>
-#include <plat/regs-spi.h>
#include <linux/platform_data/asoc-s3c.h>
#include <linux/platform_data/spi-s3c64xx.h>
diff --git a/drivers/spi/spi-s3c24xx-fiq.S b/drivers/spi/spi-s3c24xx-fiq.S
index e95d6282109e..9d5f8f1e5e81 100644
--- a/drivers/spi/spi-s3c24xx-fiq.S
+++ b/drivers/spi/spi-s3c24xx-fiq.S
@@ -12,10 +12,12 @@
#include <mach/map.h>
#include <mach/regs-irq.h>
-#include <plat/regs-spi.h>
#include "spi-s3c24xx-fiq.h"
+#define S3C2410_SPTDAT (0x10)
+#define S3C2410_SPRDAT (0x14)
+
.text
@ entry to these routines is as follows, with the register names
diff --git a/arch/arm/plat-samsung/include/plat/regs-spi.h b/drivers/spi/spi-s3c24xx-regs.h
similarity index 95%
rename from arch/arm/plat-samsung/include/plat/regs-spi.h
rename to drivers/spi/spi-s3c24xx-regs.h
index 607844311566..37b93ff7c7fe 100644
--- a/arch/arm/plat-samsung/include/plat/regs-spi.h
+++ b/drivers/spi/spi-s3c24xx-regs.h
@@ -8,9 +8,6 @@
#ifndef __ASM_ARCH_REGS_SPI_H
#define __ASM_ARCH_REGS_SPI_H
-#define S3C2410_SPI1 (0x20)
-#define S3C2412_SPI1 (0x100)
-
#define S3C2410_SPCON (0x00)
#define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 2d6e37f25e2d..2f395e4861f6 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -21,10 +21,9 @@
#include <linux/spi/s3c24xx.h>
#include <linux/module.h>
-#include <plat/regs-spi.h>
-
#include <asm/fiq.h>
+#include "spi-s3c24xx-regs.h"
#include "spi-s3c24xx-fiq.h"
/**
--
2.20.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 16/36] ARM: s3c: move spi fiq handler into platform
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann
@ 2019-10-10 20:30 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann
2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann
4 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:30 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, Mark Brown, Andi Shyti
Cc: linux-samsung-soc, linux-arm-kernel, linus.walleij,
Arnd Bergmann, linux-kernel, linux-spi
The fiq handler needs access to some register definitions that
should not be used directly by device drivers.
Since this is closely related to the irqchip driver anyway,
move it into the same place.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c24xx/Makefile | 2 ++
arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c | 9 +++++++++
.../arm/mach-s3c24xx/irq-s3c24xx-fiq.S | 2 +-
drivers/spi/Makefile | 1 -
drivers/spi/spi-s3c24xx.c | 7 +------
.../spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h | 5 +++++
6 files changed, 18 insertions(+), 8 deletions(-)
create mode 100644 arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c
rename drivers/spi/spi-s3c24xx-fiq.S => arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S (98%)
rename drivers/spi/spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h (78%)
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile
index 8c31f84f8c97..695573df00b1 100644
--- a/arch/arm/mach-s3c24xx/Makefile
+++ b/arch/arm/mach-s3c24xx/Makefile
@@ -9,6 +9,8 @@
obj-y += common.o
obj-y += irq-s3c24xx.o
+obj-$(CONFIG_SPI_S3C24XX_FIQ) += irq-s3c24xx-fiq.o
+obj-$(CONFIG_SPI_S3C24XX_FIQ) += irq-s3c24xx-fiq-exports.o
obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o
diff --git a/arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c b/arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c
new file mode 100644
index 000000000000..ef2d1f664e67
--- /dev/null
+++ b/arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <linux/stddef.h>
+#include <linux/export.h>
+#include <linux/spi/s3c24xx-fiq.h>
+
+EXPORT_SYMBOL(s3c24xx_spi_fiq_rx);
+EXPORT_SYMBOL(s3c24xx_spi_fiq_txrx);
+EXPORT_SYMBOL(s3c24xx_spi_fiq_tx);
diff --git a/drivers/spi/spi-s3c24xx-fiq.S b/arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S
similarity index 98%
rename from drivers/spi/spi-s3c24xx-fiq.S
rename to arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S
index 9d5f8f1e5e81..2a84535a14fd 100644
--- a/drivers/spi/spi-s3c24xx-fiq.S
+++ b/arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S
@@ -13,7 +13,7 @@
#include <mach/map.h>
#include <mach/regs-irq.h>
-#include "spi-s3c24xx-fiq.h"
+#include <linux/spi/s3c24xx-fiq.h>
#define S3C2410_SPTDAT (0x10)
#define S3C2410_SPRDAT (0x14)
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index bb49c9e6d0a0..4bcbbd35d2e8 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -89,7 +89,6 @@ obj-$(CONFIG_SPI_RB4XX) += spi-rb4xx.o
obj-$(CONFIG_SPI_RSPI) += spi-rspi.o
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
spi-s3c24xx-hw-y := spi-s3c24xx.o
-spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
obj-$(CONFIG_SPI_S3C64XX) += spi-s3c64xx.o
obj-$(CONFIG_SPI_SC18IS602) += spi-sc18is602.o
obj-$(CONFIG_SPI_SH) += spi-sh.o
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 2f395e4861f6..464146fc8420 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -19,12 +19,12 @@
#include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h>
#include <linux/spi/s3c24xx.h>
+#include <linux/spi/s3c24xx-fiq.h>
#include <linux/module.h>
#include <asm/fiq.h>
#include "spi-s3c24xx-regs.h"
-#include "spi-s3c24xx-fiq.h"
/**
* s3c24xx_spi_devstate - per device data
@@ -229,10 +229,6 @@ struct spi_fiq_code {
u8 data[0];
};
-extern struct spi_fiq_code s3c24xx_spi_fiq_txrx;
-extern struct spi_fiq_code s3c24xx_spi_fiq_tx;
-extern struct spi_fiq_code s3c24xx_spi_fiq_rx;
-
/**
* ack_bit - turn IRQ into IRQ acknowledgement bit
* @irq: The interrupt number
@@ -282,7 +278,6 @@ static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
regs.uregs[fiq_rrx] = (long)hw->rx;
regs.uregs[fiq_rtx] = (long)hw->tx + 1;
regs.uregs[fiq_rcount] = hw->len - 1;
- regs.uregs[fiq_rirq] = (long)S3C24XX_VA_IRQ;
set_fiq_regs(®s);
diff --git a/drivers/spi/spi-s3c24xx-fiq.h b/include/linux/spi/s3c24xx-fiq.h
similarity index 78%
rename from drivers/spi/spi-s3c24xx-fiq.h
rename to include/linux/spi/s3c24xx-fiq.h
index 7786b0ea56ec..954452618dfe 100644
--- a/drivers/spi/spi-s3c24xx-fiq.h
+++ b/include/linux/spi/s3c24xx-fiq.h
@@ -12,6 +12,11 @@
#ifdef __ASSEMBLY__
#define __REG_NR(x) r##x
#else
+
+extern struct spi_fiq_code s3c24xx_spi_fiq_txrx;
+extern struct spi_fiq_code s3c24xx_spi_fiq_tx;
+extern struct spi_fiq_code s3c24xx_spi_fiq_rx;
+
#define __REG_NR(x) (x)
#endif
--
2.20.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
` (2 preceding siblings ...)
2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann
@ 2019-10-10 20:30 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann
4 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:30 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, Andi Shyti, Mark Brown
Cc: linux-samsung-soc, Arnd Bergmann, linus.walleij, linux-kernel,
linux-spi, linux-arm-kernel
The IRQ_EINT0 constant is a platform detail that is
defined in mach/irqs.h and not visible to drivers once
that header is made private.
Since the same calculation already happens in s3c24xx_set_fiq,
just return the value from there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c24xx/irq-s3c24xx.c | 12 +++++++++---
drivers/spi/spi-s3c24xx.c | 18 ++----------------
include/linux/spi/s3c24xx.h | 2 +-
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/irq-s3c24xx.c b/arch/arm/mach-s3c24xx/irq-s3c24xx.c
index b0e879ee14c1..3965347cacf0 100644
--- a/arch/arm/mach-s3c24xx/irq-s3c24xx.c
+++ b/arch/arm/mach-s3c24xx/irq-s3c24xx.c
@@ -376,14 +376,17 @@ asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs)
/**
* s3c24xx_set_fiq - set the FIQ routing
* @irq: IRQ number to route to FIQ on processor.
+ * @ack_ptr: pointer to a location for storing the bit mask
* @on: Whether to route @irq to the FIQ, or to remove the FIQ routing.
*
* Change the state of the IRQ to FIQ routing depending on @irq and @on. If
* @on is true, the @irq is checked to see if it can be routed and the
* interrupt controller updated to route the IRQ. If @on is false, the FIQ
* routing is cleared, regardless of which @irq is specified.
+ *
+ * returns the mask value for the register.
*/
-int s3c24xx_set_fiq(unsigned int irq, bool on)
+int s3c24xx_set_fiq(unsigned int irq, u32 *ack_ptr, bool on)
{
u32 intmod;
unsigned offs;
@@ -391,15 +394,18 @@ int s3c24xx_set_fiq(unsigned int irq, bool on)
if (on) {
offs = irq - FIQ_START;
if (offs > 31)
- return -EINVAL;
+ return 0;
intmod = 1 << offs;
} else {
intmod = 0;
}
+ if (ack_ptr)
+ *ack_ptr = intmod;
writel_relaxed(intmod, S3C2410_INTMOD);
- return 0;
+
+ return intmod;
}
EXPORT_SYMBOL_GPL(s3c24xx_set_fiq);
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 464146fc8420..58025876a081 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -229,17 +229,6 @@ struct spi_fiq_code {
u8 data[0];
};
-/**
- * ack_bit - turn IRQ into IRQ acknowledgement bit
- * @irq: The interrupt number
- *
- * Returns the bit to write to the interrupt acknowledge register.
- */
-static inline u32 ack_bit(unsigned int irq)
-{
- return 1 << (irq - IRQ_EINT0);
-}
-
/**
* s3c24xx_spi_tryfiq - attempt to claim and setup FIQ for transfer
* @hw: The hardware state.
@@ -256,6 +245,7 @@ static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
struct pt_regs regs;
enum spi_fiq_mode mode;
struct spi_fiq_code *code;
+ u32 *ack_ptr = NULL;
int ret;
if (!hw->fiq_claimed) {
@@ -282,8 +272,6 @@ static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
set_fiq_regs(®s);
if (hw->fiq_mode != mode) {
- u32 *ack_ptr;
-
hw->fiq_mode = mode;
switch (mode) {
@@ -303,12 +291,10 @@ static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
BUG_ON(!code);
ack_ptr = (u32 *)&code->data[code->ack_offset];
- *ack_ptr = ack_bit(hw->irq);
-
set_fiq_handler(&code->data, code->length);
}
- s3c24xx_set_fiq(hw->irq, true);
+ s3c24xx_set_fiq(hw->irq, ack_ptr, true);
hw->fiq_mode = mode;
hw->fiq_inuse = 1;
diff --git a/include/linux/spi/s3c24xx.h b/include/linux/spi/s3c24xx.h
index c91d10b82f08..440a71593162 100644
--- a/include/linux/spi/s3c24xx.h
+++ b/include/linux/spi/s3c24xx.h
@@ -20,6 +20,6 @@ struct s3c2410_spi_info {
void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
};
-extern int s3c24xx_set_fiq(unsigned int irq, bool on);
+extern int s3c24xx_set_fiq(unsigned int irq, u32 *ack_ptr, bool on);
#endif /* __LINUX_SPI_S3C24XX_H */
--
2.20.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
` (3 preceding siblings ...)
2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann
@ 2019-10-10 20:30 ` Arnd Bergmann
2019-10-10 21:02 ` Russell King - ARM Linux admin
4 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 20:30 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, Andi Shyti, Mark Brown,
Felipe Balbi, Greg Kroah-Hartman
Cc: linux-samsung-soc, Arnd Bergmann, linus.walleij, linux-usb,
linux-kernel, linux-spi, linux-arm-kernel
A number of other files rely on mach/map.h to be indirectly
included from mach/io.h through mach/hardware.h.
Reduce this to the minimal plat/map-base.h and add explicit
includes everywhere else.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c24xx/common.c | 1 +
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h | 2 ++
arch/arm/mach-s3c24xx/include/mach/hardware.h | 7 -------
arch/arm/mach-s3c24xx/include/mach/io.h | 3 +--
arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 2 ++
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 ++
arch/arm/mach-s3c24xx/include/mach/regs-irq.h | 2 ++
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h | 1 +
arch/arm/mach-s3c24xx/include/mach/s3c2412.h | 2 ++
arch/arm/mach-s3c24xx/mach-h1940.c | 1 +
arch/arm/mach-s3c24xx/mach-jive.c | 1 +
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 +
arch/arm/mach-s3c24xx/pm-h1940.S | 1 -
arch/arm/mach-s3c24xx/regs-mem.h | 2 ++
arch/arm/mach-s3c24xx/s3c2410.c | 2 +-
arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/s3c244x.c | 2 +-
arch/arm/mach-s3c24xx/sleep-s3c2410.S | 1 -
arch/arm/mach-s3c24xx/sleep-s3c2412.S | 1 -
arch/arm/mach-s3c24xx/sleep.S | 1 -
drivers/spi/spi-s3c24xx-regs.h | 2 ++
drivers/usb/gadget/udc/s3c2410_udc_regs.h | 2 ++
24 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index d16a164df6c4..42d828f48345 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -21,6 +21,7 @@
#include <linux/dmaengine.h>
#include <mach/hardware.h>
+#include <mach/map.h>
#include <mach/regs-clock.h>
#include <asm/irq.h>
#include <asm/cacheflush.h>
diff --git a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
index 2ad22b2d459b..f8a114891f16 100644
--- a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
+++ b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
@@ -14,6 +14,8 @@
#ifndef GPIO_SAMSUNG_S3C24XX_H
#define GPIO_SAMSUNG_S3C24XX_H
+#include <mach/map.h>
+
/*
* GPIO sizes for various SoCs:
*
diff --git a/arch/arm/mach-s3c24xx/include/mach/hardware.h b/arch/arm/mach-s3c24xx/include/mach/hardware.h
index f28ac6c78d82..c732ea54984c 100644
--- a/arch/arm/mach-s3c24xx/include/mach/hardware.h
+++ b/arch/arm/mach-s3c24xx/include/mach/hardware.h
@@ -9,13 +9,6 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
-#ifndef __ASSEMBLY__
-
extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);
-#endif /* __ASSEMBLY__ */
-
-#include <linux/sizes.h>
-#include <mach/map.h>
-
#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-s3c24xx/include/mach/io.h b/arch/arm/mach-s3c24xx/include/mach/io.h
index 3e8bff26cdd5..bcddf615adb6 100644
--- a/arch/arm/mach-s3c24xx/include/mach/io.h
+++ b/arch/arm/mach-s3c24xx/include/mach/io.h
@@ -10,8 +10,7 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#include <mach/hardware.h>
-
+#include <plat/map-base.h>
/*
* ISA style IO, for each machine to sort out mappings for,
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
index 7ca3dd4f13c0..da4e7b3aeba6 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
@@ -9,6 +9,8 @@
#ifndef __ASM_ARM_REGS_CLOCK
#define __ASM_ARM_REGS_CLOCK
+#include <mach/map.h>
+
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
#define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
index 594e967c0673..51827d5577b6 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
@@ -10,6 +10,8 @@
#ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H
+#include <plat/map-s3c.h>
+
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
/* general configuration options */
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
index 8d8e669e3903..2921b48c56b2 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
@@ -8,6 +8,8 @@
#ifndef ___ASM_ARCH_REGS_IRQ_H
#define ___ASM_ARCH_REGS_IRQ_H
+#include <plat/map-s3c.h>
+
/* interrupt controller */
#define S3C2410_IRQREG(x) ((x) + S3C24XX_VA_IRQ)
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
index 682759549e63..fefef7233f4b 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
@@ -11,6 +11,7 @@
#define __ASM_ARM_REGS_S3C2443_CLOCK
#include <linux/delay.h>
+#include <plat/map-s3c.h>
#define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
diff --git a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
index 4ff83f956cfb..1ae369c81beb 100644
--- a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
@@ -8,6 +8,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
#define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__
+#include <plat/map-s3c.h>
+
#define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x))
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index d56e3befa459..287e42fc1665 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -48,6 +48,7 @@
#include <sound/uda1380.h>
#include <linux/platform_data/fb-s3c2410.h>
+#include <mach/map.h>
#include <mach/hardware.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index 3b33132b2334..8012c34bddd9 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -31,6 +31,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
+#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <linux/platform_data/fb-s3c2410.h>
#include <mach/gpio-samsung.h>
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index ee4a0992339f..f94884090fbe 100644
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -46,6 +46,7 @@
#include <sound/uda1380.h>
+#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
index a7bbe336ac6b..f9ee515e1cbe 100644
--- a/arch/arm/mach-s3c24xx/pm-h1940.S
+++ b/arch/arm/mach-s3c24xx/pm-h1940.S
@@ -7,7 +7,6 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s3c24xx/regs-mem.h b/arch/arm/mach-s3c24xx/regs-mem.h
index 2f3bc48b5890..5048ab8f06c2 100644
--- a/arch/arm/mach-s3c24xx/regs-mem.h
+++ b/arch/arm/mach-s3c24xx/regs-mem.h
@@ -9,6 +9,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H
#define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__
+#include <plat/map-s3c.h>
+
#define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2410_BWSCON S3C2410_MEMREG(0x00)
diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c
index 8427c150dd22..44bf3e1e77f1 100644
--- a/arch/arm/mach-s3c24xx/s3c2410.c
+++ b/arch/arm/mach-s3c24xx/s3c2410.c
@@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/hardware.h>
+#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <asm/irq.h>
#include <asm/system_misc.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
index 209f952a6c98..75648dcc2c1d 100644
--- a/arch/arm/mach-s3c24xx/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@ -29,7 +29,7 @@
#include <asm/irq.h>
#include <asm/system_misc.h>
-#include <mach/hardware.h>
+#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
index 1cdb7bd3e713..ef2eace605e6 100644
--- a/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@ -26,7 +26,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/hardware.h>
+#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <asm/proc-fns.h>
#include <asm/irq.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c
index f404ecac4baf..00318ad994ff 100644
--- a/arch/arm/mach-s3c24xx/s3c2443.c
+++ b/arch/arm/mach-s3c24xx/s3c2443.c
@@ -23,7 +23,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/hardware.h>
+#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <mach/irqs.h>
#include <asm/irq.h>
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c
index f5bd489bac85..0ca188d0ffe5 100644
--- a/arch/arm/mach-s3c24xx/s3c244x.c
+++ b/arch/arm/mach-s3c24xx/s3c244x.c
@@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/hardware.h>
+#include <mach/map.h>
#include <asm/irq.h>
#include <mach/regs-clock.h>
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
index 659f9eff9de2..e4f6f64e7826 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
@@ -13,7 +13,6 @@
#include <linux/linkage.h>
#include <linux/serial_s3c.h>
#include <asm/assembler.h>
-#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
index c373f1ca862b..434f5082b2ed 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
@@ -8,7 +8,6 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-irq.h>
diff --git a/arch/arm/mach-s3c24xx/sleep.S b/arch/arm/mach-s3c24xx/sleep.S
index f0f11ad60c52..4bda4a413584 100644
--- a/arch/arm/mach-s3c24xx/sleep.S
+++ b/arch/arm/mach-s3c24xx/sleep.S
@@ -13,7 +13,6 @@
#include <linux/linkage.h>
#include <linux/serial_s3c.h>
#include <asm/assembler.h>
-#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>
diff --git a/drivers/spi/spi-s3c24xx-regs.h b/drivers/spi/spi-s3c24xx-regs.h
index 37b93ff7c7fe..b76d591eba8c 100644
--- a/drivers/spi/spi-s3c24xx-regs.h
+++ b/drivers/spi/spi-s3c24xx-regs.h
@@ -8,6 +8,8 @@
#ifndef __ASM_ARCH_REGS_SPI_H
#define __ASM_ARCH_REGS_SPI_H
+#include <mach/map.h>
+
#define S3C2410_SPCON (0x00)
#define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */
diff --git a/drivers/usb/gadget/udc/s3c2410_udc_regs.h b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
index d8d2eeaca088..4df279342cdd 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc_regs.h
+++ b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
@@ -6,6 +6,8 @@
#ifndef __ASM_ARCH_REGS_UDC_H
#define __ASM_ARCH_REGS_UDC_H
+#include <mach/map.h>
+
#define S3C2410_USBDREG(x) (x)
#define S3C2410_UDC_FUNC_ADDR_REG S3C2410_USBDREG(0x0140)
--
2.20.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h
2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann
@ 2019-10-10 21:02 ` Russell King - ARM Linux admin
2019-10-10 21:53 ` Arnd Bergmann
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux admin @ 2019-10-10 21:02 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kukjin Kim, Krzysztof Kozlowski, Andi Shyti, Mark Brown,
Felipe Balbi, Greg Kroah-Hartman, linux-samsung-soc,
linus.walleij, linux-usb, linux-kernel, linux-spi,
linux-arm-kernel
On Thu, Oct 10, 2019 at 10:30:18PM +0200, Arnd Bergmann wrote:
> A number of other files rely on mach/map.h to be indirectly
> included from mach/io.h through mach/hardware.h.
>
> Reduce this to the minimal plat/map-base.h and add explicit
> includes everywhere else.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-s3c24xx/common.c | 1 +
> arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h | 2 ++
> arch/arm/mach-s3c24xx/include/mach/hardware.h | 7 -------
> arch/arm/mach-s3c24xx/include/mach/io.h | 3 +--
> arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 2 ++
> arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 ++
> arch/arm/mach-s3c24xx/include/mach/regs-irq.h | 2 ++
> arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h | 1 +
> arch/arm/mach-s3c24xx/include/mach/s3c2412.h | 2 ++
> arch/arm/mach-s3c24xx/mach-h1940.c | 1 +
> arch/arm/mach-s3c24xx/mach-jive.c | 1 +
> arch/arm/mach-s3c24xx/mach-rx1950.c | 1 +
> arch/arm/mach-s3c24xx/pm-h1940.S | 1 -
> arch/arm/mach-s3c24xx/regs-mem.h | 2 ++
> arch/arm/mach-s3c24xx/s3c2410.c | 2 +-
> arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
> arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
> arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
> arch/arm/mach-s3c24xx/s3c244x.c | 2 +-
> arch/arm/mach-s3c24xx/sleep-s3c2410.S | 1 -
> arch/arm/mach-s3c24xx/sleep-s3c2412.S | 1 -
> arch/arm/mach-s3c24xx/sleep.S | 1 -
> drivers/spi/spi-s3c24xx-regs.h | 2 ++
> drivers/usb/gadget/udc/s3c2410_udc_regs.h | 2 ++
> 24 files changed, 27 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
> index d16a164df6c4..42d828f48345 100644
> --- a/arch/arm/mach-s3c24xx/common.c
> +++ b/arch/arm/mach-s3c24xx/common.c
> @@ -21,6 +21,7 @@
> #include <linux/dmaengine.h>
>
> #include <mach/hardware.h>
> +#include <mach/map.h>
> #include <mach/regs-clock.h>
> #include <asm/irq.h>
> #include <asm/cacheflush.h>
> diff --git a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> index 2ad22b2d459b..f8a114891f16 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> @@ -14,6 +14,8 @@
> #ifndef GPIO_SAMSUNG_S3C24XX_H
> #define GPIO_SAMSUNG_S3C24XX_H
>
> +#include <mach/map.h>
> +
Why? Nothing in this file uses anything from mach/map.h
> /*
> * GPIO sizes for various SoCs:
> *
> diff --git a/arch/arm/mach-s3c24xx/include/mach/hardware.h b/arch/arm/mach-s3c24xx/include/mach/hardware.h
> index f28ac6c78d82..c732ea54984c 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/hardware.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/hardware.h
> @@ -9,13 +9,6 @@
> #ifndef __ASM_ARCH_HARDWARE_H
> #define __ASM_ARCH_HARDWARE_H
>
> -#ifndef __ASSEMBLY__
> -
> extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);
>
> -#endif /* __ASSEMBLY__ */
> -
> -#include <linux/sizes.h>
> -#include <mach/map.h>
> -
> #endif /* __ASM_ARCH_HARDWARE_H */
> diff --git a/arch/arm/mach-s3c24xx/include/mach/io.h b/arch/arm/mach-s3c24xx/include/mach/io.h
> index 3e8bff26cdd5..bcddf615adb6 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/io.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/io.h
> @@ -10,8 +10,7 @@
> #ifndef __ASM_ARM_ARCH_IO_H
> #define __ASM_ARM_ARCH_IO_H
>
> -#include <mach/hardware.h>
> -
> +#include <plat/map-base.h>
>
> /*
> * ISA style IO, for each machine to sort out mappings for,
> diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> index 7ca3dd4f13c0..da4e7b3aeba6 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> @@ -9,6 +9,8 @@
> #ifndef __ASM_ARM_REGS_CLOCK
> #define __ASM_ARM_REGS_CLOCK
>
> +#include <mach/map.h>
> +
Why? Nothing in this file uses anything from mach/map.h
> #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
>
> #define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))
> diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
> index 594e967c0673..51827d5577b6 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
> @@ -10,6 +10,8 @@
> #ifndef __ASM_ARCH_REGS_GPIO_H
> #define __ASM_ARCH_REGS_GPIO_H
>
> +#include <plat/map-s3c.h>
> +
> #define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
>
> /* general configuration options */
> diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
> index 8d8e669e3903..2921b48c56b2 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h
> @@ -8,6 +8,8 @@
> #ifndef ___ASM_ARCH_REGS_IRQ_H
> #define ___ASM_ARCH_REGS_IRQ_H
>
> +#include <plat/map-s3c.h>
> +
> /* interrupt controller */
>
> #define S3C2410_IRQREG(x) ((x) + S3C24XX_VA_IRQ)
> diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
> index 682759549e63..fefef7233f4b 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
> @@ -11,6 +11,7 @@
> #define __ASM_ARM_REGS_S3C2443_CLOCK
>
> #include <linux/delay.h>
> +#include <plat/map-s3c.h>
>
> #define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
>
> diff --git a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
> index 4ff83f956cfb..1ae369c81beb 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h
> @@ -8,6 +8,8 @@
> #ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
> #define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__
>
> +#include <plat/map-s3c.h>
> +
> #define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
> #define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x))
>
> diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
> index d56e3befa459..287e42fc1665 100644
> --- a/arch/arm/mach-s3c24xx/mach-h1940.c
> +++ b/arch/arm/mach-s3c24xx/mach-h1940.c
> @@ -48,6 +48,7 @@
> #include <sound/uda1380.h>
>
> #include <linux/platform_data/fb-s3c2410.h>
> +#include <mach/map.h>
> #include <mach/hardware.h>
> #include <mach/regs-clock.h>
> #include <mach/regs-gpio.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
> index 3b33132b2334..8012c34bddd9 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -31,6 +31,7 @@
> #include <linux/platform_data/mtd-nand-s3c2410.h>
> #include <linux/platform_data/i2c-s3c2410.h>
>
> +#include <mach/hardware.h>
> #include <mach/regs-gpio.h>
> #include <linux/platform_data/fb-s3c2410.h>
> #include <mach/gpio-samsung.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
> index ee4a0992339f..f94884090fbe 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx1950.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
> @@ -46,6 +46,7 @@
>
> #include <sound/uda1380.h>
>
> +#include <mach/hardware.h>
> #include <mach/regs-gpio.h>
> #include <mach/gpio-samsung.h>
>
> diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
> index a7bbe336ac6b..f9ee515e1cbe 100644
> --- a/arch/arm/mach-s3c24xx/pm-h1940.S
> +++ b/arch/arm/mach-s3c24xx/pm-h1940.S
> @@ -7,7 +7,6 @@
>
> #include <linux/linkage.h>
> #include <asm/assembler.h>
> -#include <mach/hardware.h>
> #include <mach/map.h>
>
> #include <mach/regs-gpio.h>
> diff --git a/arch/arm/mach-s3c24xx/regs-mem.h b/arch/arm/mach-s3c24xx/regs-mem.h
> index 2f3bc48b5890..5048ab8f06c2 100644
> --- a/arch/arm/mach-s3c24xx/regs-mem.h
> +++ b/arch/arm/mach-s3c24xx/regs-mem.h
> @@ -9,6 +9,8 @@
> #ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H
> #define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__
>
> +#include <plat/map-s3c.h>
> +
> #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
>
> #define S3C2410_BWSCON S3C2410_MEMREG(0x00)
> diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c
> index 8427c150dd22..44bf3e1e77f1 100644
> --- a/arch/arm/mach-s3c24xx/s3c2410.c
> +++ b/arch/arm/mach-s3c24xx/s3c2410.c
> @@ -25,7 +25,7 @@
> #include <asm/mach/map.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/hardware.h>
> +#include <mach/map.h>
> #include <mach/gpio-samsung.h>
> #include <asm/irq.h>
> #include <asm/system_misc.h>
> diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
> index 209f952a6c98..75648dcc2c1d 100644
> --- a/arch/arm/mach-s3c24xx/s3c2412.c
> +++ b/arch/arm/mach-s3c24xx/s3c2412.c
> @@ -29,7 +29,7 @@
> #include <asm/irq.h>
> #include <asm/system_misc.h>
>
> -#include <mach/hardware.h>
> +#include <mach/map.h>
> #include <mach/regs-clock.h>
> #include <mach/regs-gpio.h>
>
> diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
> index 1cdb7bd3e713..ef2eace605e6 100644
> --- a/arch/arm/mach-s3c24xx/s3c2416.c
> +++ b/arch/arm/mach-s3c24xx/s3c2416.c
> @@ -26,7 +26,7 @@
> #include <asm/mach/map.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/hardware.h>
> +#include <mach/map.h>
> #include <mach/gpio-samsung.h>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c
> index f404ecac4baf..00318ad994ff 100644
> --- a/arch/arm/mach-s3c24xx/s3c2443.c
> +++ b/arch/arm/mach-s3c24xx/s3c2443.c
> @@ -23,7 +23,7 @@
> #include <asm/mach/map.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/hardware.h>
> +#include <mach/map.h>
> #include <mach/gpio-samsung.h>
> #include <mach/irqs.h>
> #include <asm/irq.h>
> diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c
> index f5bd489bac85..0ca188d0ffe5 100644
> --- a/arch/arm/mach-s3c24xx/s3c244x.c
> +++ b/arch/arm/mach-s3c24xx/s3c244x.c
> @@ -25,7 +25,7 @@
> #include <asm/mach/map.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/hardware.h>
> +#include <mach/map.h>
> #include <asm/irq.h>
>
> #include <mach/regs-clock.h>
> diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
> index 659f9eff9de2..e4f6f64e7826 100644
> --- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
> +++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
> @@ -13,7 +13,6 @@
> #include <linux/linkage.h>
> #include <linux/serial_s3c.h>
> #include <asm/assembler.h>
> -#include <mach/hardware.h>
> #include <mach/map.h>
>
> #include <mach/regs-gpio.h>
> diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
> index c373f1ca862b..434f5082b2ed 100644
> --- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
> +++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
> @@ -8,7 +8,6 @@
>
> #include <linux/linkage.h>
> #include <asm/assembler.h>
> -#include <mach/hardware.h>
> #include <mach/map.h>
>
> #include <mach/regs-irq.h>
> diff --git a/arch/arm/mach-s3c24xx/sleep.S b/arch/arm/mach-s3c24xx/sleep.S
> index f0f11ad60c52..4bda4a413584 100644
> --- a/arch/arm/mach-s3c24xx/sleep.S
> +++ b/arch/arm/mach-s3c24xx/sleep.S
> @@ -13,7 +13,6 @@
> #include <linux/linkage.h>
> #include <linux/serial_s3c.h>
> #include <asm/assembler.h>
> -#include <mach/hardware.h>
> #include <mach/map.h>
>
> #include <mach/regs-gpio.h>
> diff --git a/drivers/spi/spi-s3c24xx-regs.h b/drivers/spi/spi-s3c24xx-regs.h
> index 37b93ff7c7fe..b76d591eba8c 100644
> --- a/drivers/spi/spi-s3c24xx-regs.h
> +++ b/drivers/spi/spi-s3c24xx-regs.h
> @@ -8,6 +8,8 @@
> #ifndef __ASM_ARCH_REGS_SPI_H
> #define __ASM_ARCH_REGS_SPI_H
>
> +#include <mach/map.h>
> +
If this is outside of arch/arm, it shouldn't need anything from
mach/map.h - mach/map.h is not for driver use.
> #define S3C2410_SPCON (0x00)
>
> #define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */
> diff --git a/drivers/usb/gadget/udc/s3c2410_udc_regs.h b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> index d8d2eeaca088..4df279342cdd 100644
> --- a/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> +++ b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> @@ -6,6 +6,8 @@
> #ifndef __ASM_ARCH_REGS_UDC_H
> #define __ASM_ARCH_REGS_UDC_H
>
> +#include <mach/map.h>
> +
If this is outside of arch/arm, it shouldn't need anything from
mach/map.h - mach/map.h is not for driver use.
> #define S3C2410_USBDREG(x) (x)
>
> #define S3C2410_UDC_FUNC_ADDR_REG S3C2410_USBDREG(0x0140)
> --
> 2.20.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h
2019-10-10 21:02 ` Russell King - ARM Linux admin
@ 2019-10-10 21:53 ` Arnd Bergmann
0 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-10 21:53 UTC (permalink / raw)
To: Russell King - ARM Linux admin
Cc: Kukjin Kim, Krzysztof Kozlowski, Andi Shyti, Mark Brown,
Felipe Balbi, Greg Kroah-Hartman,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Linus Walleij, USB list, linux-kernel, linux-spi, Linux ARM
On Thu, Oct 10, 2019 at 11:02 PM Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Thu, Oct 10, 2019 at 10:30:18PM +0200, Arnd Bergmann wrote:
> > diff --git a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> > index 2ad22b2d459b..f8a114891f16 100644
> > --- a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> > +++ b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
> > @@ -14,6 +14,8 @@
> > #ifndef GPIO_SAMSUNG_S3C24XX_H
> > #define GPIO_SAMSUNG_S3C24XX_H
> >
> > +#include <mach/map.h>
> > +
>
> Why? Nothing in this file uses anything from mach/map.h
Good point, I don't recall how this happened, most likely either
edited the wrong file after a build regression, or I had moved some
definition into this file in a patch that I later discarded and this
change got left behind.
> > diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> > index 7ca3dd4f13c0..da4e7b3aeba6 100644
> > --- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> > +++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
> > @@ -9,6 +9,8 @@
> > #ifndef __ASM_ARM_REGS_CLOCK
> > #define __ASM_ARM_REGS_CLOCK
> >
> > +#include <mach/map.h>
> > +
>
> Why? Nothing in this file uses anything from mach/map.h
I think I added this one for S3C24XX_VA_CLKPWR, which is in
plat/map-s3c.h
> > diff --git a/drivers/spi/spi-s3c24xx-regs.h b/drivers/spi/spi-s3c24xx-regs.h
> > index 37b93ff7c7fe..b76d591eba8c 100644
> > --- a/drivers/spi/spi-s3c24xx-regs.h
> > +++ b/drivers/spi/spi-s3c24xx-regs.h
> > @@ -8,6 +8,8 @@
> > #ifndef __ASM_ARCH_REGS_SPI_H
> > #define __ASM_ARCH_REGS_SPI_H
> >
> > +#include <mach/map.h>
> > +
>
> If this is outside of arch/arm, it shouldn't need anything from
> mach/map.h - mach/map.h is not for driver use.
This was the result of a botched rebase: The patch was initially
at the start of the series where the #include was still required
but later moved to the end behind the patch that used to remove
it again.
> > diff --git a/drivers/usb/gadget/udc/s3c2410_udc_regs.h b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> > index d8d2eeaca088..4df279342cdd 100644
> > --- a/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> > +++ b/drivers/usb/gadget/udc/s3c2410_udc_regs.h
> > @@ -6,6 +6,8 @@
> > #ifndef __ASM_ARCH_REGS_UDC_H
> > #define __ASM_ARCH_REGS_UDC_H
> >
> > +#include <mach/map.h>
> > +
>
> If this is outside of arch/arm, it shouldn't need anything from
> mach/map.h - mach/map.h is not for driver use.
Same here.
Thanks for taking a look, I'll fix it all up tomorrow.
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
@ 2019-10-11 5:51 ` Uwe Kleine-König
2019-10-22 14:01 ` Arnd Bergmann
2019-10-15 14:13 ` Ulf Hansson
` (2 subsequent siblings)
3 siblings, 1 reply; 22+ messages in thread
From: Uwe Kleine-König @ 2019-10-11 5:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ulf Hansson, Liam Girdwood, linus.walleij, alsa-devel,
linux-kernel, Thierry Reding, Sylwester Nawrocki,
Mauro Carvalho Chehab, linux-samsung-soc, Krzysztof Kozlowski,
Kukjin Kim, Clément Péron, linux-serial, Jiri Slaby,
linux-pwm, Bartlomiej Zolnierkiewicz, Sascha Hauer, Mark Brown,
Jaroslav Kysela, linux-arm-kernel, Sangbeom Kim,
Greg Kroah-Hartman, linux-mmc
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
> These can be build completely independently, so split
> the two Kconfig symbols.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
I'd mention the two symbols' names you're working on in the commit log.
I guess it's about PLAT_SAMSUNG and ARCH_S5PV210. And I wouldn't call it
"split" which IMHO suggests there was only one symbol before.
Maybe:
Don't imply PLAT_SAMSUNG if ARCH_S5PV210 is enabled
would be a better subject line?
> ---
> arch/arm/Kconfig.debug | 6 +++---
> arch/arm/Makefile | 1 -
> arch/arm/plat-samsung/Kconfig | 2 +-
> drivers/mmc/host/Kconfig | 2 +-
> drivers/pwm/Kconfig | 2 +-
> drivers/spi/Kconfig | 2 +-
> drivers/tty/serial/Kconfig | 2 +-
> sound/soc/samsung/Kconfig | 2 +-
> 8 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9c4f2d6deb06..4c4e97ae4fcb 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -998,7 +998,7 @@ choice
> via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
>
> config DEBUG_S3C_UART0
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1010,7 +1010,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART1
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1022,7 +1022,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART2
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index f492d7c338fe..a1bc15cda751 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
> # by CONFIG_* macro name.
> plat-$(CONFIG_ARCH_OMAP) += omap
> plat-$(CONFIG_ARCH_S3C64XX) += samsung
> -plat-$(CONFIG_ARCH_S5PV210) += samsung
Would it make more sense to make this
plat-$(PLAT_SAMSUNG) += samsung
(in a separate patch)? Hmm, it seems there is no plat-y for
PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name
containing "samsung" suggests something that seems untrue.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
2019-10-11 5:51 ` Uwe Kleine-König
@ 2019-10-15 14:13 ` Ulf Hansson
2019-10-15 14:23 ` Thierry Reding
2019-10-23 12:14 ` Krzysztof Kozlowski
3 siblings, 0 replies; 22+ messages in thread
From: Ulf Hansson @ 2019-10-15 14:13 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kukjin Kim, Krzysztof Kozlowski, Thierry Reding, Mark Brown,
Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim, Sylwester Nawrocki,
Liam Girdwood, linux-pwm, alsa-devel, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Linux Kernel Mailing List,
Linus Walleij, linux-mmc, Takashi Iwai, Jaroslav Kysela,
Mauro Carvalho Chehab
On Thu, 10 Oct 2019 at 22:38, Arnd Bergmann <arnd@arndb.de> wrote:
>
> These can be build completely independently, so split
> the two Kconfig symbols.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/Kconfig.debug | 6 +++---
> arch/arm/Makefile | 1 -
> arch/arm/plat-samsung/Kconfig | 2 +-
> drivers/mmc/host/Kconfig | 2 +-
> drivers/pwm/Kconfig | 2 +-
> drivers/spi/Kconfig | 2 +-
> drivers/tty/serial/Kconfig | 2 +-
> sound/soc/samsung/Kconfig | 2 +-
> 8 files changed, 9 insertions(+), 10 deletions(-)
For the mmc parts:
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9c4f2d6deb06..4c4e97ae4fcb 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -998,7 +998,7 @@ choice
> via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
>
> config DEBUG_S3C_UART0
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1010,7 +1010,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART1
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1022,7 +1022,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART2
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index f492d7c338fe..a1bc15cda751 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
> # by CONFIG_* macro name.
> plat-$(CONFIG_ARCH_OMAP) += omap
> plat-$(CONFIG_ARCH_S3C64XX) += samsung
> -plat-$(CONFIG_ARCH_S5PV210) += samsung
> plat-$(CONFIG_PLAT_ORION) += orion
> plat-$(CONFIG_PLAT_PXA) += pxa
> plat-$(CONFIG_PLAT_S3C24XX) += samsung
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 740bdb23f38a..1530946cc672 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -4,7 +4,7 @@
>
> config PLAT_SAMSUNG
> bool
> - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
> + depends on PLAT_S3C24XX || ARCH_S3C64XX
> default y
> select GENERIC_IRQ_CHIP
> select NO_IOPORT_MAP
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 400a581c918c..16a0e5430b44 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -275,7 +275,7 @@ config MMC_SDHCI_TEGRA
>
> config MMC_SDHCI_S3C
> tristate "SDHCI support on Samsung S3C SoC"
> - depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_EXYNOS)
> + depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS)
> help
> This selects the Secure Digital Host Controller Interface (SDHCI)
> often referrered to as the HSMMC block in some of the Samsung S3C
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index e3a2518503ed..8eb738cac0c7 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -394,7 +394,7 @@ config PWM_ROCKCHIP
>
> config PWM_SAMSUNG
> tristate "Samsung PWM support"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> help
> Generic PWM framework driver for Samsung.
>
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 6f7fdcbb9151..355391ee643d 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ
>
> config SPI_S3C64XX
> tristate "Samsung S3C64XX series type SPI"
> - depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST)
> + depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST)
> help
> SPI driver for Samsung S3C64XX and newer SoCs.
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 4789b5d62f63..17f01cf3009c 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE
>
> config SERIAL_SAMSUNG
> tristate "Samsung SoC serial support"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select SERIAL_CORE
> help
> Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
> diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
> index 638983123d8f..7a0035dd9995 100644
> --- a/sound/soc/samsung/Kconfig
> +++ b/sound/soc/samsung/Kconfig
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0-only
> menuconfig SND_SOC_SAMSUNG
> tristate "ASoC support for Samsung"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on COMMON_CLK
> select SND_SOC_GENERIC_DMAENGINE_PCM
> ---help---
> --
> 2.20.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
2019-10-11 5:51 ` Uwe Kleine-König
2019-10-15 14:13 ` Ulf Hansson
@ 2019-10-15 14:23 ` Thierry Reding
2019-10-23 12:14 ` Krzysztof Kozlowski
3 siblings, 0 replies; 22+ messages in thread
From: Thierry Reding @ 2019-10-15 14:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kukjin Kim, Krzysztof Kozlowski, Ulf Hansson, Mark Brown,
Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim, Sylwester Nawrocki,
Liam Girdwood, linux-samsung-soc, linux-arm-kernel,
linus.walleij, Uwe Kleine-König, Jaroslav Kysela,
Takashi Iwai, Olof Johansson, Sascha Hauer,
Clément Péron, Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
[...]
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index e3a2518503ed..8eb738cac0c7 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -394,7 +394,7 @@ config PWM_ROCKCHIP
>
> config PWM_SAMSUNG
> tristate "Samsung PWM support"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> help
> Generic PWM framework driver for Samsung.
>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-11 5:51 ` Uwe Kleine-König
@ 2019-10-22 14:01 ` Arnd Bergmann
2019-10-22 15:53 ` Uwe Kleine-König
0 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-22 14:01 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Kukjin Kim, Krzysztof Kozlowski, Ulf Hansson, Thierry Reding,
Mark Brown, Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim,
Sylwester Nawrocki, Liam Girdwood,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Linux ARM,
Linus Walleij, Jaroslav Kysela, Takashi Iwai, Olof Johansson,
Sascha Hauer, Clément Péron
On Fri, Oct 11, 2019 at 7:51 AM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
>
> On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
> > These can be build completely independently, so split
> > the two Kconfig symbols.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> I'd mention the two symbols' names you're working on in the commit log.
> I guess it's about PLAT_SAMSUNG and ARCH_S5PV210. And I wouldn't call it
> "split" which IMHO suggests there was only one symbol before.
>
> Maybe:
>
> Don't imply PLAT_SAMSUNG if ARCH_S5PV210 is enabled
>
> would be a better subject line?
Ok, changed to
ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG
> > @@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
> > # by CONFIG_* macro name.
> > plat-$(CONFIG_ARCH_OMAP) += omap
> > plat-$(CONFIG_ARCH_S3C64XX) += samsung
> > -plat-$(CONFIG_ARCH_S5PV210) += samsung
>
> Would it make more sense to make this
>
> plat-$(PLAT_SAMSUNG) += samsung
>
> (in a separate patch)? Hmm, it seems there is no plat-y for
> PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name
> containing "samsung" suggests something that seems untrue.
By the end of the series, the plat-samsung directory is completely
removed (folded into mach-s3c), so that would only add more
churn for the same result I think.
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-22 14:01 ` Arnd Bergmann
@ 2019-10-22 15:53 ` Uwe Kleine-König
2019-10-22 16:20 ` Arnd Bergmann
0 siblings, 1 reply; 22+ messages in thread
From: Uwe Kleine-König @ 2019-10-22 15:53 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ulf Hansson, Liam Girdwood, Linus Walleij,
ALSA Development Mailing List, linux-kernel, Thierry Reding,
Sylwester Nawrocki, Mauro Carvalho Chehab,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Krzysztof Kozlowski, Kukjin Kim, Clément Péron,
linux-serial, Jiri Slaby, Linux PWM List,
Bartlomiej Zolnierkiewicz, Sascha Hauer, Mark Brown,
Jaroslav Kysela
Hello,
On Tue, Oct 22, 2019 at 04:01:12PM +0200, Arnd Bergmann wrote:
> > > @@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
> > > # by CONFIG_* macro name.
> > > plat-$(CONFIG_ARCH_OMAP) += omap
> > > plat-$(CONFIG_ARCH_S3C64XX) += samsung
> > > -plat-$(CONFIG_ARCH_S5PV210) += samsung
> >
> > Would it make more sense to make this
> >
> > plat-$(PLAT_SAMSUNG) += samsung
> >
> > (in a separate patch)? Hmm, it seems there is no plat-y for
> > PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name
> > containing "samsung" suggests something that seems untrue.
>
> By the end of the series, the plat-samsung directory is completely
> removed (folded into mach-s3c), so that would only add more
> churn for the same result I think.
fine for me. The background of my question was me wondering if builds
for PLAT_S3C24XX=y (before your patch series) don't need plat-samsung.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-22 15:53 ` Uwe Kleine-König
@ 2019-10-22 16:20 ` Arnd Bergmann
0 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-22 16:20 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Kukjin Kim, Krzysztof Kozlowski, Ulf Hansson, Thierry Reding,
Mark Brown, Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim,
Sylwester Nawrocki, Liam Girdwood,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Linux ARM,
Linus Walleij, Jaroslav Kysela, Takashi Iwai, Olof Johansson,
Sascha Hauer, Clément Péron
On Tue, Oct 22, 2019 at 5:53 PM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
> The background of my question was me wondering if builds
> for PLAT_S3C24XX=y (before your patch series) don't need plat-samsung.
What I found is that the DT-based platforms (exynos and s5p) need almost nothing
from plat-samsung, while the board files and the s3c24xx/s3c64xx power
management
needs almost all of it.
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
` (2 preceding siblings ...)
2019-10-15 14:23 ` Thierry Reding
@ 2019-10-23 12:14 ` Krzysztof Kozlowski
2019-10-23 13:17 ` Arnd Bergmann
3 siblings, 1 reply; 22+ messages in thread
From: Krzysztof Kozlowski @ 2019-10-23 12:14 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kukjin Kim, Ulf Hansson, Thierry Reding, Mark Brown,
Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim, Sylwester Nawrocki,
Liam Girdwood, linux-samsung-soc, linux-arm-kernel,
linus.walleij, Uwe Kleine-König, Jaroslav Kysela,
Takashi Iwai, Olof Johansson, Sascha Hauer,
Clément Péron, Mauro Carvalho Chehab
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
> These can be build completely independently, so split
> the two Kconfig symbols.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/Kconfig.debug | 6 +++---
> arch/arm/Makefile | 1 -
> arch/arm/plat-samsung/Kconfig | 2 +-
> drivers/mmc/host/Kconfig | 2 +-
> drivers/pwm/Kconfig | 2 +-
> drivers/spi/Kconfig | 2 +-
> drivers/tty/serial/Kconfig | 2 +-
> sound/soc/samsung/Kconfig | 2 +-
> 8 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9c4f2d6deb06..4c4e97ae4fcb 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -998,7 +998,7 @@ choice
> via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
>
> config DEBUG_S3C_UART0
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
How are you going to select DEBUG_S5PV210_UART now?
Best regards,
Krzysztof
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1010,7 +1010,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART1
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> @@ -1022,7 +1022,7 @@ choice
> by the boot-loader before use.
>
> config DEBUG_S3C_UART2
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index f492d7c338fe..a1bc15cda751 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -235,7 +235,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
> # by CONFIG_* macro name.
> plat-$(CONFIG_ARCH_OMAP) += omap
> plat-$(CONFIG_ARCH_S3C64XX) += samsung
> -plat-$(CONFIG_ARCH_S5PV210) += samsung
> plat-$(CONFIG_PLAT_ORION) += orion
> plat-$(CONFIG_PLAT_PXA) += pxa
> plat-$(CONFIG_PLAT_S3C24XX) += samsung
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 740bdb23f38a..1530946cc672 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -4,7 +4,7 @@
>
> config PLAT_SAMSUNG
> bool
> - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
> + depends on PLAT_S3C24XX || ARCH_S3C64XX
> default y
> select GENERIC_IRQ_CHIP
> select NO_IOPORT_MAP
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 400a581c918c..16a0e5430b44 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -275,7 +275,7 @@ config MMC_SDHCI_TEGRA
>
> config MMC_SDHCI_S3C
> tristate "SDHCI support on Samsung S3C SoC"
> - depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_EXYNOS)
> + depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS)
> help
> This selects the Secure Digital Host Controller Interface (SDHCI)
> often referrered to as the HSMMC block in some of the Samsung S3C
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index e3a2518503ed..8eb738cac0c7 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -394,7 +394,7 @@ config PWM_ROCKCHIP
>
> config PWM_SAMSUNG
> tristate "Samsung PWM support"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> help
> Generic PWM framework driver for Samsung.
>
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 6f7fdcbb9151..355391ee643d 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ
>
> config SPI_S3C64XX
> tristate "Samsung S3C64XX series type SPI"
> - depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST)
> + depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST)
> help
> SPI driver for Samsung S3C64XX and newer SoCs.
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 4789b5d62f63..17f01cf3009c 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE
>
> config SERIAL_SAMSUNG
> tristate "Samsung SoC serial support"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select SERIAL_CORE
> help
> Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
> diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
> index 638983123d8f..7a0035dd9995 100644
> --- a/sound/soc/samsung/Kconfig
> +++ b/sound/soc/samsung/Kconfig
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0-only
> menuconfig SND_SOC_SAMSUNG
> tristate "ASoC support for Samsung"
> - depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST
> + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on COMMON_CLK
> select SND_SOC_GENERIC_DMAENGINE_PCM
> ---help---
> --
> 2.20.0
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver
2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann
@ 2019-10-23 12:32 ` Krzysztof Kozlowski
2019-10-23 13:21 ` Arnd Bergmann
0 siblings, 1 reply; 22+ messages in thread
From: Krzysztof Kozlowski @ 2019-10-23 12:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kukjin Kim, Andi Shyti, Mark Brown, linux-samsung-soc,
linux-arm-kernel, linus.walleij, linux-kernel, linux-spi
On Thu, Oct 10, 2019 at 10:29:57PM +0200, Arnd Bergmann wrote:
> The file is mostly specific to the driver, the few bits that
> are actually used by the platform code get moved to mach/map.h
> instead.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-s3c24xx/include/mach/map.h | 2 ++
> arch/arm/mach-s3c24xx/s3c2412.c | 1 -
> arch/arm/plat-samsung/devs.c | 1 -
> drivers/spi/spi-s3c24xx-fiq.S | 4 +++-
> .../include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 3 ---
> drivers/spi/spi-s3c24xx.c | 3 +--
> 6 files changed, 6 insertions(+), 8 deletions(-)
> rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (95%)
>
> diff --git a/arch/arm/mach-s3c24xx/include/mach/map.h b/arch/arm/mach-s3c24xx/include/mach/map.h
> index bca93112f57d..a20c9fd0d855 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/map.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/map.h
> @@ -86,6 +86,8 @@
> #define S3C2410_PA_SPI (0x59000000)
> #define S3C2443_PA_SPI0 (0x52000000)
> #define S3C2443_PA_SPI1 S3C2410_PA_SPI
> +#define S3C2410_SPI1 (0x20)
> +#define S3C2412_SPI1 (0x100)
>
> /* SDI */
> #define S3C2410_PA_SDI (0x5A000000)
> diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
> index 8fe4d4670dcb..c3fb3e6c0dd8 100644
> --- a/arch/arm/mach-s3c24xx/s3c2412.c
> +++ b/arch/arm/mach-s3c24xx/s3c2412.c
> @@ -37,7 +37,6 @@
> #include <plat/cpu-freq.h>
> #include <plat/devs.h>
> #include <plat/pm.h>
> -#include <plat/regs-spi.h>
>
> #include "common.h"
> #include "nand-core.h"
> diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
> index 6e4c1cb07104..fd94a35e22f8 100644
> --- a/arch/arm/plat-samsung/devs.c
> +++ b/arch/arm/plat-samsung/devs.c
> @@ -59,7 +59,6 @@
> #include <linux/platform_data/usb-s3c2410_udc.h>
> #include <linux/platform_data/usb-ohci-s3c2410.h>
> #include <plat/usb-phy.h>
> -#include <plat/regs-spi.h>
> #include <linux/platform_data/asoc-s3c.h>
> #include <linux/platform_data/spi-s3c64xx.h>
>
> diff --git a/drivers/spi/spi-s3c24xx-fiq.S b/drivers/spi/spi-s3c24xx-fiq.S
> index e95d6282109e..9d5f8f1e5e81 100644
> --- a/drivers/spi/spi-s3c24xx-fiq.S
> +++ b/drivers/spi/spi-s3c24xx-fiq.S
> @@ -12,10 +12,12 @@
>
> #include <mach/map.h>
> #include <mach/regs-irq.h>
> -#include <plat/regs-spi.h>
>
> #include "spi-s3c24xx-fiq.h"
>
> +#define S3C2410_SPTDAT (0x10)
> +#define S3C2410_SPRDAT (0x14)
> +
> .text
>
> @ entry to these routines is as follows, with the register names
> diff --git a/arch/arm/plat-samsung/include/plat/regs-spi.h b/drivers/spi/spi-s3c24xx-regs.h
> similarity index 95%
> rename from arch/arm/plat-samsung/include/plat/regs-spi.h
> rename to drivers/spi/spi-s3c24xx-regs.h
> index 607844311566..37b93ff7c7fe 100644
> --- a/arch/arm/plat-samsung/include/plat/regs-spi.h
> +++ b/drivers/spi/spi-s3c24xx-regs.h
> @@ -8,9 +8,6 @@
> #ifndef __ASM_ARCH_REGS_SPI_H
> #define __ASM_ARCH_REGS_SPI_H
Can you also update the guard name?
Best regards,
Krzysztof
>
> -#define S3C2410_SPI1 (0x20)
> -#define S3C2412_SPI1 (0x100)
> -
> #define S3C2410_SPCON (0x00)
>
> #define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */
> diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
> index 2d6e37f25e2d..2f395e4861f6 100644
> --- a/drivers/spi/spi-s3c24xx.c
> +++ b/drivers/spi/spi-s3c24xx.c
> @@ -21,10 +21,9 @@
> #include <linux/spi/s3c24xx.h>
> #include <linux/module.h>
>
> -#include <plat/regs-spi.h>
> -
> #include <asm/fiq.h>
>
> +#include "spi-s3c24xx-regs.h"
> #include "spi-s3c24xx-fiq.h"
>
> /**
> --
> 2.20.0
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 00/36] ARM: samsung platform cleanup
2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
@ 2019-10-23 13:10 ` Krzysztof Kozlowski
2019-10-23 13:39 ` Arnd Bergmann
1 sibling, 1 reply; 22+ messages in thread
From: Krzysztof Kozlowski @ 2019-10-23 13:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-fbdev, alsa-devel, dri-devel, Sylwester Nawrocki,
linux-clk, linux-leds, linux-samsung-soc, linux-stm32, Lihua Yao,
Kukjin Kim, linux-serial, linux-input, Paweł Chmiel,
linux-pwm, Sergio Prado, linux-pm, Lihua Yao, linux-arm-kernel,
linux-hwmon, patches, linux-usb, linux-mmc, linux-kernel,
linux-spi
On Thu, Oct 10, 2019 at 10:28:02PM +0200, Arnd Bergmann wrote:
> I've spent some time looking at the remaining ARMv4/ARMv5 platforms
> that are not part of ARCH_MULTIPLATFORM, and tried to get them closer
> to that. Here is what came out of that for the samsung platforms:
>
> * Exynos and s5pv210 are made independent of plat-samsung
> * device drivers stop using mach/*.h headers for s3c24xx
> (and other platforms not in this series)
> * s3c24xx and s3c64xx get merged into mach-s3c, removing
> the need for plat-samsung (I have other patches for the
> remaining plat-* directories)
> * mach/io.h gets cleaned up to only be needed for BAST
> PC104 mode (looking for ideas to proceed)
> * mach/irqs.h remains for now, this still needs to be converted
> to sparse IRQs.
>
> Some bits are a little ugly, but overall I think this a big
> improvement.
>
> The contents are available for testing in
>
> git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git s3c-multiplatform
When sending v2, can you Cc:
Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Lihua Yao <ylhuajnu@outlook.com>
(or Lihua Yao <ylhuajnu@163.com> if outlook.com bounces)
Sergio Prado <sergio.prado@e-labworks.com>
Sylwester Nawrocki <s.nawrocki@samsung.com>
These are folks which to my knowledge had working S3C and S5P boards
so maybe they could provide testing.
Best regards,
Krzysztof
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-23 12:14 ` Krzysztof Kozlowski
@ 2019-10-23 13:17 ` Arnd Bergmann
2019-10-23 14:12 ` Krzysztof Kozlowski
0 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-23 13:17 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Kukjin Kim, Ulf Hansson, Thierry Reding, Mark Brown,
Greg Kroah-Hartman, Jiri Slaby, Sangbeom Kim, Sylwester Nawrocki,
Liam Girdwood,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, Linux ARM,
Linus Walleij, Uwe Kleine-König, Jaroslav Kysela,
Takashi Iwai, Olof Johansson, Sascha Hauer
On Wed, Oct 23, 2019 at 2:15 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
> > These can be build completely independently, so split
> > the two Kconfig symbols.
> > config DEBUG_S3C_UART0
> > - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
>
> How are you going to select DEBUG_S5PV210_UART now?
I don't see a problem here, the patch should not change the behavior at all.
The whole entry now looks like:
config DEBUG_S3C_UART0
depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
select DEBUG_EXYNOS_UART if ARCH_EXYNOS
select DEBUG_S3C24XX_UART if ARCH_S3C24XX
select DEBUG_S3C64XX_UART if ARCH_S3C64XX
select DEBUG_S5PV210_UART if ARCH_S5PV210
bool "Use Samsung S3C UART 0 for low-level debug"
so this will work as before with any of ARCH_EXYNOS, ARCH_S3C24XX,
ARCH_S3C64XX and ARCH_S5PV210.
What am I missing?
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver
2019-10-23 12:32 ` Krzysztof Kozlowski
@ 2019-10-23 13:21 ` Arnd Bergmann
0 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-23 13:21 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Linus Walleij, linux-kernel, linux-spi, Kukjin Kim, Mark Brown,
Andi Shyti, Linux ARM
On Wed, Oct 23, 2019 at 2:36 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On Thu, Oct 10, 2019 at 10:29:57PM +0200, Arnd Bergmann wrote:
> > diff --git a/arch/arm/plat-samsung/include/plat/regs-spi.h b/drivers/spi/spi-s3c24xx-regs.h
> > similarity index 95%
> > rename from arch/arm/plat-samsung/include/plat/regs-spi.h
> > rename to drivers/spi/spi-s3c24xx-regs.h
> > index 607844311566..37b93ff7c7fe 100644
> > --- a/arch/arm/plat-samsung/include/plat/regs-spi.h
> > +++ b/drivers/spi/spi-s3c24xx-regs.h
> > @@ -8,9 +8,6 @@
> > #ifndef __ASM_ARCH_REGS_SPI_H
> > #define __ASM_ARCH_REGS_SPI_H
>
> Can you also update the guard name?
Ok, changed to __SPI_S3C2410_H, this seems to be the most common format
in spi drivers.
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 00/36] ARM: samsung platform cleanup
2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski
@ 2019-10-23 13:39 ` Arnd Bergmann
2019-10-23 15:17 ` Lihua Yao
0 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2019-10-23 13:39 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Linux Fbdev development list, ALSA Development Mailing List,
dri-devel, Sylwester Nawrocki, linux-clk, linux-leds,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, linux-stm32,
Lihua Yao, Kukjin Kim, linux-serial, open list:HID CORE LAYER,
Paweł Chmiel, Linux PWM List, Sergio Prado, Linux PM list
On Wed, Oct 23, 2019 at 3:11 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On Thu, Oct 10, 2019 at 10:28:02PM +0200, Arnd Bergmann wrote:
> > The contents are available for testing in
> >
> > git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git s3c-multiplatform
>
> When sending v2, can you Cc:
>
> Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
> Lihua Yao <ylhuajnu@outlook.com>
> (or Lihua Yao <ylhuajnu@163.com> if outlook.com bounces)
> Sergio Prado <sergio.prado@e-labworks.com>
> Sylwester Nawrocki <s.nawrocki@samsung.com>
>
> These are folks which to my knowledge had working S3C and S5P boards
> so maybe they could provide testing.
Ok, will do. I've uploaded the modified version based on your comments to
the above URL for now.
I'll probably give it a little more time before resending, but they
could already
start testing that version.
Thanks a lot for the review!
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
2019-10-23 13:17 ` Arnd Bergmann
@ 2019-10-23 14:12 ` Krzysztof Kozlowski
0 siblings, 0 replies; 22+ messages in thread
From: Krzysztof Kozlowski @ 2019-10-23 14:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ulf Hansson, Linus Walleij, ALSA Development Mailing List,
Liam Girdwood, Thierry Reding, Sylwester Nawrocki,
Mauro Carvalho Chehab,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Takashi Iwai, Kukjin Kim, Clément Péron, linux-serial,
Uwe Kleine-König, Linux PWM List, Bartlomiej Zolnierkiewicz,
Sascha Hauer, Jiri Slaby, Mark Brown, Jaroslav Kysela
On Wed, Oct 23, 2019 at 03:17:35PM +0200, Arnd Bergmann wrote:
> On Wed, Oct 23, 2019 at 2:15 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
> > On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
> > > These can be build completely independently, so split
> > > the two Kconfig symbols.
> > > config DEBUG_S3C_UART0
> > > - depends on PLAT_SAMSUNG || ARCH_EXYNOS
> > > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> >
> > How are you going to select DEBUG_S5PV210_UART now?
>
> I don't see a problem here, the patch should not change the behavior at all.
>
> The whole entry now looks like:
>
> config DEBUG_S3C_UART0
> depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
> select DEBUG_EXYNOS_UART if ARCH_EXYNOS
> select DEBUG_S3C24XX_UART if ARCH_S3C24XX
> select DEBUG_S3C64XX_UART if ARCH_S3C64XX
> select DEBUG_S5PV210_UART if ARCH_S5PV210
> bool "Use Samsung S3C UART 0 for low-level debug"
>
> so this will work as before with any of ARCH_EXYNOS, ARCH_S3C24XX,
> ARCH_S3C64XX and ARCH_S5PV210.
>
> What am I missing?
Ah, everything is OK, I mixed up removed with added line so it looked
reversed (removal of ARCH_S5PV210).
Looks good.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 00/36] ARM: samsung platform cleanup
2019-10-23 13:39 ` Arnd Bergmann
@ 2019-10-23 15:17 ` Lihua Yao
0 siblings, 0 replies; 22+ messages in thread
From: Lihua Yao @ 2019-10-23 15:17 UTC (permalink / raw)
To: Arnd Bergmann, Krzysztof Kozlowski
Cc: Linux Fbdev development list, ALSA Development Mailing List,
dri-devel, Sylwester Nawrocki, linux-stm32, linux-leds,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES, linux-clk,
Kukjin Kim, linux-serial, open list:HID CORE LAYER,
Paweł Chmiel, Linux PWM List, Sergio Prado, Linux PM list,
Lihua Yao
Hi Arnd, Krzysztof,
On 23/10/2019 9:39 PM, Arnd Bergmann wrote:
> On Wed, Oct 23, 2019 at 3:11 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>> On Thu, Oct 10, 2019 at 10:28:02PM +0200, Arnd Bergmann wrote:
>>> The contents are available for testing in
>>>
>>> git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git s3c-multiplatform
>> When sending v2, can you Cc:
>>
>> Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
>> Lihua Yao <ylhuajnu@outlook.com>
>> (or Lihua Yao <ylhuajnu@163.com> if outlook.com bounces)
You could reach me by e-mail to Lihua Yao <lihua.yao@gmx.com>.
Neither 163.com nor outlook.com e-mail server cooperates well with
vger.kernel.org mail list.
>> Sergio Prado <sergio.prado@e-labworks.com>
>> Sylwester Nawrocki <s.nawrocki@samsung.com>
>>
>> These are folks which to my knowledge had working S3C and S5P boards
>> so maybe they could provide testing.
> Ok, will do. I've uploaded the modified version based on your comments to
> the above URL for now.
>
> I'll probably give it a little more time before resending, but they
> could already
> start testing that version.
Nice！ Sadly I am on vocation and will test it until Nov 15.
Best Regards
Lihua
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2019-10-23 15:17 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann
[not found] ` <20191010203043.1241612-1-arnd@arndb.de>
2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann
2019-10-11 5:51 ` Uwe Kleine-König
2019-10-22 14:01 ` Arnd Bergmann
2019-10-22 15:53 ` Uwe Kleine-König
2019-10-22 16:20 ` Arnd Bergmann
2019-10-15 14:13 ` Ulf Hansson
2019-10-15 14:23 ` Thierry Reding
2019-10-23 12:14 ` Krzysztof Kozlowski
2019-10-23 13:17 ` Arnd Bergmann
2019-10-23 14:12 ` Krzysztof Kozlowski
2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann
2019-10-23 12:32 ` Krzysztof Kozlowski
2019-10-23 13:21 ` Arnd Bergmann
2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann
2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann
2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann
2019-10-10 21:02 ` Russell King - ARM Linux admin
2019-10-10 21:53 ` Arnd Bergmann
2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski
2019-10-23 13:39 ` Arnd Bergmann
2019-10-23 15:17 ` Lihua Yao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).