ARM: samsung platform cleanup
Subsystems (25)
cover ARM: samsung platform cleanup
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%)Signature · 1 line
2.20.0
PATCH 1/36 ARM: samsung: make S3C24XX_MISCCR access indirect
The clk driver uses both a function call into an exported platform file and a direct register access to a hardcoded virtual address for accessing the MISCCR register, both become are a problem for a multiplatform kernel because of the header file dependency.
Make this an indirect function call through platform data instead.
--- arch/arm/mach-s3c24xx/common.c | 3 +++ drivers/clk/samsung/clk-s3c2410-dclk.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-)
arch/arm/mach-s3c24xx/common.c +3 -0
@@ -667,5 +667,8 @@ struct platform_device s3c2410_device_dclk = { .id = 0, .num_resources = ARRAY_SIZE(s3c2410_dclk_resource), .resource = s3c2410_dclk_resource, + .dev = { + .platform_data = s3c2410_modify_misccr, + }, };#endif
drivers/clk/samsung/clk-s3c2410-dclk.c +4 -6
@@ -14,10 +14,6 @@#include <linux/module.h> #include "clk.h" -/* legacy access to misccr, until dt conversion is finished */ -#include <mach/hardware.h> -#include <mach/regs-gpio.h> -#define MUX_DCLK0 0#define MUX_DCLK1 1#define DIV_DCLK0 2
@@ -52,6 +48,7 @@ struct s3c24xx_clkout {struct clk_hw hw;u32 mask;u8 shift; +unsigned int (*modify_misccr)(unsigned int clr,unsigned int chg); };#define to_s3c24xx_clkout (_hw) container_of(_hw, struct s3c24xx_clkout, hw)
@@ -62,7 +59,7 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw)int num_parents =clk_hw_get_num_parents (hw);u32 val; - val =readl_relaxed (S3C24XX_MISCCR ) >> clkout->shift; + val = clkout->modify_misccr (0 ,0 ) >> clkout->shift; val >>= clkout->shift; val &= clkout->mask;
@@ -76,7 +73,7 @@ static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index) {struct s3c24xx_clkout *clkout =to_s3c24xx_clkout (hw); -s3c2410_modify_misccr ((clkout->mask << clkout->shift), + clkout->modify_misccr ((clkout->mask << clkout->shift), (index << clkout->shift));return 0 ;
@@ -110,6 +107,7 @@ static struct clk_hw *s3c24xx_register_clkout(struct device *dev, clkout->shift = shift; clkout->mask = mask; clkout->hw.init = &init; + clkout->modify_misccr = dev->platform_data; ret =clk_hw_register (dev, &clkout->hw);if (ret)
Signature · 1 line
2.20.0
PATCH 2/36 ARM: s3c: simplify mach/io.h
s3c24xx has a custom implementation of the inb/outb family of I/O accessors, implementing both general register access and ISA I/O port through a multiplexer.
As far as I can tell, the first case has never been needed, and certainly is not used now, as drivers only use inb/outb to actually driver ISA or PCI port I/O.
Similarly, the special ISA support is limited to a single machine, the Simtec Electronics BAST (EB2410ITX) with its PC/104 expansion connector, all other machines could simply use the generic implementation from asm/io.h that expects a single memory-mapped address range for byte, word and dword access. As no other machines besides BAST actually selects CONFIG_ISA, this is likely not even necessary.
As a cleanup, remove suport for the non-ISA access from the helpers, and make the ISA access use the virtual address window that we use elsewhere for PCI I/O ports. In configurations without the BAST machine, this now falls back on the generic implementation from asm/io.h, but the mach/io.h header is still relied on to include a number of other header files implicitly.
--- arch/arm/mach-s3c24xx/include/mach/io.h | 209 +++---------------- arch/arm/plat-samsung/include/plat/map-s3c.h | 10 +- 2 files changed, 26 insertions(+), 193 deletions(-)
arch/arm/mach-s3c24xx/include/mach/io.h +24 -185
@@ -12,201 +12,40 @@#include <mach/hardware.h> -#define IO_SPACE_LIMIT 0xffffffff/* -* We use two different types of addressing - PC style addresses, and ARM -* addresses. PC style accesses the PC hardware with the normal PC IO -* addresses, eg 0x3f8 for serial#1. ARM addresses are above A28 -* and are translated to the start of IO. Note that all addresses are -* not shifted left! +* ISA style IO, for each machine to sort out mappings for, +* if it implements it. We reserve two 16M regions for ISA, +* so the PC/104 can use separate addresses for 8-bit and +* 16-bit port I/O. */ +#define PCIO_BASE S3C_ADDR(0x02000000) +#define IO_SPACE_LIMIT 0x00ffffff +#define S3C24XX_VA_ISA_WORD (PCIO_BASE) +#define S3C24XX_VA_ISA_BYTE (PCIO_BASE + 0x01000000) -#define __PORT_PCIO (x) ((x) < (1<<28)) +#ifdef CONFIG_ISA -#define PCIO_BASE (S3C24XX_VA_ISA_WORD) -#define PCIO_BASE_b (S3C24XX_VA_ISA_BYTE) -#define PCIO_BASE_w (S3C24XX_VA_ISA_WORD) -#define PCIO_BASE_l (S3C24XX_VA_ISA_WORD) -/* -* Dynamic IO functions - let the compiler -* optimize the expressions -*/ - -#define DECLARE_DYN_OUT (sz,fnsuffix,instr) \ -static inline void __out##fnsuffix (unsigned int val, unsigned int port) \ -{ \ - unsigned long temp; \ - __asm__ __volatile__( \ - "cmp %2, #(1<<28)\n\t" \ - "mov %0, %2\n\t" \ - "addcc %0, %0, %3\n\t" \ - "str" instr " %1, [%0, #0 ] @ out" #fnsuffix \ - : "=&r" (temp) \ - : "r" (val), "r" (port), "Ir" (PCIO_BASE_##fnsuffix) \ - : "cc"); \ -} - - -#define DECLARE_DYN_IN (sz,fnsuffix,instr) \ -static inline unsigned sz __in##fnsuffix (unsigned int port) \ -{ \ - unsigned long temp, value; \ - __asm__ __volatile__( \ - "cmp %2, #(1<<28)\n\t" \ - "mov %0, %2\n\t" \ - "addcc %0, %0, %3\n\t" \ - "ldr" instr " %1, [%0, #0 ] @ in" #fnsuffix \ - : "=&r" (temp), "=r" (value) \ - : "r" (port), "Ir" (PCIO_BASE_##fnsuffix) \ - : "cc"); \ - return (unsigned sz)value; \ -} +#define inb (p) readb(S3C24XX_VA_ISA_BYTE + (p)) +#define inw (p) readw(S3C24XX_VA_ISA_WORD + (p)) +#define inl (p) readl(S3C24XX_VA_ISA_WORD + (p)) -static inline void __iomem *__ioaddr (unsigned long port) -{ -return __PORT_PCIO (port) ? (PCIO_BASE + port) : (void __iomem *)port; -} +#define outb (v,p) writeb((v), S3C24XX_VA_ISA_BYTE + (p)) +#define outw (v,p) writew((v), S3C24XX_VA_ISA_WORD + (p)) +#define outl (v,p) writel((v), S3C24XX_VA_ISA_WORD + (p)) -#define DECLARE_IO (sz,fnsuffix,instr) \ - DECLARE_DYN_IN(sz,fnsuffix,instr) \ - DECLARE_DYN_OUT(sz,fnsuffix,instr) +#define insb (p,d,l) readsb(S3C24XX_VA_ISA_BYTE + (p),d,l) +#define insw (p,d,l) readsw(S3C24XX_VA_ISA_WORD + (p),d,l) +#define insl (p,d,l) readsl(S3C24XX_VA_ISA_WORD + (p),d,l) -DECLARE_IO(char,b,"b") -DECLARE_IO(short,w,"h") -DECLARE_IO(int,l,"") +#define outsb (p,d,l) writesb(S3C24XX_VA_ISA_BYTE + (p),d,l) +#define outsw (p,d,l) writesw(S3C24XX_VA_ISA_WORD + (p),d,l) +#define outsl (p,d,l) writesl(S3C24XX_VA_ISA_WORD + (p),d,l) -#undef DECLARE_IO -#undef DECLARE_DYN_IN - -/* -* Constant address IO functions -* -* These have to be macros for the 'J' constraint to work - -* +/-4096 immediate operand. -*/ -#define __outbc (value,port) \ -({ \ - if (__PORT_PCIO((port))) \ - __asm__ __volatile__( \ - "strb %0, [%1, %2] @ outbc" \ - : : "r" (value), "r" (PCIO_BASE), "Jr" ((port))); \ - else \ - __asm__ __volatile__( \ - "strb %0, [%1, #0] @ outbc" \ - : : "r" (value), "r" ((port))); \ -}) +#else -#define __inbc (port) \ -({ \ - unsigned char result; \ - if (__PORT_PCIO((port))) \ - __asm__ __volatile__( \ - "ldrb %0, [%1, %2] @ inbc" \ - : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port))); \ - else \ - __asm__ __volatile__( \ - "ldrb %0, [%1, #0] @ inbc" \ - : "=r" (result) : "r" ((port))); \ - result; \ -}) +#define __io (x) (PCIO_BASE + (x)) -#define __outwc (value,port) \ -({ \ - unsigned long v = value; \ - if (__PORT_PCIO((port))) { \ - if ((port) < 256 && (port) > -256) \ - __asm__ __volatile__( \ - "strh %0, [%1, %2] @ outwc" \ - : : "r" (v), "r" (PCIO_BASE), "Jr" ((port))); \ - else if ((port) > 0) \ - __asm__ __volatile__( \ - "strh %0, [%1, %2] @ outwc" \ - : : "r" (v), \ - "r" (PCIO_BASE + ((port) & ~0xff)), \ - "Jr" (((port) & 0xff))); \ - else \ - __asm__ __volatile__( \ - "strh %0, [%1, #0] @ outwc" \ - : : "r" (v), \ - "r" (PCIO_BASE + (port))); \ - } else \ - __asm__ __volatile__( \ - "strh %0, [%1, #0] @ outwc" \ - : : "r" (v), "r" ((port))); \ -}) - -#define __inwc (port) \ -({ \ - unsigned short result; \ - if (__PORT_PCIO((port))) { \ - if ((port) < 256 && (port) > -256 ) \ - __asm__ __volatile__( \ - "ldrh %0, [%1, %2] @ inwc" \ - : "=r" (result) \ - : "r" (PCIO_BASE), \ - "Jr" ((port))); \ - else if ((port) > 0) \ - __asm__ __volatile__( \ - "ldrh %0, [%1, %2] @ inwc" \ - : "=r" (result) \ - : "r" (PCIO_BASE + ((port) & ~0xff)), \ - "Jr" (((port) & 0xff))); \ - else \ - __asm__ __volatile__( \ - "ldrh %0, [%1, #0] @ inwc" \ - : "=r" (result) \ - : "r" (PCIO_BASE + ((port)))); \ - } else \ - __asm__ __volatile__( \ - "ldrh %0, [%1, #0] @ inwc" \ - : "=r" (result) : "r" ((port))); \ - result; \ -}) - -#define __outlc (value,port) \ -({ \ - unsigned long v = value; \ - if (__PORT_PCIO((port))) \ - __asm__ __volatile__( \ - "str %0, [%1, %2] @ outlc" \ - : : "r" (v), "r" (PCIO_BASE), "Jr" ((port))); \ - else \ - __asm__ __volatile__( \ - "str %0, [%1, #0] @ outlc" \ - : : "r" (v), "r" ((port))); \ -}) - -#define __inlc (port) \ -({ \ - unsigned long result; \ - if (__PORT_PCIO((port))) \ - __asm__ __volatile__( \ - "ldr %0, [%1, %2] @ inlc" \ - : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port))); \ - else \ - __asm__ __volatile__( \ - "ldr %0, [%1, #0] @ inlc" \ - : "=r" (result) : "r" ((port))); \ - result; \ -}) - -#define __ioaddrc (port) ((__PORT_PCIO(port) ? PCIO_BASE + (port) : (void __iomem *)0 + (port))) - -#define inb (p) (__builtin_constant_p((p)) ? __inbc(p) : __inb(p)) -#define inw (p) (__builtin_constant_p((p)) ? __inwc(p) : __inw(p)) -#define inl (p) (__builtin_constant_p((p)) ? __inlc(p) : __inl(p)) -#define outb (v,p) (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p)) -#define outw (v,p) (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p)) -#define outl (v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) -#define __ioaddr (p) (__builtin_constant_p((p)) ? __ioaddr(p) : __ioaddrc(p)) - -#define insb (p,d,l) __raw_readsb(__ioaddr(p),d,l) -#define insw (p,d,l) __raw_readsw(__ioaddr(p),d,l) -#define insl (p,d,l) __raw_readsl(__ioaddr(p),d,l) - -#define outsb (p,d,l) __raw_writesb(__ioaddr(p),d,l) -#define outsw (p,d,l) __raw_writesw(__ioaddr(p),d,l) -#define outsl (p,d,l) __raw_writesl(__ioaddr(p),d,l) +#endif #endif
arch/arm/plat-samsung/include/plat/map-s3c.h +2 -8
@@ -9,6 +9,8 @@#ifndef __ASM_PLAT_MAP_S3C_H#define __ASM_PLAT_MAP_S3C_H __FILE__ +#include <mach/map.h> +#define S3C24XX_VA_IRQ S3C_VA_IRQ#define S3C24XX_VA_MEMCTRL S3C_VA_MEM#define S3C24XX_VA_UART S3C_VA_UART
@@ -45,16 +47,8 @@#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY -/* -* ISA style IO, for each machine to sort out mappings for, -* if it implements it. We reserve two 16M regions for ISA. -*/ -#define S3C2410_ADDR (x) S3C_ADDR(x) -#define S3C24XX_VA_ISA_WORD S3C2410_ADDR(0x02000000) -#define S3C24XX_VA_ISA_BYTE S3C2410_ADDR(0x03000000) -/* deal with the registers that move under the 2412/2413 */ #if defined(CONFIG_CPU_S3C2412 )
Signature · 1 line
2.20.0
PATCH 3/36 usb: gadget: s3c: use platform resources
In reply to Arnd BergmannThe resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers.
--- drivers/usb/gadget/udc/s3c2410_udc.c | 31 +++++++------------ drivers/usb/gadget/udc/s3c2410_udc.h | 1 + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 3 files changed, 12 insertions(+), 20 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%)
drivers/usb/gadget/udc/s3c2410_udc.c +11 -20
@@ -36,15 +36,11 @@#include <asm/byteorder.h> #include <asm/irq.h> #include <asm/unaligned.h> -#include <mach/irqs.h> -#include <mach/hardware.h> - -#include <plat/regs-udc.h> #include <linux/platform_data/usb-s3c2410_udc.h> -#include "s3c2410_udc.h" +#include "s3c2410_udc_regs.h" #define DRIVER_DESC "S3C2410 USB Device Controller Gadget"#define DRIVER_AUTHOR "Herbert Pötzl <[email protected]>, " \
@@ -57,6 +53,7 @@ static struct s3c2410_udc *the_controller;static struct clk *udc_clock;static struct clk *usb_bus_clock;static void __iomem *base_addr; +static int irq_usbd;static u64 rsrc_start;static u64 rsrc_len;static struct dentry *s3c2410_udc_debugfs_root;
@@ -839,8 +836,6 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep) } } -#include <mach/regs-irq.h> -/* * s3c2410_udc_irq - interrupt handler */
@@ -981,7 +976,7 @@ static irqreturn_t s3c2410_udc_irq(int dummy, void *_dev) } } -dprintk (DEBUG_VERBOSE ,"irq: %d s3c2410_udc_done.\n" ,IRQ_USBD ); +dprintk (DEBUG_VERBOSE ,"irq: %d s3c2410_udc_done.\n" , irq_usbd);/* Restore old index */ udc_write (idx,S3C2410_UDC_INDEX_REG );
@@ -1784,13 +1779,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)spin_lock_init (&udc->lock); udc_info =dev_get_platdata (&pdev->dev); - rsrc_start =S3C2410_PA_USBDEV ; - rsrc_len =S3C24XX_SZ_USBDEV ; - -if (!request_mem_region (rsrc_start, rsrc_len, gadget_name)) -return -EBUSY ; - - base_addr =ioremap (rsrc_start, rsrc_len); + base_addr =devm_platform_ioremap_resource (pdev,0 );if (!base_addr) { retval = -ENOMEM ; goto err_mem;
@@ -1802,17 +1791,19 @@ static int s3c2410_udc_probe(struct platform_device *pdev)s3c2410_udc_disable (udc);s3c2410_udc_reinit (udc); + irq_usbd =platform_get_irq (pdev,0 ); +/* irq setup after old hardware state is cleaned up */ - retval =request_irq (IRQ_USBD , s3c2410_udc_irq, + retval =request_irq (irq_usbd, s3c2410_udc_irq,0 , gadget_name, udc);if (retval !=0 ) { -dev_err (dev,"cannot get irq %i, err %d\n" ,IRQ_USBD , retval); +dev_err (dev,"cannot get irq %i, err %d\n" , irq_usbd, retval); retval = -EBUSY ; goto err_map; } -dev_dbg (dev,"got irq %i\n" ,IRQ_USBD ); +dev_dbg (dev,"got irq %i\n" , irq_usbd);if (udc_info && udc_info->vbus_pin >0 ) { retval =gpio_request (udc_info->vbus_pin,"udc vbus" );
@@ -1879,7 +1870,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)if (udc_info && udc_info->vbus_pin >0 )gpio_free (udc_info->vbus_pin); err_int: -free_irq (IRQ_USBD , udc); +free_irq (irq_usbd, udc); err_map:iounmap (base_addr); err_mem:
@@ -1913,7 +1904,7 @@ static int s3c2410_udc_remove(struct platform_device *pdev)free_irq (irq, udc); } -free_irq (IRQ_USBD , udc); +free_irq (irq_usbd, udc);iounmap (base_addr);release_mem_region (rsrc_start, rsrc_len);
drivers/usb/gadget/udc/s3c2410_udc.h +1 -0
@@ -90,6 +90,7 @@ struct s3c2410_udc { unsigned req_pending : 1;u8 vbus;struct dentry *regs_info; +int irq; };#define to_s3c2410 (g) (container_of((g), struct s3c2410_udc, gadget))
drivers/usb/gadget/udc/s3c2410_udc_regs.h renamed from arch/arm/plat-samsung/include/plat/regs-udc.h +0 -0
Signature · 7 lines
2.20.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 03/36] usb: gadget: s3c: use platform resources
Quoted 10 lines · Arnd Bergmann
The resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers.
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/usb/gadget/udc/s3c2410_udc.c | 31 +++++++------------ drivers/usb/gadget/udc/s3c2410_udc.h | 1 + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 3 files changed, 12 insertions(+), 20 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%)
Best regards,
Krzysztof
Krzysztof Kozlowski
maintainerRe: [PATCH 03/36] usb: gadget: s3c: use platform resources
In reply to Arnd BergmannQuoted 2 lines · Arnd Bergmann
The resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers.
Generic comment to all patches - you seem to break commit msg lines slightly too early. In certain cases it makes them unnecessarily longer. Maybe your editor has to be fixed to wrap at 75 column.
Best regards,
Krzysztof
Re: [PATCH 03/36] usb: gadget: s3c: use platform resources
Quoted 8 lines · Krzysztof Kozlowski
Quoted 2 lines · Arnd Bergmann
The resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers.
Generic comment to all patches - you seem to break commit msg lines slightly too early. In certain cases it makes them unnecessarily longer. Maybe your editor has to be fixed to wrap at 75 column.
I tend to use '/usr//bin/fmt' with the default setting. I think the idea of that default is that an email reply with added '>' characters doesn't immediately have to reflow the text.
Arnd
PATCH 4/36 usb: gadget: s3c-hsudc: remove platform header dependency
In reply to Arnd BergmannThere is no real phy driver, so s3c-hsudc just pokes the registers itself. Improve this a little by making it a platform data callback like we do for gpios.
There is only one board using this driver, and it's unlikely that another would be added, so this is a minimal workaround.
--- .../include/mach/regs-s3c2443-clock.h | 49 +++++++++++++++++ arch/arm/plat-samsung/devs.c | 3 + drivers/usb/gadget/udc/s3c-hsudc.c | 55 ++----------------- include/linux/platform_data/s3c-hsudc.h | 2 + 4 files changed, 58 insertions(+), 51 deletions(-)
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +49 -0
@@ -10,6 +10,8 @@#ifndef __ASM_ARM_REGS_S3C2443_CLOCK#define __ASM_ARM_REGS_S3C2443_CLOCK +#include <linux/delay.h> +#define S3C2443_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)#define S3C2443_PLLCON_MDIVSHIFT 16
@@ -184,5 +186,52 @@ s3c2443_get_epll(unsigned int pllval, unsigned int baseclk)return (unsigned int )fvco; } +static inline void s3c_hsudc_init_phy (void ) +{ +u32 cfg; + + cfg =readl (S3C2443_PWRCFG ) |S3C2443_PWRCFG_USBPHY ; +writel (cfg,S3C2443_PWRCFG ); + + cfg =readl (S3C2443_URSTCON ); + cfg |= (S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); +writel (cfg,S3C2443_URSTCON ); +mdelay (1 ); + + cfg =readl (S3C2443_URSTCON ); + cfg &= ~(S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); +writel (cfg,S3C2443_URSTCON ); + + cfg =readl (S3C2443_PHYCTRL ); + cfg &= ~(S3C2443_PHYCTRL_CLKSEL |S3C2443_PHYCTRL_DSPORT ); + cfg |= (S3C2443_PHYCTRL_EXTCLK |S3C2443_PHYCTRL_PLLSEL ); +writel (cfg,S3C2443_PHYCTRL ); + + cfg =readl (S3C2443_PHYPWR ); + cfg &= ~(S3C2443_PHYPWR_FSUSPEND |S3C2443_PHYPWR_PLL_PWRDN | +S3C2443_PHYPWR_XO_ON |S3C2443_PHYPWR_PLL_REFCLK | +S3C2443_PHYPWR_ANALOG_PD ); + cfg |=S3C2443_PHYPWR_COMMON_ON ; +writel (cfg,S3C2443_PHYPWR ); + + cfg =readl (S3C2443_UCLKCON ); + cfg |= (S3C2443_UCLKCON_DETECT_VBUS |S3C2443_UCLKCON_FUNC_CLKEN | +S3C2443_UCLKCON_TCLKEN ); +writel (cfg,S3C2443_UCLKCON ); +} + +static inline void s3c_hsudc_uninit_phy (void ) +{ +u32 cfg; + + cfg =readl (S3C2443_PWRCFG ) & ~S3C2443_PWRCFG_USBPHY ; +writel (cfg,S3C2443_PWRCFG ); + +writel (S3C2443_PHYPWR_FSUSPEND ,S3C2443_PHYPWR ); + + cfg =readl (S3C2443_UCLKCON ) & ~S3C2443_UCLKCON_FUNC_CLKEN ; +writel (cfg,S3C2443_UCLKCON ); +} +#endif /* __ASM_ARM_REGS_S3C2443_CLOCK */
arch/arm/plat-samsung/devs.c +3 -0
@@ -40,6 +40,7 @@#include <mach/dma.h> #include <mach/irqs.h> #include <mach/map.h> +#include <mach/regs-s3c2443-clock.h> #include <plat/cpu.h> #include <plat/devs.h>
@@ -1038,6 +1039,8 @@ struct platform_device s3c_device_usb_hsudc = {void __init s3c24xx_hsudc_set_platdata (struct s3c24xx_hsudc_platdata *pd) {s3c_set_platdata (pd,sizeof (*pd), &s3c_device_usb_hsudc); + pd->phy_init = s3c_hsudc_init_phy; + pd->phy_uninit = s3c_hsudc_uninit_phy; }#endif /* CONFIG_PLAT_S3C24XX */
drivers/usb/gadget/udc/s3c-hsudc.c +4 -51
79 lines not on this page · raw message
include/linux/platform_data/s3c-hsudc.h +2 -0
@@ -26,6 +26,8 @@ struct s3c24xx_hsudc_platdata {unsigned int epnum;void (*gpio_init)(void );void (*gpio_uninit)(void ); +void (*phy_init)(void ); + void (*phy_uninit)(void); };#endif /* __LINUX_USB_S3C_HSUDC_H */
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 04/36] usb: gadget: s3c-hsudc: remove platform header dependency
Quoted 170 lines · Arnd Bergmann
There is no real phy driver, so s3c-hsudc just pokes the registers itself. Improve this a little by making it a platform data callback like we do for gpios.
There is only one board using this driver, and it's unlikely that another would be added, so this is a minimal workaround.
Signed-off-by Arnd Bergmann <[email protected]>--- .../include/mach/regs-s3c2443-clock.h | 49 +++++++++++++++++ arch/arm/plat-samsung/devs.c | 3 + drivers/usb/gadget/udc/s3c-hsudc.c | 55 ++----------------- include/linux/platform_data/s3c-hsudc.h | 2 + 4 files changed, 58 insertions(+), 51 deletions(-)arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +49
-0@@ -10,6 +10,8 @@#ifndef __ASM_ARM_REGS_S3C2443_CLOCK#define __ASM_ARM_REGS_S3C2443_CLOCK +#include <linux/delay.h> +#define S3C2443_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)#define S3C2443_PLLCON_MDIVSHIFT 16@@ -184,5 +186,52 @@ s3c2443_get_epll(unsigned int pllval, unsigned int baseclk)return (unsigned int )fvco; } +static inline void s3c_hsudc_init_phy (void ) +{ +u32 cfg; + + cfg =readl (S3C2443_PWRCFG ) |S3C2443_PWRCFG_USBPHY ; +writel (cfg,S3C2443_PWRCFG ); + + cfg =readl (S3C2443_URSTCON ); + cfg |= (S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); +writel (cfg,S3C2443_URSTCON ); +mdelay (1 ); + + cfg =readl (S3C2443_URSTCON ); + cfg &= ~(S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); +writel (cfg,S3C2443_URSTCON ); + + cfg =readl (S3C2443_PHYCTRL ); + cfg &= ~(S3C2443_PHYCTRL_CLKSEL |S3C2443_PHYCTRL_DSPORT ); + cfg |= (S3C2443_PHYCTRL_EXTCLK |S3C2443_PHYCTRL_PLLSEL ); +writel (cfg,S3C2443_PHYCTRL ); + + cfg =readl (S3C2443_PHYPWR ); + cfg &= ~(S3C2443_PHYPWR_FSUSPEND |S3C2443_PHYPWR_PLL_PWRDN | +S3C2443_PHYPWR_XO_ON |S3C2443_PHYPWR_PLL_REFCLK | +S3C2443_PHYPWR_ANALOG_PD ); + cfg |=S3C2443_PHYPWR_COMMON_ON ; +writel (cfg,S3C2443_PHYPWR ); + + cfg =readl (S3C2443_UCLKCON ); + cfg |= (S3C2443_UCLKCON_DETECT_VBUS |S3C2443_UCLKCON_FUNC_CLKEN | +S3C2443_UCLKCON_TCLKEN ); +writel (cfg,S3C2443_UCLKCON ); +} + +static inline void s3c_hsudc_uninit_phy (void ) +{ +u32 cfg; + + cfg =readl (S3C2443_PWRCFG ) & ~S3C2443_PWRCFG_USBPHY ; +writel (cfg,S3C2443_PWRCFG ); + +writel (S3C2443_PHYPWR_FSUSPEND ,S3C2443_PHYPWR ); + + cfg =readl (S3C2443_UCLKCON ) & ~S3C2443_UCLKCON_FUNC_CLKEN ; +writel (cfg,S3C2443_UCLKCON ); +} +#endif /* __ASM_ARM_REGS_S3C2443_CLOCK */ arch/arm/plat-samsung/devs.c +3
-0@@ -40,6 +40,7 @@#include <mach/dma.h> #include <mach/irqs.h> #include <mach/map.h> +#include <mach/regs-s3c2443-clock.h> #include <plat/cpu.h> #include <plat/devs.h> @@ -1038,6 +1039,8 @@ struct platform_device s3c_device_usb_hsudc = {void __init s3c24xx_hsudc_set_platdata (struct s3c24xx_hsudc_platdata *pd) {s3c_set_platdata (pd,sizeof (*pd), &s3c_device_usb_hsudc); + pd->phy_init = s3c_hsudc_init_phy; + pd->phy_uninit = s3c_hsudc_uninit_phy; }#endif /* CONFIG_PLAT_S3C24XX */ drivers/usb/gadget/udc/s3c-hsudc.c +0
-49@@ -30,8 +30,6 @@#include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> -#include <mach/regs-s3c2443-clock.h> -#define S3C_HSUDC_REG (x) (x)/* Non-Indexed Registers */ @@ -186,53 +184,6 @@ static inline void __orr32(void __iomem *ptr, u32 val)writel (readl (ptr) | val, ptr); } -static void s3c_hsudc_init_phy (void ) -{ -u32 cfg; - - cfg =readl (S3C2443_PWRCFG ) |S3C2443_PWRCFG_USBPHY ; -writel (cfg,S3C2443_PWRCFG ); - - cfg =readl (S3C2443_URSTCON ); - cfg |= (S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); -writel (cfg,S3C2443_URSTCON ); -mdelay (1 ); - - cfg =readl (S3C2443_URSTCON ); - cfg &= ~(S3C2443_URSTCON_FUNCRST |S3C2443_URSTCON_PHYRST ); -writel (cfg,S3C2443_URSTCON ); - - cfg =readl (S3C2443_PHYCTRL ); - cfg &= ~(S3C2443_PHYCTRL_CLKSEL |S3C2443_PHYCTRL_DSPORT ); - cfg |= (S3C2443_PHYCTRL_EXTCLK |S3C2443_PHYCTRL_PLLSEL ); -writel (cfg,S3C2443_PHYCTRL ); - - cfg =readl (S3C2443_PHYPWR ); - cfg &= ~(S3C2443_PHYPWR_FSUSPEND |S3C2443_PHYPWR_PLL_PWRDN | -S3C2443_PHYPWR_XO_ON |S3C2443_PHYPWR_PLL_REFCLK | -S3C2443_PHYPWR_ANALOG_PD ); - cfg |=S3C2443_PHYPWR_COMMON_ON ; -writel (cfg,S3C2443_PHYPWR ); - - cfg =readl (S3C2443_UCLKCON ); - cfg |= (S3C2443_UCLKCON_DETECT_VBUS |S3C2443_UCLKCON_FUNC_CLKEN | -S3C2443_UCLKCON_TCLKEN ); -writel (cfg,S3C2443_UCLKCON ); -} - -static void s3c_hsudc_uninit_phy (void ) -{ -u32 cfg; - - cfg =readl (S3C2443_PWRCFG ) & ~S3C2443_PWRCFG_USBPHY ; -writel (cfg,S3C2443_PWRCFG ); - -writel (S3C2443_PHYPWR_FSUSPEND ,S3C2443_PHYPWR ); - - cfg =readl (S3C2443_UCLKCON ) & ~S3C2443_UCLKCON_FUNC_CLKEN ; -writel (cfg,S3C2443_UCLKCON ); -} -/** * s3c_hsudc_complete_request - Complete a transfer request. * @hsep: Endpoint to which the request belongs.
drivers/usb/gadget/udc/s3c-hsudc.c static int s3c_hsudc_start(struct usb_gadget *gadget, · line 1143
Quoted 6 lines
drivers/usb/gadget/udc/s3c-hsudc.c +2
-1@@ -1188,7 +1139,8 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,pm_runtime_get_sync (hsudc->dev); -s3c_hsudc_init_phy (); +if (hsudc->pd->phy_init) + hsudc->pd->gpio_init ();
Copy paste error - phy_init().
Are here (and in previous usb gadget patch) any dependencies? If so, I would need an ack to take it through samsung-soc.
Best regards,
Krzysztof
Quoted 29 lines
drivers/usb/gadget/udc/s3c-hsudc.c +2
-1if (hsudc->pd->gpio_init) hsudc->pd->gpio_init ();@@ -1210,7 +1162,8 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget)spin_lock_irqsave (&hsudc->lock, flags); hsudc->gadget.speed =USB_SPEED_UNKNOWN ; -s3c_hsudc_uninit_phy (); +if (hsudc->pd->phy_uninit) + hsudc->pd->phy_uninit ();pm_runtime_put (hsudc->dev);include/linux/platform_data/s3c-hsudc.h +2
-0@@ -26,6 +26,8 @@ struct s3c24xx_hsudc_platdata {unsigned int epnum;void (*gpio_init)(void );void (*gpio_uninit)(void ); +void (*phy_init)(void ); + void (*phy_uninit)(void); };#endif /* __LINUX_USB_S3C_HSUDC_H */ Signature · 1 line
2.20.0
Re: [PATCH 04/36] usb: gadget: s3c-hsudc: remove platform header dependency
Quoted 10 lines · Krzysztof Kozlowski
drivers/usb/gadget/udc/s3c-hsudc.c static int s3c_hsudc_start(struct usb_gadget *gadget, · line 1143
Quoted 7 lines · Arnd Bergmann
drivers/usb/gadget/udc/s3c-hsudc.c +2
-1@@ -1188,7 +1139,8 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,pm_runtime_get_sync (hsudc->dev); -s3c_hsudc_init_phy (); +if (hsudc->pd->phy_init) + hsudc->pd->gpio_init ();Copy paste error -
phy_init().
Fixed, thanks!
Quoted 2 lines
Are here (and in previous usb gadget patch) any dependencies? If so, I would need an ack to take it through samsung-soc.
Yes. This patch should not depend on anything else, but later patches in the series depend on it, so I'd like to keep everything together.
Arnd
PATCH 5/36 ARM: samsung: make pm-debug platform independent
In reply to Arnd BergmannThe pm-debug code is one of the few things shared between s3c24xx/s3c64xx and the newer s5pv210. In order to make s5pv210 independent of plat-samsung, change the common bits of this code to no longer reference the s3c specific bits.
--- arch/arm/mach-s3c24xx/include/mach/pm-core.h | 7 +-- arch/arm/mach-s3c64xx/include/mach/pm-core.h | 44 +--------------- arch/arm/mach-s3c64xx/pm.c | 50 +++++++++++++++++++ arch/arm/mach-s5pv210/pm.c | 6 +-- .../arm/plat-samsung/include/plat/pm-common.h | 29 +++++------ arch/arm/plat-samsung/pm-debug.c | 23 ++------- arch/arm/plat-samsung/pm.c | 10 ++-- 7 files changed, 80 insertions(+), 89 deletions(-)
arch/arm/mach-s3c24xx/include/mach/pm-core.h +2 -5
@@ -15,6 +15,7 @@static inline void s3c_pm_debug_init_uart (void ) { +#ifdef CONFIG_SAMSUNG_PM_DEBUG unsigned long tmp =__raw_readl (S3C2410_CLKCON );/* re-start uart clocks */
@@ -24,6 +25,7 @@ static inline void s3c_pm_debug_init_uart(void)__raw_writel (tmp,S3C2410_CLKCON );udelay (10 ); +#endif }static inline void s3c_pm_arch_prepare_irqs (void )
@@ -75,11 +77,6 @@ static inline void s3c_pm_arch_show_resume_irqs(void) s3c_irqwake_eintmask); } -static inline void s3c_pm_arch_update_uart (void __iomem *regs, -struct pm_uart_save *save) -{ -} -static inline void s3c_pm_restored_gpios (void ) { }static inline void samsung_pm_saved_gpios (void ) { }
arch/arm/mach-s3c64xx/include/mach/pm-core.h +2 -42
62 lines not on this page · raw message
arch/arm/mach-s3c64xx/pm.c +50 -0
56 lines not on this page · raw message
arch/arm/mach-s5pv210/pm.c +2 -4
@@ -99,8 +99,6 @@ static int s5pv210_suspend_enter(suspend_state_t state)u32 eint_wakeup_mask =s5pv210_read_eint_wakeup_mask ();int ret; -s3c_pm_debug_init (); -S3C_PMDBG ("%s: suspending the system...\n" , __func__); S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__,
@@ -113,7 +111,7 @@ static int s5pv210_suspend_enter(suspend_state_t state)return -EINVAL ; } -s3c_pm_save_uarts (); +s3c_pm_save_uarts (false);s5pv210_pm_prepare ();flush_cache_all ();s3c_pm_check_store ();
@@ -122,7 +120,7 @@ static int s5pv210_suspend_enter(suspend_state_t state)if (ret)return ret; -s3c_pm_restore_uarts (); +s3c_pm_restore_uarts (false);S3C_PMDBG ("%s: wakeup stat: %08x\n" , __func__,__raw_readl (S5P_WAKEUP_STAT ));
arch/arm/plat-samsung/include/plat/pm-common.h +15 -14
@@ -69,25 +69,26 @@ struct pm_uart_save {*/ extern void s3c_pm_dbg (const char *msg, ...); -/** -* s3c_pm_debug_init() - suspend/resume low level debug initialization. -* @base: Virtual base of UART to use for suspend/resume debugging. -* -* This function needs to be called before S3C_PMDBG() can be used, to set up -* UART port base address and configuration. -*/ -extern void s3c_pm_debug_init (void ); - #define S3C_PMDBG(fmt...) s3c_pm_dbg(fmt) -extern void s3c_pm_save_uarts (void ); -extern void s3c_pm_restore_uarts (void ); +extern void s3c_pm_save_uarts (bool is_s3c24xx); +extern void s3c_pm_restore_uarts (bool is_s3c24xx); + +#ifdef CONFIG_ARCH_S3C64XX +extern void s3c_pm_arch_update_uart (void __iomem *regs, +struct pm_uart_save *save); +#else +static inline void +s3c_pm_arch_update_uart (void __iomem *regs,struct pm_uart_save *save) +{ +} +#endif +#else #define S3C_PMDBG(fmt...) pr_debug(fmt) -#define s3c_pm_debug_init () do { } while (0) -static inline void s3c_pm_save_uarts (void ) { } -static inline void s3c_pm_restore_uarts (void ) { } +static inline void s3c_pm_save_uarts (bool is_s3c24xx) { } +static inline void s3c_pm_restore_uarts (bool is_s3c24xx) { }#endif /* suspend memory checking */
arch/arm/plat-samsung/pm-debug.c +4 -19
@@ -18,15 +18,6 @@#include <plat/cpu.h> #include <plat/pm-common.h> -#ifdef CONFIG_SAMSUNG_ATAGS -#include <plat/pm.h> -#include <mach/pm-core.h> -#else -static inline void s3c_pm_debug_init_uart (void ) {} -static inline void s3c_pm_arch_update_uart (void __iomem *regs, -struct pm_uart_save *save) {} -#endif -static struct pm_uart_save uart_save;extern void printascii (const char *);
@@ -43,12 +34,6 @@ void s3c_pm_dbg(const char *fmt, ...)printascii (buff); } -void s3c_pm_debug_init (void ) -{ -/* restart uart clocks so we can use them to output */ -s3c_pm_debug_init_uart (); -} -static inline void __iomem *s3c_pm_uart_base (void ) {unsigned long paddr;
@@ -59,7 +44,7 @@ static inline void __iomem *s3c_pm_uart_base(void)return (void __iomem *)vaddr; } -void s3c_pm_save_uarts (void ) +void s3c_pm_save_uarts (bool is_s3c2410) {void __iomem *regs =s3c_pm_uart_base ();struct pm_uart_save *save = &uart_save;
@@ -70,14 +55,14 @@ void s3c_pm_save_uarts(void) save->umcon =__raw_readl (regs +S3C2410_UMCON ); save->ubrdiv =__raw_readl (regs +S3C2410_UBRDIV ); -if (!soc_is_s3c2410 ()) +if (!is_s3c2410) save->udivslot =__raw_readl (regs +S3C2443_DIVSLOT );S3C_PMDBG ("UART[%p]: ULCON=%04x, UCON=%04x, UFCON=%04x, UBRDIV=%04x\n" , regs, save->ulcon, save->ucon, save->ufcon, save->ubrdiv); } -void s3c_pm_restore_uarts (void ) +void s3c_pm_restore_uarts (bool is_s3c2410) {void __iomem *regs =s3c_pm_uart_base ();struct pm_uart_save *save = &uart_save;
@@ -90,6 +75,6 @@ void s3c_pm_restore_uarts(void)__raw_writel (save->umcon, regs +S3C2410_UMCON );__raw_writel (save->ubrdiv, regs +S3C2410_UBRDIV ); -if (!soc_is_s3c2410 ()) +if (!is_s3c2410)__raw_writel (save->udivslot, regs +S3C2443_DIVSLOT ); }
arch/arm/plat-samsung/pm.c +5 -5
@@ -25,6 +25,7 @@#include <asm/irq.h> +#include <plat/cpu.h> #include <plat/pm.h> #include <mach/pm-core.h>
@@ -70,8 +71,7 @@ static int s3c_pm_enter(suspend_state_t state) {int ret;/* ensure the debug is initialised (if enabled) */ - -s3c_pm_debug_init (); +s3c_pm_debug_init_uart ();S3C_PMDBG ("%s(%d)\n" , __func__, state);
@@ -100,7 +100,7 @@ static int s3c_pm_enter(suspend_state_t state)samsung_pm_saved_gpios (); } -s3c_pm_save_uarts (); +s3c_pm_save_uarts (soc_is_s3c2410 ());s3c_pm_save_core ();/* set the irq configuration for wake */
@@ -137,14 +137,14 @@ static int s3c_pm_enter(suspend_state_t state)/* restore the system state */ s3c_pm_restore_core (); -s3c_pm_restore_uarts (); +s3c_pm_restore_uarts (soc_is_s3c2410 ());if (!of_have_populated_dt ()) {samsung_pm_restore_gpios ();s3c_pm_restored_gpios (); } -s3c_pm_debug_init (); +s3c_pm_debug_init_uart ();/* check what irq (if any) restored the system */
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 05/36] ARM: samsung: make pm-debug platform independent
Quoted 183 lines · Arnd Bergmann
The pm-debug code is one of the few things shared between s3c24xx/s3c64xx and the newer s5pv210. In order to make s5pv210 independent of plat-samsung, change the common bits of this code to no longer reference the s3c specific bits.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/include/mach/pm-core.h | 7 +-- arch/arm/mach-s3c64xx/include/mach/pm-core.h | 44 +--------------- arch/arm/mach-s3c64xx/pm.c | 50 +++++++++++++++++++ arch/arm/mach-s5pv210/pm.c | 6 +-- .../arm/plat-samsung/include/plat/pm-common.h | 29 +++++------ arch/arm/plat-samsung/pm-debug.c | 23 ++------- arch/arm/plat-samsung/pm.c | 10 ++-- 7 files changed, 80 insertions(+), 89 deletions(-)arch/arm/mach-s3c24xx/include/mach/pm-core.h +2
-5@@ -15,6 +15,7 @@static inline void s3c_pm_debug_init_uart (void ) { +#ifdef CONFIG_SAMSUNG_PM_DEBUG unsigned long tmp =__raw_readl (S3C2410_CLKCON );/* re-start uart clocks */ @@ -24,6 +25,7 @@ static inline void s3c_pm_debug_init_uart(void)__raw_writel (tmp,S3C2410_CLKCON );udelay (10 ); +#endif }static inline void s3c_pm_arch_prepare_irqs (void )@@ -75,11 +77,6 @@ static inline void s3c_pm_arch_show_resume_irqs(void) s3c_irqwake_eintmask); } -static inline void s3c_pm_arch_update_uart (void __iomem *regs, -struct pm_uart_save *save) -{ -} -static inline void s3c_pm_restored_gpios (void ) { }static inline void samsung_pm_saved_gpios (void ) { }arch/arm/mach-s3c64xx/include/mach/pm-core.h +2
-42@@ -20,6 +20,7 @@static inline void s3c_pm_debug_init_uart (void ) { +#ifdef CONFIG_SAMSUNG_PM_DEBUG u32 tmp =__raw_readl (S3C_PCLK_GATE );/* As a note, since the S3C64XX UARTs generally have multiple @@ -35,6 +36,7 @@ static inline void s3c_pm_debug_init_uart(void)__raw_writel (tmp,S3C_PCLK_GATE );udelay (10 ); +#endif }static inline void s3c_pm_arch_prepare_irqs (void )@@ -63,48 +65,6 @@ static inline void s3c_pm_arch_show_resume_irqs(void)#define s3c_irqwake_intallow 0#endif -static inline void s3c_pm_arch_update_uart (void __iomem *regs, -struct pm_uart_save *save) -{ -u32 ucon =__raw_readl (regs +S3C2410_UCON ); -u32 ucon_clk = ucon &S3C6400_UCON_CLKMASK ; -u32 save_clk = save->ucon &S3C6400_UCON_CLKMASK ; -u32 new_ucon; -u32 delta; - -/* S3C64XX UART blocks only support level interrupts, so ensure that -* when we restore unused UART blocks we force the level interrupt -* settigs. */ - save->ucon |=S3C2410_UCON_TXILEVEL |S3C2410_UCON_RXILEVEL ; - -/* We have a constraint on changing the clock type of the UART -* between UCLKx and PCLK, so ensure that when we restore UCON -* that the CLK field is correctly modified if the bootloader -* has changed anything. -*/ -if (ucon_clk != save_clk) { - new_ucon = save->ucon; - delta = ucon_clk ^ save_clk; - -/* change from UCLKx => wrong PCLK, -* either UCLK can be tested for by a bit-test -* with UCLK0 */ -if (ucon_clk &S3C6400_UCON_UCLK0 && - !(save_clk &S3C6400_UCON_UCLK0 ) && - delta &S3C6400_UCON_PCLK2 ) { - new_ucon &= ~S3C6400_UCON_UCLK0 ; - }else if (delta ==S3C6400_UCON_PCLK2 ) { -/* as an precaution, don't change from -* PCLK2 => PCLK or vice-versa */ - new_ucon ^=S3C6400_UCON_PCLK2 ; - } - -S3C_PMDBG ("ucon change %04x => %04x (save=%04x)\n" , - ucon, new_ucon, save->ucon); - save->ucon = new_ucon; - } -} -static inline void s3c_pm_restored_gpios (void ) {/* ensure sleep mode has been cleared from the system */ arch/arm/mach-s3c64xx/pm.c +50
-0@@ -305,6 +305,56 @@ static void s3c64xx_pm_prepare(void)__raw_writel (__raw_readl (S3C64XX_WAKEUP_STAT ),S3C64XX_WAKEUP_STAT ); } +#ifdef CONFIG_SAMSUNG_PM_DEBUG +void s3c_pm_arch_update_uart (void __iomem *regs,struct pm_uart_save *save) +{ +u32 ucon; + u32 ucon_clk +u32 save_clk; +u32 new_ucon; +u32 delta; + +if (!soc_is_s3c64xx ()) +return ; + + ucon =__raw_readl (regs +S3C2410_UCON ); + ucon_clk = ucon &S3C6400_UCON_CLKMASK ; + sav_clk = save->ucon &S3C6400_UCON_CLKMASK ; + +/* S3C64XX UART blocks only support level interrupts, so ensure that +* when we restore unused UART blocks we force the level interrupt +* settigs. */ + save->ucon |=S3C2410_UCON_TXILEVEL |S3C2410_UCON_RXILEVEL ; + +/* We have a constraint on changing the clock type of the UART +* between UCLKx and PCLK, so ensure that when we restore UCON +* that the CLK field is correctly modified if the bootloader +* has changed anything. +*/ +if (ucon_clk != save_clk) { + new_ucon = save->ucon; + delta = ucon_clk ^ save_clk; + +/* change from UCLKx => wrong PCLK, +* either UCLK can be tested for by a bit-test +* with UCLK0 */ +if (ucon_clk &S3C6400_UCON_UCLK0 && + !(save_clk &S3C6400_UCON_UCLK0 ) && + delta &S3C6400_UCON_PCLK2 ) { + new_ucon &= ~S3C6400_UCON_UCLK0 ; + }else if (delta ==S3C6400_UCON_PCLK2 ) { +/* as an precaution, don't change from +* PCLK2 => PCLK or vice-versa */ + new_ucon ^=S3C6400_UCON_PCLK2 ; + } + +S3C_PMDBG ("ucon change %04x => %04x (save=%04x)\n" , + ucon, new_ucon, save->ucon); + save->ucon = new_ucon; + } +} +#endif +int __init s3c64xx_pm_init (void ) {int i;arch/arm/mach-s5pv210/pm.c +0
-0
arch/arm/mach-s5pv210/pm.c static int s5pv210_suspend_enter(suspend_state_t state) · line 102
Quoted 4 lines
arch/arm/mach-s5pv210/pm.c +0
-1@@ -99,8 +99,6 @@ static int s5pv210_suspend_enter(suspend_state_t state)u32 eint_wakeup_mask =s5pv210_read_eint_wakeup_mask ();int ret; -s3c_pm_debug_init ();
Your patch is not equivalent here. If there is a reason behind removal of UART init (e.g. not needed), I prefer to make it in separate patch.
Rest looks good.
Best regards,
Krzysztof
Re: [PATCH 05/36] ARM: samsung: make pm-debug platform independent
Quoted 9 lines · Krzysztof Kozlowski
Quoted 8 lines · Arnd Bergmann
arch/arm/mach-s5pv210/pm.c +0
-0@@ -99,8 +99,6 @@ static int s5pv210_suspend_enter(suspend_state_t state)u32 eint_wakeup_mask =s5pv210_read_eint_wakeup_mask ();int ret;
Quoted 4 lines
arch/arm/mach-s5pv210/pm.c static int s5pv210_suspend_enter(suspend_state_t state) · line 102
Quoted 1 line
arch/arm/mach-s5pv210/pm.c +0
-1-s3c_pm_debug_init ();Your patch is not equivalent here. If there is a reason behind removal of UART init (e.g. not needed), I prefer to make it in separate patch.
It is equivalent, but the reason is a bit subtle:
The definition looks like
#ifdef CONFIG_SAMSUNG_ATAGS
#include <plat/pm.h>
#include <mach/pm-core.h>
#else
static inline void s3c_pm_debug_init_uart(void) {} #endif
void s3c_pm_debug_init(void)
{
/* restart uart clocks so we can use them to output */
s3c_pm_debug_init_uart();
}On s5pv210, CONFIG_SAMSUNG_ATAGS is never set, so this function does not do anything. Splitting the change out into a separate patch to explain that is a good idea, I'll do this.
Arnd
PATCH 6/36 ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug
In reply to Arnd BergmannBefore we can plat-samsung from the individual platforms, this one has to get moved to a place where it remains accessible.
--- arch/arm/Kconfig.debug | 10 ++++++++++ arch/arm/plat-samsung/Kconfig | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-)
arch/arm/Kconfig.debug +10 -0
@@ -1464,6 +1464,16 @@ config DEBUG_S3C64XX_UART config DEBUG_S5PV210_UART bool +config DEBUG_S3C_UART + depends on DEBUG_S3C2410_UART || DEBUG_S3C24XX_UART || \ + DEBUG_S3C64XX_UART || DEBUG_S5PV210_UART || \ + DEBUG_EXYNOS_UART + int + default "0" if DEBUG_S3C_UART0 + default "1" if DEBUG_S3C_UART1 + default "2" if DEBUG_S3C_UART2 + default "3" if DEBUG_S3C_UART3 + config DEBUG_OMAP2PLUS_UART bool depends on ARCH_OMAP2PLUS
arch/arm/plat-samsung/Kconfig +0 -8
@@ -296,13 +296,5 @@ config SAMSUNG_WDT_RESET Compile support for system restart by triggering watchdog reset. Used on SoCs that do not provide dedicated reset control. -config DEBUG_S3C_UART - depends on PLAT_SAMSUNG - int - default "0" if DEBUG_S3C_UART0 - default "1" if DEBUG_S3C_UART1 - default "2" if DEBUG_S3C_UART2 - default "3" if DEBUG_S3C_UART3 - endmenu endif
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 06/36] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug
Quoted 1 line · Arnd Bergmann
Before we can plat-samsung from the individual platforms,
"Before we can split"? Or moved? What did you want to say here?
Best regards,
Krzysztof
Quoted 51 lines
this one has to get moved to a place where it remains accessible.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/Kconfig.debug | 10 ++++++++++ arch/arm/plat-samsung/Kconfig | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-)arch/arm/Kconfig.debug +10
-0@@ -1464,6 +1464,16 @@ config DEBUG_S3C64XX_UART config DEBUG_S5PV210_UART bool +config DEBUG_S3C_UART + depends on DEBUG_S3C2410_UART || DEBUG_S3C24XX_UART || \ + DEBUG_S3C64XX_UART || DEBUG_S5PV210_UART || \ + DEBUG_EXYNOS_UART + int + default "0" if DEBUG_S3C_UART0 + default "1" if DEBUG_S3C_UART1 + default "2" if DEBUG_S3C_UART2 + default "3" if DEBUG_S3C_UART3 + config DEBUG_OMAP2PLUS_UART bool depends on ARCH_OMAP2PLUSarch/arm/plat-samsung/Kconfig +0
-8@@ -296,13 +296,5 @@ config SAMSUNG_WDT_RESET Compile support for system restart by triggering watchdog reset. Used on SoCs that do not provide dedicated reset control. -config DEBUG_S3C_UART - depends on PLAT_SAMSUNG - int - default "0" if DEBUG_S3C_UART0 - default "1" if DEBUG_S3C_UART1 - default "2" if DEBUG_S3C_UART2 - default "3" if DEBUG_S3C_UART3 - endmenu endifSignature · 1 line
2.20.0
Re: [PATCH 06/36] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug
Quoted 5 lines · Krzysztof Kozlowski
Quoted 1 line · Arnd Bergmann
Before we can plat-samsung from the individual platforms,
"Before we can split"? Or moved? What did you want to say here?
Rephrased now to:
| Before we can separate plat-samsung from the individual platforms, | this one has to get moved to a place where it remains accessible.
Thanks,
Arnd
PATCH 7/36 ARM: exynos: use private samsung_cpu_id copy
In reply to Arnd BergmannThe only part of plat-samsung that is shared with arch-exynos is the CPU identification code.
Having a separate exynos_cpu_id variable makes the two completely independent and is actually a bit less code in total.
--- 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/cpu.c | 17 ----------------- arch/arm/plat-samsung/include/plat/cpu.h | 2 -- arch/arm/plat-samsung/include/plat/map-s5p.h | 2 -- 8 files changed, 23 insertions(+), 53 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/common.h +3 -3
@@ -24,12 +24,12 @@#define EXYNOS5800_SOC_ID 0xE5422000#define EXYNOS5_SOC_MASK 0xFFFFF000 -extern unsigned long samsung_cpu_id; +extern unsigned long exynos_cpu_id;#define IS_SAMSUNG_CPU (name, id, mask) \ static inline int is_samsung_##name(void) \ { \ - return ((samsung_cpu_id & mask) == (id & mask)); \ + return ((exynos_cpu_id & mask) == (id & mask)); \ }IS_SAMSUNG_CPU (exynos3250,EXYNOS3250_SOC_ID ,EXYNOS3_SOC_MASK )
@@ -147,7 +147,7 @@ extern struct cpuidle_exynos_data cpuidle_coupled_exynos_data;extern void exynos_set_delayed_reset_assertion (bool enable); -extern unsigned int samsung_rev (void ); +extern unsigned int exynos_rev (void );extern void exynos_core_restart (u32 core_id);extern int exynos_set_boot_addr (u32 core_id,unsigned long boot_addr);extern int exynos_get_boot_addr (u32 core_id,unsigned long *boot_addr);
arch/arm/mach-exynos/exynos.c +15 -4
@@ -19,11 +19,10 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <plat/cpu.h> -#include "common.h" +#define S5P_VA_CHIPID ((void __iomem __force *)0xF8000000) +static struct platform_device exynos_cpuidle = { .name ="exynos_cpuidle" , #ifdef CONFIG_ARM_EXYNOS_CPUIDLE
@@ -36,6 +35,14 @@ void __iomem *sysram_base_addr __ro_after_init;phys_addr_t sysram_base_phys__ro_after_init ;void __iomem *sysram_ns_base_addr__ro_after_init ; +unsigned long exynos_cpu_id; +static unsigned int exynos_cpu_rev; + +unsigned int exynos_rev (void ) +{ +return exynos_cpu_rev; +} +void __init exynos_sysram_init (void ) {struct device_node *node;
@@ -86,7 +93,11 @@ static void __init exynos_init_io(void)of_scan_flat_dt (exynos_fdt_map_chipid,NULL );/* detect cpu id and rev. */ -s5p_init_cpu (S5P_VA_CHIPID ); + exynos_cpu_id =readl_relaxed (S5P_VA_CHIPID ); + exynos_cpu_rev = exynos_cpu_id &0xFF ; + +pr_info ("Samsung CPU ID: 0x%08lx\n" , exynos_cpu_id); + }/*
arch/arm/mach-exynos/include/mach/map.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ -* -* EXYNOS - Memory map definitions -*/ - -#ifndef __ASM_ARCH_MAP_H -#define __ASM_ARCH_MAP_H __FILE__ - -#include <plat/map-base.h> - -#include <plat/map-s5p.h> - -#define EXYNOS_PA_CHIPID 0x10000000 - -#endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-exynos/platsmp.c +1 -3
@@ -22,8 +22,6 @@#include <asm/smp_scu.h> #include <asm/firmware.h> -#include <mach/map.h> -#include "common.h" extern void exynos4_secondary_startup (void );
@@ -188,7 +186,7 @@ void exynos_scu_enable(void)static void __iomem *cpu_boot_reg_base (void ) { -if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_is_exynos4210 () &&exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM5 ;return sysram_base_addr; }
arch/arm/mach-exynos/pm.c +4 -4
@@ -26,18 +26,18 @@static inline void __iomem *exynos_boot_vector_addr (void ) { -if (samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM7 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (exynos_rev () ==EXYNOS4210_REV_1_0 )return sysram_base_addr +0x24 ;return pmu_base_addr +S5P_INFORM0 ; }static inline void __iomem *exynos_boot_vector_flag (void ) { -if (samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM6 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (exynos_rev () ==EXYNOS4210_REV_1_0 )return sysram_base_addr +0x20 ;return pmu_base_addr +S5P_INFORM1 ; }
arch/arm/plat-samsung/cpu.c +0 -17
@@ -14,13 +14,6 @@#include <plat/cpu.h> unsigned long samsung_cpu_id; -static unsigned int samsung_cpu_rev; - -unsigned int samsung_rev (void ) -{ -return samsung_cpu_rev; -} -EXPORT_SYMBOL (samsung_rev);void __init s3c64xx_init_cpu (void ) {
@@ -34,15 +27,5 @@ void __init s3c64xx_init_cpu(void) samsung_cpu_id =readl_relaxed (S3C_VA_SYS +0xA1C ); } - samsung_cpu_rev =0 ; - -pr_info ("Samsung CPU ID: 0x%08lx\n" , samsung_cpu_id); -} - -void __init s5p_init_cpu (const void __iomem *cpuid_addr) -{ - samsung_cpu_id =readl_relaxed (cpuid_addr); - samsung_cpu_rev = samsung_cpu_id &0xFF ; -pr_info ("Samsung CPU ID: 0x%08lx\n" , samsung_cpu_id); }
arch/arm/plat-samsung/include/plat/cpu.h +0 -2
@@ -111,8 +111,6 @@ extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);extern void s3c64xx_init_cpu (void );extern void s5p_init_cpu (const void __iomem *cpuid_addr); -extern unsigned int samsung_rev (void ); -extern void s3c24xx_init_uarts (struct s3c2410_uartcfg *cfg,int no);extern void s3c24xx_init_clocks (int xtal);
arch/arm/plat-samsung/include/plat/map-s5p.h +0 -2
@@ -9,8 +9,6 @@#ifndef __ASM_PLAT_MAP_S5P_H#define __ASM_PLAT_MAP_S5P_H __FILE__ -#define S5P_VA_CHIPID S3C_ADDR(0x02000000) -#define VA_VIC (x) (S3C_VA_IRQ + ((x) * 0x10000))#define VA_VIC0 VA_VIC(0)#define VA_VIC1 VA_VIC(1)
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy
Quoted 52 lines · Arnd Bergmann
The only part of plat-samsung that is shared with arch-exynos is the CPU identification code.
Having a separate
exynos_cpu_idvariable makes the two completely independent and is actually a bit less code in total.Signed-off-by Arnd Bergmann <[email protected]>--- 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/cpu.c | 17 ----------------- arch/arm/plat-samsung/include/plat/cpu.h | 2 -- arch/arm/plat-samsung/include/plat/map-s5p.h | 2 -- 8 files changed, 23 insertions(+), 53 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.harch/arm/mach-exynos/common.h +3
-3@@ -24,12 +24,12 @@#define EXYNOS5800_SOC_ID 0xE5422000#define EXYNOS5_SOC_MASK 0xFFFFF000 -extern unsigned long samsung_cpu_id; +extern unsigned long exynos_cpu_id;#define IS_SAMSUNG_CPU (name, id, mask) \ static inline int is_samsung_##name(void) \ { \ - return ((samsung_cpu_id & mask) == (id & mask)); \ + return ((exynos_cpu_id & mask) == (id & mask)); \ }IS_SAMSUNG_CPU (exynos3250,EXYNOS3250_SOC_ID ,EXYNOS3_SOC_MASK )@@ -147,7 +147,7 @@ extern struct cpuidle_exynos_data cpuidle_coupled_exynos_data;extern void exynos_set_delayed_reset_assertion (bool enable); -extern unsigned int samsung_rev (void ); +extern unsigned int exynos_rev (void );extern void exynos_core_restart (u32 core_id);extern int exynos_set_boot_addr (u32 core_id,unsigned long boot_addr);extern int exynos_get_boot_addr (u32 core_id,unsigned long *boot_addr);arch/arm/mach-exynos/exynos.c +0
-0
arch/arm/mach-exynos/exynos.c line 24
Quoted 9 lines
arch/arm/mach-exynos/exynos.c +1
-3@@ -19,11 +19,10 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <plat/cpu.h> -#include "common.h" +#define S5P_VA_CHIPID ((void __iomem __force *)0xF8000000)
How about keeping the S3C_VA and S3C_ADDR_BASE macros/defines and using them? They still appear in arch/arm/include/debug/exynos.S so they could be integrated into one header, unless you plan to remove it in further patches.
Quoted 144 lines
arch/arm/mach-exynos/exynos.c +14
-1+static struct platform_device exynos_cpuidle = { .name ="exynos_cpuidle" , #ifdef CONFIG_ARM_EXYNOS_CPUIDLE@@ -36,6 +35,14 @@ void __iomem *sysram_base_addr __ro_after_init;phys_addr_t sysram_base_phys__ro_after_init ;void __iomem *sysram_ns_base_addr__ro_after_init ; +unsigned long exynos_cpu_id; +static unsigned int exynos_cpu_rev; + +unsigned int exynos_rev (void ) +{ +return exynos_cpu_rev; +} +void __init exynos_sysram_init (void ) {struct device_node *node;@@ -86,7 +93,11 @@ static void __init exynos_init_io(void)of_scan_flat_dt (exynos_fdt_map_chipid,NULL );/* detect cpu id and rev. */ -s5p_init_cpu (S5P_VA_CHIPID ); + exynos_cpu_id =readl_relaxed (S5P_VA_CHIPID ); + exynos_cpu_rev = exynos_cpu_id &0xFF ; + +pr_info ("Samsung CPU ID: 0x%08lx\n" , exynos_cpu_id); + }/* arch/arm/mach-exynos/include/mach/map.h deleted +0
-18@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ -* -* EXYNOS - Memory map definitions -*/ - -#ifndef __ASM_ARCH_MAP_H -#define __ASM_ARCH_MAP_H __FILE__ - -#include <plat/map-base.h> - -#include <plat/map-s5p.h> - -#define EXYNOS_PA_CHIPID 0x10000000 - -#endif /* __ASM_ARCH_MAP_H */ arch/arm/mach-exynos/platsmp.c +1
-3@@ -22,8 +22,6 @@#include <asm/smp_scu.h> #include <asm/firmware.h> -#include <mach/map.h> -#include "common.h" extern void exynos4_secondary_startup (void );@@ -188,7 +186,7 @@ void exynos_scu_enable(void)static void __iomem *cpu_boot_reg_base (void ) { -if (soc_is_exynos4210 () &&samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (soc_is_exynos4210 () &&exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM5 ;return sysram_base_addr; }arch/arm/mach-exynos/pm.c +4
-4@@ -26,18 +26,18 @@static inline void __iomem *exynos_boot_vector_addr (void ) { -if (samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM7 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (exynos_rev () ==EXYNOS4210_REV_1_0 )return sysram_base_addr +0x24 ;return pmu_base_addr +S5P_INFORM0 ; }static inline void __iomem *exynos_boot_vector_flag (void ) { -if (samsung_rev () ==EXYNOS4210_REV_1_1 ) +if (exynos_rev () ==EXYNOS4210_REV_1_1 )return pmu_base_addr +S5P_INFORM6 ; -else if (samsung_rev () ==EXYNOS4210_REV_1_0 ) +else if (exynos_rev () ==EXYNOS4210_REV_1_0 )return sysram_base_addr +0x20 ;return pmu_base_addr +S5P_INFORM1 ; }arch/arm/plat-samsung/cpu.c +0
-17@@ -14,13 +14,6 @@#include <plat/cpu.h> unsigned long samsung_cpu_id; -static unsigned int samsung_cpu_rev; - -unsigned int samsung_rev (void ) -{ -return samsung_cpu_rev; -} -EXPORT_SYMBOL (samsung_rev);void __init s3c64xx_init_cpu (void ) {@@ -34,15 +27,5 @@ void __init s3c64xx_init_cpu(void) samsung_cpu_id =readl_relaxed (S3C_VA_SYS +0xA1C ); } - samsung_cpu_rev =0 ; - -pr_info ("Samsung CPU ID: 0x%08lx\n" , samsung_cpu_id); -} - -void __init s5p_init_cpu (const void __iomem *cpuid_addr) -{ - samsung_cpu_id =readl_relaxed (cpuid_addr); - samsung_cpu_rev = samsung_cpu_id &0xFF ; -pr_info ("Samsung CPU ID: 0x%08lx\n" , samsung_cpu_id); }arch/arm/plat-samsung/include/plat/cpu.h +0
-0
arch/arm/plat-samsung/include/plat/cpu.h extern void s3c24xx_init_io(struct map_desc *mach_desc, int size); · line 112
Quoted 2 lines
arch/arm/plat-samsung/include/plat/cpu.h +0
-0@@ -111,8 +111,6 @@ extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);extern void s3c64xx_init_cpu (void );extern void s5p_init_cpu (const void __iomem *cpuid_addr);
You can remove it as well.
Best regards,
Krzysztof
Quoted 22 lines
arch/arm/plat-samsung/include/plat/cpu.h +0
-2-extern unsigned int samsung_rev (void ); -extern void s3c24xx_init_uarts (struct s3c2410_uartcfg *cfg,int no);extern void s3c24xx_init_clocks (int xtal);arch/arm/plat-samsung/include/plat/map-s5p.h +0
-2@@ -9,8 +9,6 @@#ifndef __ASM_PLAT_MAP_S5P_H#define __ASM_PLAT_MAP_S5P_H __FILE__ -#define S5P_VA_CHIPID S3C_ADDR(0x02000000) -#define VA_VIC (x) (S3C_VA_IRQ + ((x) * 0x10000))#define VA_VIC0 VA_VIC(0)#define VA_VIC1 VA_VIC(1)Signature · 1 line
2.20.0
Re: [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy
Quoted 10 lines · Krzysztof Kozlowski
arch/arm/mach-exynos/exynos.c line 24
Quoted 6 lines · Arnd Bergmann
arch/arm/mach-exynos/exynos.c +1
-0+#define S5P_VA_CHIPID ((void __iomem __force *)0xF8000000)How about keeping the
S3C_VAandS3C_ADDR_BASEmacros/defines and using them?
Ok, done now.
Quoted 3 lines
They still appear in
arch/arm/include/debug/exynos.Sso they could be integrated into one header, unless you plan to remove it in further patches.
I don't think it actually helps, but it doesn't hurt either:
arch/arm/include/debug/exynos.S cannot #include any mach/*.h header files, so the definition has to remain duplicated, unless I'm missing something.
Also, the addresses should be completely independent, as long as the virtual address for the uart does not overlap with the virtual address for the chipid.
One possible cleanup here would be to completely remove the S5P_VA_CHIPID static map and use ioremap(), but doing that requires that the first call to soc_is_exynosXXXX() happens after the ioremap.
Quoted 9 lines
arch/arm/plat-samsung/include/plat/cpu.h extern void s3c24xx_init_io(struct map_desc *mach_desc, int size); · line 112
Quoted 7 lines
arch/arm/plat-samsung/include/plat/cpu.h +0
-0@@ -111,8 +111,6 @@ extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);extern void s3c64xx_init_cpu (void );extern void s5p_init_cpu (const void __iomem *cpuid_addr);You can remove it as well.
Ok, removed.
Thanks,
PATCH 8/36 ARM: exynos: stop selecting PLAT_SAMSUNG
In reply to Arnd BergmannNow that no code in arch/arm is shared between mach-exynos and the others, make the split formal.
--- arch/arm/Kconfig.debug | 8 ++++---- arch/arm/Makefile | 1 - arch/arm/mach-exynos/Makefile | 4 ---- arch/arm/plat-samsung/Kconfig | 4 ++-- drivers/mmc/host/Kconfig | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-)
arch/arm/Kconfig.debug +4 -4
@@ -998,7 +998,7 @@ choice via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0). config DEBUG_S3C_UART0 - depends on PLAT_SAMSUNG + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || ARCH_EXYNOS select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C24XX_UART if ARCH_S3C24XX select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1034,7 +1034,7 @@ choice by the boot-loader before use. config DEBUG_S3C_UART3 - depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210) + depends on ARCH_EXYNOS || ARCH_S5PV210 select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C64XX_UART if ARCH_S3C64XX select DEBUG_S5PV210_UART if ARCH_S5PV210
arch/arm/Makefile +0 -1
@@ -233,7 +233,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_EXYNOS) += samsung plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsung
arch/arm/mach-exynos/Makefile +0 -4
@@ -3,10 +3,6 @@ # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. # http://www.samsung.com/ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include - -# Core - obj-$(CONFIG_ARCH_EXYNOS) += exynos.o exynos-smc.o firmware.o obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o
arch/arm/plat-samsung/Kconfig +2 -2
@@ -4,7 +4,7 @@ config PLAT_SAMSUNG bool - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210 + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 default y select GENERIC_IRQ_CHIP select NO_IOPORT_MAP
@@ -240,7 +240,7 @@ config SAMSUNG_PM_DEBUG bool "Samsung PM Suspend debug" depends on PM && DEBUG_KERNEL depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 - depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
drivers/mmc/host/Kconfig +1 -1
@@ -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 + depends on MMC_SDHCI && (PLAT_SAMSUNG || 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
Signature · 1 line
2.20.0
Re: [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG
Quoted 11 lines · Arnd Bergmann
Now that no code in
arch/armis shared between mach-exynos and the others, make the split formal.Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/Kconfig.debug | 8 ++++---- arch/arm/Makefile | 1 - arch/arm/mach-exynos/Makefile | 4 ---- arch/arm/plat-samsung/Kconfig | 4 ++-- drivers/mmc/host/Kconfig | 2 +-
For the mmc part:
Kind regards
Uffe
Quoted 107 lines
5 files changed, 7 insertions(+), 12 deletions(-)arch/arm/Kconfig.debug +4
-4@@ -998,7 +998,7 @@ choice via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0). config DEBUG_S3C_UART0 - depends on PLAT_SAMSUNG + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || ARCH_EXYNOS select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C24XX_UART if ARCH_S3C24XX select DEBUG_S3C64XX_UART if ARCH_S3C64XX@@ -1034,7 +1034,7 @@ choice by the boot-loader before use. config DEBUG_S3C_UART3 - depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210) + depends on ARCH_EXYNOS || ARCH_S5PV210 select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C64XX_UART if ARCH_S3C64XX select DEBUG_S5PV210_UART if ARCH_S5PV210arch/arm/Makefile +0
-1@@ -233,7 +233,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_EXYNOS) += samsung plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsungarch/arm/mach-exynos/Makefile +0
-4@@ -3,10 +3,6 @@ # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. # http://www.samsung.com/ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include - -# Core - obj-$(CONFIG_ARCH_EXYNOS) += exynos.o exynos-smc.o firmware.o obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.oarch/arm/plat-samsung/Kconfig +2
-2@@ -4,7 +4,7 @@ config PLAT_SAMSUNG bool - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210 + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 default y select GENERIC_IRQ_CHIP select NO_IOPORT_MAP@@ -240,7 +240,7 @@ config SAMSUNG_PM_DEBUG bool "Samsung PM Suspend debug" depends on PM && DEBUG_KERNEL depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 - depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>drivers/mmc/host/Kconfig +1
-2@@ -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 + depends on MMC_SDHCI && (PLAT_SAMSUNG || 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 --2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG
In reply to Arnd BergmannQuoted 44 lines · Arnd Bergmann
Now that no code in
arch/armis shared between mach-exynos and the others, make the split formal.Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/Kconfig.debug | 8 ++++---- arch/arm/Makefile | 1 - arch/arm/mach-exynos/Makefile | 4 ---- arch/arm/plat-samsung/Kconfig | 4 ++-- drivers/mmc/host/Kconfig | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-)arch/arm/Kconfig.debug +3
-3@@ -998,7 +998,7 @@ choice via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0). config DEBUG_S3C_UART0 - depends on PLAT_SAMSUNG + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || 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 + depends on PLAT_SAMSUNG || ARCH_EXYNOS select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C24XX_UART if ARCH_S3C24XX select DEBUG_S3C64XX_UART if ARCH_S3C64XX
arch/arm/Kconfig.debug choice · line 1037
Quoted 5 lines
arch/arm/Kconfig.debug +1
-1@@ -1034,7 +1034,7 @@ choice by the boot-loader before use. config DEBUG_S3C_UART3 - depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210) + depends on ARCH_EXYNOS || ARCH_S5PV210
You need to keep PLAT_SAMSUNG because of additional architectures, so follow pattern from DEBUG_S3C_UART2.
Best regards,
Krzysztof
Quoted 68 lines
arch/arm/Kconfig.debug +0
-0select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C64XX_UART if ARCH_S3C64XX select DEBUG_S5PV210_UART if ARCH_S5PV210arch/arm/Makefile +0
-1@@ -233,7 +233,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_EXYNOS) += samsung plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsungarch/arm/mach-exynos/Makefile +0
-4@@ -3,10 +3,6 @@ # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. # http://www.samsung.com/ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include - -# Core - obj-$(CONFIG_ARCH_EXYNOS) += exynos.o exynos-smc.o firmware.o obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.oarch/arm/plat-samsung/Kconfig +2
-2@@ -4,7 +4,7 @@ config PLAT_SAMSUNG bool - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210 + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 default y select GENERIC_IRQ_CHIP select NO_IOPORT_MAP@@ -240,7 +240,7 @@ config SAMSUNG_PM_DEBUG bool "Samsung PM Suspend debug" depends on PM && DEBUG_KERNEL depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 - depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>drivers/mmc/host/Kconfig +1
-1@@ -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 + depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_EXYNOS) help This selects the Secure Digital Host Controller Interface (SDHCI) often referrered to as the HSMMC block in some of the Samsung S3CSignature · 1 line
2.20.0
Re: [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Arnd Bergmann
arch/arm/Kconfig.debug +1
-1@@ -1022,7 +1022,7 @@ choice by the boot-loader before use. config DEBUG_S3C_UART2 - depends on PLAT_SAMSUNG + depends on PLAT_SAMSUNG || ARCH_EXYNOS select DEBUG_EXYNOS_UART if ARCH_EXYNOS select DEBUG_S3C24XX_UART if ARCH_S3C24XX select DEBUG_S3C64XX_UART if ARCH_S3C64XX@@ -1034,7 +1034,7 @@ choice by the boot-loader before use.
Quoted 6 lines
arch/arm/Kconfig.debug choice · line 1037
Quoted 3 lines
arch/arm/Kconfig.debug +1
-1config DEBUG_S3C_UART3 - depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210) + depends on ARCH_EXYNOS || ARCH_S5PV210You need to keep
PLAT_SAMSUNGbecause of additional architectures, so follow pattern fromDEBUG_S3C_UART2.
Are you sure? I think my version is correct: for UART2, the "PLAT_SAMSUNG || ARCH_EXYNOS" is equivalent to "s3c24xx || s3c64xx || s5pv210 || exynos", which keeps the existing behavior unchanged.
For UART3, the "PLAT_SAMSUNG && ..." is redundant, this is already limited to "s5pv210 || exynos", which my patch keeps. Changing it to "PLAT_SAMSUNG || ..." would allow selecting the symbol on s3c24xx and s3c64xx, which presumably is not valid.
Arnd
PATCH 9/36 ARM: samsung: move pm check code to drivers/soc
In reply to Arnd BergmannThis is the only part of plat-samsung that is really shared between the s3c and s5p ports. Moving it to drivers/soc/ lets us make them completely independent.
--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/plat-samsung/Kconfig | 49 +---------- arch/arm/plat-samsung/Makefile | 2 - .../arm/plat-samsung/include/plat/pm-common.h | 70 +--------------- drivers/soc/samsung/Kconfig | 48 ++++++++++- drivers/soc/samsung/Makefile | 3 + .../soc/samsung/s3c-pm-check.c | 2 +- .../soc/samsung/s3c-pm-debug.c | 3 +- include/linux/soc/samsung/s3c-pm.h | 84 +++++++++++++++++++ 9 files changed, 139 insertions(+), 123 deletions(-) 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 (97%) create mode 100644 include/linux/soc/samsung/s3c-pm.h
arch/arm/mach-s5pv210/Kconfig +1 -0
@@ -18,6 +18,7 @@ config ARCH_S5PV210 select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS + select SOC_SAMSUNG help Samsung S5PV210/S5PC110 series based systems
arch/arm/plat-samsung/Kconfig +1 -48
61 lines not on this page · raw message
arch/arm/plat-samsung/Makefile +0 -2
@@ -28,8 +28,6 @@ obj-$(CONFIG_PM_SLEEP) += pm-common.o obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o obj-$(CONFIG_SAMSUNG_PM) += pm.o obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o -obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o -obj-$(CONFIG_SAMSUNG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o obj-$(CONFIG_SAMSUNG_WDT_RESET) += watchdog-reset.o
arch/arm/plat-samsung/include/plat/pm-common.h +1 -69
80 lines not on this page · raw message
drivers/soc/samsung/Kconfig +47 -1
53 lines not on this page · raw message
drivers/soc/samsung/Makefile +3 -0
@@ -6,3 +6,6 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o obj-$(CONFIG_EXYNOS_PMU_ARM_DRIVERS) += exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o + +obj-$(CONFIG_SAMSUNG_PM_CHECK) += s3c-pm-check.o +obj-$(CONFIG_SAMSUNG_PM_DEBUG) += s3c-pm-debug.o
drivers/soc/samsung/s3c-pm-check.c renamed from arch/arm/plat-samsung/pm-check.c +1 -1
@@ -15,7 +15,7 @@#include <linux/ioport.h> #include <linux/slab.h> -#include <plat/pm-common.h> +#include <linux/soc/samsung/s3c-pm.h> #if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE <1 #error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero value
drivers/soc/samsung/s3c-pm-debug.c renamed from arch/arm/plat-samsung/pm-debug.c +1 -2
@@ -15,8 +15,7 @@#include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/pm-common.h> +#include <linux/soc/samsung/s3c-pm.h> static struct pm_uart_save uart_save;
include/linux/soc/samsung/s3c-pm.h new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 09/36] ARM: samsung: move pm check code to drivers/soc
Quoted 307 lines · Arnd Bergmann
This is the only part of plat-samsung that is really shared between the s3c and s5p ports. Moving it to
drivers/soc/lets us make them completely independent.Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/plat-samsung/Kconfig | 49 +---------- arch/arm/plat-samsung/Makefile | 2 - .../arm/plat-samsung/include/plat/pm-common.h | 70 +--------------- drivers/soc/samsung/Kconfig | 48 ++++++++++- drivers/soc/samsung/Makefile | 3 + .../soc/samsung/s3c-pm-check.c | 2 +- .../soc/samsung/s3c-pm-debug.c | 3 +- include/linux/soc/samsung/s3c-pm.h | 84 +++++++++++++++++++ 9 files changed, 139 insertions(+), 123 deletions(-) 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 (97%) create mode 100644 include/linux/soc/samsung/s3c-pm.harch/arm/mach-s5pv210/Kconfig +1
-0@@ -18,6 +18,7 @@ config ARCH_S5PV210 select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS + select SOC_SAMSUNG help Samsung S5PV210/S5PC110 series based systemsarch/arm/plat-samsung/Kconfig +1
-48@@ -8,6 +8,7 @@ config PLAT_SAMSUNG default y select GENERIC_IRQ_CHIP select NO_IOPORT_MAP + select SOC_SAMSUNG help Base platform code for all Samsung SoC based systems@@ -234,54 +235,6 @@ config SAMSUNG_PM_GPIO pinctrl-samsung driver. endif -comment "Power management" - -config SAMSUNG_PM_DEBUG - bool "Samsung PM Suspend debug" - depends on PM && DEBUG_KERNEL - depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 - depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART - help - Say Y here if you want verbose debugging from the PM Suspend and - Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> - for more information. - -config S3C_PM_DEBUG_LED_SMDK - bool "SMDK LED suspend/resume debugging" - depends on PM && (MACH_SMDK6410) - help - Say Y here to enable the use of the SMDK LEDs on the baseboard - for debugging of the state of the suspend and resume process. - - Note, this currently only works for S3C64XX based SMDK boards. - -config SAMSUNG_PM_CHECK - bool "S3C2410 PM Suspend Memory CRC" - depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210) - select CRC32 - help - Enable the PM code's memory area checksum over sleep. This option - will generate CRCs of all blocks of memory, and store them before - going to sleep. The blocks are then checked on resume for any - errors. - - Note, this can take several seconds depending on memory size - and CPU speed. - - See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> - -config SAMSUNG_PM_CHECK_CHUNKSIZE - int "S3C2410 PM Suspend CRC Chunksize (KiB)" - depends on PM && SAMSUNG_PM_CHECK - default 64 - help - Set the chunksize in Kilobytes of the CRC for checking memory - corruption over suspend and resume. A smaller value will mean that - the CRC data block will take more memory, but will identify any - faults with better precision. - - See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> - config SAMSUNG_WAKEMASK bool depends on PMarch/arm/plat-samsung/Makefile +0
-2@@ -28,8 +28,6 @@ obj-$(CONFIG_PM_SLEEP) += pm-common.o obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o obj-$(CONFIG_SAMSUNG_PM) += pm.o obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o -obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o -obj-$(CONFIG_SAMSUNG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o obj-$(CONFIG_SAMSUNG_WDT_RESET) += watchdog-reset.oarch/arm/plat-samsung/include/plat/pm-common.h +1
-69@@ -11,6 +11,7 @@#define __PLAT_SAMSUNG_PM_COMMON_H __FILE__#include <linux/irq.h> +#include <linux/soc/samsung/s3c-pm.h> /* sleep save info */ @@ -36,73 +37,4 @@ extern void s3c_pm_do_save(struct sleep_save *ptr, int count);extern void s3c_pm_do_restore (const struct sleep_save *ptr,int count);extern void s3c_pm_do_restore_core (const struct sleep_save *ptr,int count); -/* PM debug functions */ - -/** -* struct pm_uart_save - save block for core UART -* @ulcon: Save value for S3C2410_ULCON -* @ucon: Save value for S3C2410_UCON -* @ufcon: Save value for S3C2410_UFCON -* @umcon: Save value for S3C2410_UMCON -* @ubrdiv: Save value for S3C2410_UBRDIV -* -* Save block for UART registers to be held over sleep and restored if they -* are needed (say by debug). -*/ -struct pm_uart_save { -u32 ulcon; -u32 ucon; -u32 ufcon; -u32 umcon; -u32 ubrdiv; -u32 udivslot; -}; - -#ifdef CONFIG_SAMSUNG_PM_DEBUG -/** -* s3c_pm_dbg() - low level debug function for use in suspend/resume. -* @msg: The message to print. -* -* This function is used mainly to debug the resume process before the system -* can rely on printk/console output. It uses the low-level debugging output -* routine printascii() to do its work. -*/ -extern void s3c_pm_dbg (const char *msg, ...); - -#define S3C_PMDBG(fmt...) s3c_pm_dbg(fmt) - -extern void s3c_pm_save_uarts (bool is_s3c24xx); -extern void s3c_pm_restore_uarts (bool is_s3c24xx); - -#ifdef CONFIG_ARCH_S3C64XX -extern void s3c_pm_arch_update_uart (void __iomem *regs, -struct pm_uart_save *save); -#else -static inline void -s3c_pm_arch_update_uart (void __iomem *regs,struct pm_uart_save *save) -{ -} -#endif - -#else -#define S3C_PMDBG(fmt...) pr_debug(fmt) - -static inline void s3c_pm_save_uarts (bool is_s3c24xx) { } -static inline void s3c_pm_restore_uarts (bool is_s3c24xx) { } -#endif - -/* suspend memory checking */ - -#ifdef CONFIG_SAMSUNG_PM_CHECK -extern void s3c_pm_check_prepare (void ); -extern void s3c_pm_check_restore (void ); -extern void s3c_pm_check_cleanup (void ); -extern void s3c_pm_check_store (void ); -#else -#define s3c_pm_check_prepare () do { } while (0) -#define s3c_pm_check_restore () do { } while (0) -#define s3c_pm_check_cleanup () do { } while (0) -#define s3c_pm_check_store () do { } while (0) -#endif -#endif drivers/soc/samsung/Kconfig +47
-1@@ -25,6 +25,52 @@ config EXYNOS_PMU_ARM_DRIVERS config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST - depends on PM_GENERIC_DOMAINS || COMPILE_TEST + depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST + +config SAMSUNG_PM_DEBUG + bool "Samsung PM Suspend debug" + depends on PM && DEBUG_KERNEL + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART + help + Say Y here if you want verbose debugging from the PM Suspend and + Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> + for more information. + +config S3C_PM_DEBUG_LED_SMDK + bool "SMDK LED suspend/resume debugging" + depends on PM && (MACH_SMDK6410) + help + Say Y here to enable the use of the SMDK LEDs on the baseboard + for debugging of the state of the suspend and resume process. + + Note, this currently only works for S3C64XX based SMDK boards. + +config SAMSUNG_PM_CHECK + bool "S3C2410 PM Suspend Memory CRC" + depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210) + select CRC32 + help + Enable the PM code's memory area checksum over sleep. This option + will generate CRCs of all blocks of memory, and store them before + going to sleep. The blocks are then checked on resume for any + errors. + + Note, this can take several seconds depending on memory size + and CPU speed. + + See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> + +config SAMSUNG_PM_CHECK_CHUNKSIZE + int "S3C2410 PM Suspend CRC Chunksize (KiB)" + depends on PM && SAMSUNG_PM_CHECK + default 64 + help + Set the chunksize in Kilobytes of the CRC for checking memory + corruption over suspend and resume. A smaller value will mean that + the CRC data block will take more memory, but will identify any + faults with better precision. + + See <file:Documentation/arm/samsung-s3c24xx/suspend.rst> endifdrivers/soc/samsung/Makefile +3
-0@@ -6,3 +6,6 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o obj-$(CONFIG_EXYNOS_PMU_ARM_DRIVERS) += exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o + +obj-$(CONFIG_SAMSUNG_PM_CHECK) += s3c-pm-check.o +obj-$(CONFIG_SAMSUNG_PM_DEBUG) += s3c-pm-debug.odrivers/soc/samsung/s3c-pm-check.c renamed from arch/arm/plat-samsung/pm-check.c +1
-1@@ -15,7 +15,7 @@#include <linux/ioport.h> #include <linux/slab.h> -#include <plat/pm-common.h> +#include <linux/soc/samsung/s3c-pm.h> #if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE <1 #error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero valuedrivers/soc/samsung/s3c-pm-debug.c renamed from arch/arm/plat-samsung/pm-debug.c +1
-2@@ -15,8 +15,7 @@#include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/pm-common.h> +#include <linux/soc/samsung/s3c-pm.h> static struct pm_uart_save uart_save;include/linux/soc/samsung/s3c-pm.h new file +1
-0@@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0 */
include/linux/soc/samsung/s3c-pm.h line 11
Quoted 10 lines
include/linux/soc/samsung/s3c-pm.h new file +10
-0+/* +* Copyright (C) 2013 Samsung Electronics Co., Ltd. +* Tomasz Figa <[email protected]> +* Copyright (c) 2004 Simtec Electronics +* http://armlinux.simtec.co.uk/ +* Written by Ben Dooks, <[email protected]> +*/ + +#ifndef __SAMSUNG_SOC_S3C_PM_H +#define __SAMSUNG_SOC_S3C_PM_H __FILE__
Use guard name prefix consistent with other files, so:__LINUX_SOC_SAMSUNG_S3C_PM_H
Rest looks good.
Best regards,
Krzysztof
Re: [PATCH 09/36] ARM: samsung: move pm check code to drivers/soc
Quoted 6 lines · Krzysztof Kozlowski
Quoted 4 lines · Arnd Bergmann
This is the only part of plat-samsung that is really shared between the s3c and s5p ports. Moving it to
drivers/soc/lets us make them completely independent.
Quoted 13 lines
include/linux/soc/samsung/s3c-pm.h line 11
Quoted 10 lines
Signed-off-by Arnd Bergmann <[email protected]>---
+ * Tomasz Figa <[email protected]>
+ * Copyright (c) 2004 Simtec Electronics
+ * http://armlinux.simtec.co.uk/
+ * Written by Ben Dooks, <[email protected]>
+ */include/linux/soc/samsung/s3c-pm.h new file +3
-0+ +#ifndef __SAMSUNG_SOC_S3C_PM_H +#define __SAMSUNG_SOC_S3C_PM_H __FILE__Use guard name prefix consistent with other files, so:
__LINUX_SOC_SAMSUNG_S3C_PM_H
Ok, done.
Arnd
PATCH 10/36 ARM: s5pv210: use private pm save/restore
In reply to Arnd BergmannThe pm save/restore code is fairly small, so in order to separate the s3c and s5p platforms, adding an s5p specific copy instead of sharing it is actually easier.
--- arch/arm/mach-s5pv210/Makefile | 7 ----- arch/arm/mach-s5pv210/pm.c | 45 ++++++++++++++++++++++++++++-- arch/arm/mach-s5pv210/regs-clock.h | 2 +- arch/arm/mach-s5pv210/s5pv210.c | 2 -- arch/arm/plat-samsung/Makefile | 4 +-- 5 files changed, 45 insertions(+), 15 deletions(-)
arch/arm/mach-s5pv210/Makefile +0 -7
@@ -3,12 +3,5 @@ # Copyright (c) 2010 Samsung Electronics Co., Ltd. # http://www.samsung.com/ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/arch/arm/plat-samsung/include - -# Core - obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o - -# machine support - obj-y += s5pv210.o
arch/arm/mach-s5pv210/pm.c +43 -2
58 lines not on this page · raw message
arch/arm/mach-s5pv210/regs-clock.h +1 -1
@@ -9,7 +9,7 @@#ifndef __ASM_ARCH_REGS_CLOCK_H#define __ASM_ARCH_REGS_CLOCK_H __FILE__ -#include <plat/map-base.h> +#define S3C_VA_SYS ((void __iomem __force *)0xF6100000)#define S5P_CLKREG (x) (S3C_VA_SYS + (x))
arch/arm/mach-s5pv210/s5pv210.c +0 -2
@@ -13,8 +13,6 @@#include <asm/mach/map.h> #include <asm/system_misc.h> -#include <plat/map-base.h> -#include "common.h" #include "regs-clock.h"
arch/arm/plat-samsung/Makefile +1 -3
@@ -24,9 +24,7 @@ obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o # PM support -obj-$(CONFIG_PM_SLEEP) += pm-common.o -obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o -obj-$(CONFIG_SAMSUNG_PM) += pm.o +obj-$(CONFIG_SAMSUNG_PM) += pm.o pm-common.o obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 10/36] ARM: s5pv210: use private pm save/restore
Quoted 98 lines · Arnd Bergmann
The pm save/restore code is fairly small, so in order to separate the s3c and s5p platforms, adding an s5p specific copy instead of sharing it is actually easier.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s5pv210/Makefile | 7 ----- arch/arm/mach-s5pv210/pm.c | 45 ++++++++++++++++++++++++++++-- arch/arm/mach-s5pv210/regs-clock.h | 2 +- arch/arm/mach-s5pv210/s5pv210.c | 2 -- arch/arm/plat-samsung/Makefile | 4 +-- 5 files changed, 45 insertions(+), 15 deletions(-)arch/arm/mach-s5pv210/Makefile +0
-7@@ -3,12 +3,5 @@ # Copyright (c) 2010 Samsung Electronics Co., Ltd. # http://www.samsung.com/ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/arch/arm/plat-samsung/include - -# Core - obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o - -# machine support - obj-y += s5pv210.oarch/arm/mach-s5pv210/pm.c +43
-2@@ -13,15 +13,56 @@#include <linux/suspend.h> #include <linux/syscore_ops.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/cacheflush.h> #include <asm/suspend.h> -#include <plat/pm-common.h> -#include "common.h" #include "regs-clock.h" +/* helper functions to save and restore register state */ +struct sleep_save { +void __iomem *reg; +unsigned long val; +}; + +#define SAVE_ITEM (x) \ + { .reg = (x) } + +/** +* s3c_pm_do_save() - save a set of registers for restoration on resume. +* @ptr: Pointer to an array of registers. +* @count: Size of the ptr array. +* +* Run through the list of registers given, saving their contents in the +* array for later restoration when we wakeup. +*/ +static void s3c_pm_do_save (struct sleep_save *ptr,int count) +{ +for (; count >0 ; count--, ptr++) { + ptr->val =readl_relaxed (ptr->reg); +S3C_PMDBG ("saved %p value %08lx\n" , ptr->reg, ptr->val); + } +} + +/** +* s3c_pm_do_restore() - restore register values from the save list. +* @ptr: Pointer to an array of registers. +* @count: Size of the ptr array. +* +* Restore the register values saved from s3c_pm_do_save(). +* +* WARNING: Do not put any debug in here that may effect memory or use +* peripherals, as things may be changing! +*/ + +static void s3c_pm_do_restore_core (const struct sleep_save *ptr,int count) +{ +for (; count >0 ; count--, ptr++) +writel_relaxed (ptr->val, ptr->reg); +} +static struct sleep_save s5pv210_core_save[] = {/* Clock ETC */ SAVE_ITEM (S5P_MDNIE_SEL ),arch/arm/mach-s5pv210/regs-clock.h +0
-0
arch/arm/mach-s5pv210/regs-clock.h line 12
Quoted 5 lines
arch/arm/mach-s5pv210/regs-clock.h +1
-1@@ -9,7 +9,7 @@#ifndef __ASM_ARCH_REGS_CLOCK_H#define __ASM_ARCH_REGS_CLOCK_H __FILE__ -#include <plat/map-base.h> +#define S3C_VA_SYS ((void __iomem __force *)0xF6100000)
The same as for one of earlier patches - I prefer to keep the S3C_ADDR() macro for consistency.
Quoted 21 lines
arch/arm/mach-s5pv210/regs-clock.h +0
-0#define S5P_CLKREG (x) (S3C_VA_SYS + (x))arch/arm/mach-s5pv210/s5pv210.c +0
-2@@ -13,8 +13,6 @@#include <asm/mach/map.h> #include <asm/system_misc.h> -#include <plat/map-base.h> -#include "common.h" #include "regs-clock.h" arch/arm/plat-samsung/Makefile +0
-0
arch/arm/plat-samsung/Makefile obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o · line 28
Quoted 5 lines
arch/arm/plat-samsung/Makefile +0
-2@@ -24,9 +24,7 @@ obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o # PM support -obj-$(CONFIG_PM_SLEEP) += pm-common.o -obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o
CONFIG_EXYNOS_CPU_SUSPEND looks unrelated and seems to be not needed at all. Can you remove it in separate patch?
Best regards,
Krzysztof
Quoted 8 lines
arch/arm/plat-samsung/Makefile +1
-1-obj-$(CONFIG_SAMSUNG_PM) += pm.o +obj-$(CONFIG_SAMSUNG_PM) += pm.o pm-common.o obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpio.o obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.oSignature · 1 line
2.20.0
Re: [PATCH 10/36] ARM: s5pv210: use private pm save/restore
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-s5pv210/regs-clock.h +0
-0@@ -9,7 +9,7 @@#ifndef __ASM_ARCH_REGS_CLOCK_H#define __ASM_ARCH_REGS_CLOCK_H __FILE__
Quoted 5 lines
arch/arm/mach-s5pv210/regs-clock.h line 12
Quoted 2 lines
arch/arm/mach-s5pv210/regs-clock.h +1
-1-#include <plat/map-base.h> +#define S3C_VA_SYS ((void __iomem __force *)0xF6100000)The same as for one of earlier patches - I prefer to keep the
S3C_ADDR()macro for consistency.
Ok, done.
As the constant is only used in arch/arm/mach-s5pv210/pm.c and the s5pv210_dt_restart() function, I think it would be best to use ioremap() here and remove the constant as well as s5pv210_fdt_map_sys() and s5pv210_dt_map_io().
That can clearly be a follow-up patch.
Quoted 6 lines
Quoted 6 lines
arch/arm/plat-samsung/Makefile +0
-0@@ -24,9 +24,7 @@ obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o
Quoted 7 lines
arch/arm/plat-samsung/Makefile obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o · line 28
Quoted 4 lines
arch/arm/plat-samsung/Makefile +0
-2# PM support -obj-$(CONFIG_PM_SLEEP) += pm-common.o -obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm-common.o
CONFIG_EXYNOS_CPU_SUSPENDlooks unrelated and seems to be not needed at all. Can you remove it in separate patch?
Done.
Arnd
PATCH 11/36 ARM: s5pv210: split from plat-samsung
In reply to Arnd BergmannThese can be build completely independently, so split the two Kconfig symbols.
--- 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(-)
arch/arm/Kconfig.debug +3 -3
@@ -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
arch/arm/Makefile +0 -1
@@ -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
arch/arm/plat-samsung/Kconfig +1 -1
@@ -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
drivers/mmc/host/Kconfig +1 -1
@@ -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
drivers/pwm/Kconfig +1 -1
@@ -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.
drivers/spi/Kconfig +1 -1
@@ -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.
drivers/tty/serial/Kconfig +1 -1
@@ -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,
sound/soc/samsung/Kconfig +1 -1
@@ -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---
Signature · 1 line
2.20.0
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Quoted 4 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.Signed-off-by Arnd Bergmann <[email protected]>
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?
Quoted 47 lines
--- 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(-)arch/arm/Kconfig.debug +3
-3@@ -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_S3C64XXarch/arm/Makefile +0
-0
arch/arm/Makefile machine-$(CONFIG_PLAT_SPEAR) += spear · line 238
Quoted 4 lines
arch/arm/Makefile +0
-1@@ -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
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Quoted 11 lines · Uwe Kleine-König
Quoted 4 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.Signed-off-by Arnd Bergmann <[email protected]>I'd mention the two symbols' names you're working on in the commit log. I guess it's about
PLAT_SAMSUNGandARCH_S5PV210. And I wouldn't call it "split" which IMHO suggests there was only one symbol before.
Quoted 5 lines
Maybe:
Don't imply
PLAT_SAMSUNGifARCH_S5PV210is enabledwould be a better subject line?
Ok, changed to
ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG
Quoted 8 lines
arch/arm/Makefile machine-$(CONFIG_PLAT_SPEAR) += spear · line 238
Quoted 5 lines
arch/arm/Makefile +0
-1@@ -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) += samsungWould it make more sense to make this
Quoted 5 lines
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
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Hello,
Quoted 10 lines · Arnd Bergmann
Quoted 10 lines
arch/arm/Makefile machine-$(CONFIG_PLAT_SPEAR) += spear · line 238
Quoted 5 lines
arch/arm/Makefile +0
-1@@ -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) += samsungWould it make more sense to make this
plat-$(PLAT_SAMSUNG) += samsung
Quoted 7 lines
Quoted 3 lines
(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
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Quoted 2 lines · Uwe Kleine-König
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
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
In reply to Arnd BergmannQuoted 5 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.Signed-off-by Arnd Bergmann <[email protected]>
Quoted 10 lines
--- 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:
Kind regards
Uffe
Quoted 130 lines
arch/arm/Kconfig.debug +3
-3@@ -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_S3C64XXarch/arm/Makefile +0
-1@@ -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) += samsungarch/arm/plat-samsung/Kconfig +1
-1@@ -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_MAPdrivers/mmc/host/Kconfig +1
-1@@ -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 S3Cdrivers/pwm/Kconfig +1
-1@@ -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.drivers/spi/Kconfig +1
-1@@ -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.drivers/tty/serial/Kconfig +1
-1@@ -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,sound/soc/samsung/Kconfig +1
-2@@ -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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
In reply to Arnd BergmannOn Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote:
[...]
drivers/pwm/Kconfig config PWM_ROCKCHIP · line 400
Quoted 13 lines
drivers/pwm/Kconfig +1
-1@@ -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.
Krzysztof Kozlowski
maintainerRe: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
In reply to Arnd BergmannQuoted 20 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.Signed-off-by Arnd Bergmann <[email protected]>--- 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(-)arch/arm/Kconfig.debug +0
-0
arch/arm/Kconfig.debug choice · line 1001
Quoted 5 lines
arch/arm/Kconfig.debug +1
-1@@ -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
Quoted 114 lines
arch/arm/Kconfig.debug +2
-2select 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_S3C64XXarch/arm/Makefile +0
-1@@ -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) += samsungarch/arm/plat-samsung/Kconfig +1
-1@@ -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_MAPdrivers/mmc/host/Kconfig +1
-1@@ -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 S3Cdrivers/pwm/Kconfig +1
-1@@ -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.drivers/spi/Kconfig +1
-1@@ -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.drivers/tty/serial/Kconfig +1
-1@@ -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,sound/soc/samsung/Kconfig +1
-1@@ -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---Signature · 1 line
2.20.0
Re: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Quoted 8 lines · Krzysztof Kozlowski
Review
Quoted 5 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.
configDEBUG_S3C_UART0(quoted diff) +1
-1- depends on PLAT_SAMSUNG || ARCH_EXYNOS + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOSHow are you going to select
DEBUG_S5PV210_UARTnow?
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
Krzysztof Kozlowski
maintainerRe: [PATCH 11/36] ARM: s5pv210: split from plat-samsung
Quoted 22 lines · Arnd Bergmann
Quoted 8 lines · Krzysztof Kozlowski
Review
Quoted 5 lines · Arnd Bergmann
These can be build completely independently, so split the two
Kconfigsymbols.
configDEBUG_S3C_UART0(quoted diff) +1
-1- depends on PLAT_SAMSUNG || ARCH_EXYNOS + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOSHow are you going to select
DEBUG_S5PV210_UARTnow?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 onPLAT_SAMSUNG||ARCH_S5PV210||ARCH_EXYNOSselectDEBUG_EXYNOS_UARTifARCH_EXYNOSselectDEBUG_S3C24XX_UARTifARCH_S3C24XXselectDEBUG_S3C64XX_UARTifARCH_S3C64XXselectDEBUG_S5PV210_UARTifARCH_S5PV210bool "Use Samsung S3C UART 0 for low-level debug"
Quoted 4 lines
so this will work as before with any of
ARCH_EXYNOS,ARCH_S3C24XX,ARCH_S3C64XXandARCH_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
PATCH 12/36 ARM: s3c64xx: remove mach/hardware.h
In reply to Arnd BergmannThis header is empty and conflicts with the s3c24xx version of the same file when we merge the two, so stop including it.
--- arch/arm/mach-s3c64xx/common.c | 1 - arch/arm/mach-s3c64xx/dev-uart.c | 1 - arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 ----------------- arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - arch/arm/mach-s3c64xx/mach-hmt.c | 1 - arch/arm/mach-s3c64xx/mach-ncp.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - arch/arm/mach-s3c64xx/s3c6400.c | 1 - arch/arm/mach-s3c64xx/s3c6410.c | 1 - 11 files changed, 27 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h
arch/arm/mach-s3c64xx/common.c +0 -1
@@ -36,7 +36,6 @@#include <mach/map.h> #include <mach/irqs.h> -#include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h>
arch/arm/mach-s3c64xx/dev-uart.c +0 -1
@@ -15,7 +15,6 @@#include <asm/mach/arch.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <mach/map.h> #include <mach/irqs.h>
arch/arm/mach-s3c64xx/include/mach/hardware.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* linux/arch/arm/mach-s3c6400/include/mach/hardware.h -* -* Copyright 2008 Openmoko, Inc. -* Copyright 2008 Simtec Electronics -* Ben Dooks <[email protected]> -* http://armlinux.simtec.co.uk/ -* -* S3C6400 - Hardware support -*/ - -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H __FILE__ - -/* currently nothing here, placeholder */ - -#endif /* __ASM_ARCH_IRQ_H */
arch/arm/mach-s3c64xx/mach-anw6410.c +0 -1
@@ -30,7 +30,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <mach/map.h> #include <asm/irq.h>
arch/arm/mach-s3c64xx/mach-crag6410.c +0 -1
@@ -44,7 +44,6 @@#include <asm/mach-types.h> #include <video/samsung_fimd.h> -#include <mach/hardware.h> #include <mach/map.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h>
arch/arm/mach-s3c64xx/mach-hmt.c +0 -1
@@ -25,7 +25,6 @@#include <asm/mach/irq.h> #include <video/samsung_fimd.h> -#include <mach/hardware.h> #include <mach/map.h> #include <mach/irqs.h>
arch/arm/mach-s3c64xx/mach-ncp.c +0 -1
@@ -25,7 +25,6 @@#include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/hardware.h> #include <mach/map.h> #include <asm/irq.h>
arch/arm/mach-s3c64xx/mach-smdk6400.c +0 -1
@@ -23,7 +23,6 @@#include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/hardware.h> #include <mach/map.h> #include <plat/devs.h>
arch/arm/mach-s3c64xx/mach-smdk6410.c +0 -1
@@ -45,7 +45,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/map.h>
arch/arm/mach-s3c64xx/s3c6400.c +0 -1
@@ -26,7 +26,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <plat/cpu-freq.h>
arch/arm/mach-s3c64xx/s3c6410.c +0 -1
@@ -27,7 +27,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <plat/cpu-freq.h>
Signature · 1 line
2.20.0
Re: [PATCH 12/36] ARM: s3c64xx: remove mach/hardware.h
Quoted 5 lines · Arnd Bergmann
This header is empty and conflicts with the s3c24xx version of the same file when we merge the two, so stop including it.
Signed-off-by Arnd Bergmann <[email protected]>---
Thanks,
Charles
PATCH 13/36 ARM: s3c: move regs-spi.h into spi driver
In reply to Arnd BergmannThe 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.
--- 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%)
arch/arm/mach-s3c24xx/include/mach/map.h +2 -0
@@ -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)
arch/arm/mach-s3c24xx/s3c2412.c +0 -1
@@ -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"
arch/arm/plat-samsung/devs.c +0 -1
@@ -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>
drivers/spi/spi-s3c24xx-fiq.S +3 -1
@@ -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
drivers/spi/spi-s3c24xx-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-spi.h +0 -3
@@ -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 */
drivers/spi/spi-s3c24xx.c +1 -2
@@ -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" /**
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver
Quoted 78 lines · Arnd Bergmann
The file is mostly specific to the driver, the few bits that are actually used by the platform code get moved to
mach/map.hinstead.Signed-off-by Arnd Bergmann <[email protected]>--- 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%)arch/arm/mach-s3c24xx/include/mach/map.h +2
-0@@ -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)arch/arm/mach-s3c24xx/s3c2412.c +0
-1@@ -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" arch/arm/plat-samsung/devs.c +0
-1@@ -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> drivers/spi/spi-s3c24xx-fiq.S +3
-1@@ -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 namesdrivers/spi/spi-s3c24xx-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-spi.h +0
-0
drivers/spi/spi-s3c24xx-regs.h line 9
Quoted 2 lines
drivers/spi/spi-s3c24xx-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-spi.h +0
-0@@ -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
Quoted 26 lines
drivers/spi/spi-s3c24xx-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-spi.h +0
-3-#define S3C2410_SPI1 (0x20) -#define S3C2412_SPI1 (0x100) -#define S3C2410_SPCON (0x00)#define S3C2410_SPCON_SMOD_DMA (2 << 5)/* DMA mode */ drivers/spi/spi-s3c24xx.c +1
-2@@ -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" /** Signature · 1 line
2.20.0
Re: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver
Quoted 14 lines · Krzysztof Kozlowski
drivers/spi/spi-s3c24xx-regs.h line 9
Quoted 10 lines · Arnd Bergmann
drivers/spi/spi-s3c24xx-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-spi.h +0
-0@@ -8,9 +8,6 @@#ifndef __ASM_ARCH_REGS_SPI_H#define __ASM_ARCH_REGS_SPI_HCan you also update the guard name?
Ok, changed to __SPI_S3C2410_H, this seems to be the most common format in spi drivers.
Arnd
PATCH 14/36 ARM: s3c: move irqchip driver back into platform
In reply to Arnd BergmannIt was a good idea to move it out at first, but the irqchip code is still tightly connected to the s3c24xx platform code and uses multiple internal header files, so just move it back for the time being to avoid those dependencies.
---
arch/arm/mach-s3c24xx/Makefile | 1 +
{drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c | 0
drivers/irqchip/Makefile | 1 -
3 files changed, 1 insertion(+), 1 deletion(-)
rename {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c (100%)arch/arm/mach-s3c24xx/Makefile +1 -0
@@ -8,6 +8,7 @@ # core obj-y += common.o +obj-y += irq-s3c24xx.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o
arch/arm/mach-s3c24xx/irq-s3c24xx.c renamed from drivers/irqchip/irq-s3c24xx.c +0 -0
drivers/irqchip/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_LPC32XX) += irq-lpc32xx.o obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o -obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o obj-$(CONFIG_OMPIC) += irq-ompic.o
Signature · 1 line
2.20.0
PATCH 15/36 ARM: s3c: adc: move header to linux/soc/samsung
In reply to Arnd BergmannThere are multiple drivers using the private adc interface. It seems unlikely that they would ever get converted to iio, so make the current state official by making the header file global.
The s3c2410_ts driver needs a couple of register definitions as well.
--- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++- drivers/power/supply/s3c_adc_battery.c | 2 +- .../linux/soc/samsung/s3c-adc.h | 0 10 files changed, 43 insertions(+), 10 deletions(-) rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (100%)
arch/arm/mach-s3c64xx/mach-crag6410.c +1 -1
@@ -57,7 +57,7 @@#include <plat/keypad.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/pm.h> #include <plat/samsung-time.h>
arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1
@@ -27,7 +27,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h>
arch/arm/mach-s3c64xx/mach-real6410.c +1 -1
@@ -29,7 +29,7 @@#include <mach/gpio-samsung.h> #include <mach/irqs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h>
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1
@@ -60,7 +60,7 @@#include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/keypad.h> #include <plat/samsung-time.h>
arch/arm/plat-samsung/adc.c +1 -1
@@ -20,7 +20,7 @@#include <linux/regulator/consumer.h> #include <plat/regs-adc.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between * the touchscreen and any other drivers that may need to use it, such as
arch/arm/plat-samsung/devs.c +1 -1
@@ -44,7 +44,7 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> #include <plat/fb-s3c2410.h>
drivers/hwmon/s3c-hwmon.c +1 -1
@@ -20,7 +20,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/hwmon-s3c.h> struct s3c_hwmon_attr {
drivers/input/touchscreen/s3c2410_ts.c +35 -2
@@ -21,10 +21,43 @@#include <linux/clk.h> #include <linux/io.h> -#include <plat/adc.h> -#include <plat/regs-adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#define S3C2410_ADCCON (0x00) +#define S3C2410_ADCTSC (0x04) +#define S3C2410_ADCDLY (0x08) +#define S3C2410_ADCDAT0 (0x0C) +#define S3C2410_ADCDAT1 (0x10) +#define S3C64XX_ADCUPDN (0x14) +#define S3C2443_ADCMUX (0x18) +#define S3C64XX_ADCCLRINT (0x18) +#define S5P_ADCMUX (0x1C) +#define S3C64XX_ADCCLRINTPNDNUP (0x20) + +/* ADCTSC Register Bits */ +#define S3C2443_ADCTSC_UD_SEN (1 << 8) +#define S3C2410_ADCTSC_YM_SEN (1<<7) +#define S3C2410_ADCTSC_YP_SEN (1<<6) +#define S3C2410_ADCTSC_XM_SEN (1<<5) +#define S3C2410_ADCTSC_XP_SEN (1<<4) +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) +#define S3C2410_ADCTSC_AUTO_PST (1<<2) +#define S3C2410_ADCTSC_XY_PST (x) (((x)&0x3)<<0) + +/* ADCDAT0 Bits */ +#define S3C2410_ADCDAT0_UPDOWN (1<<15) +#define S3C2410_ADCDAT0_AUTO_PST (1<<14) +#define S3C2410_ADCDAT0_XY_PST (0x3<<12) +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF) + +/* ADCDAT1 Bits */ +#define S3C2410_ADCDAT1_UPDOWN (1<<15) +#define S3C2410_ADCDAT1_AUTO_PST (1<<14) +#define S3C2410_ADCDAT1_XY_PST (0x3<<12) +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF) + +#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))#define INT_DOWN (0)
drivers/power/supply/s3c_adc_battery.c +1 -1
@@ -22,7 +22,7 @@#include <linux/init.h> #include <linux/module.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #define BAT_POLL_INTERVAL 10000/* ms */ #define JITTER_DELAY 500/* ms */
include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0 -0
Signature · 1 line
2.20.0
Re: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
Quoted 9 lines · Arnd Bergmann
There are multiple drivers using the private adc interface. It seems unlikely that they would ever get converted to iio, so make the current state official by making the header file global.
The
s3c2410_tsdriver needs a couple of register definitions as well.Signed-off-by Arnd Bergmann <[email protected]>
For hwmon:
Quoted 173 lines
--- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++- drivers/power/supply/s3c_adc_battery.c | 2 +- .../linux/soc/samsung/s3c-adc.h | 0 10 files changed, 43 insertions(+), 10 deletions(-)rename
arch/arm/plat-samsung/include/plat/adc.h=>include/linux/soc/samsung/s3c-adc.h(100%)arch/arm/mach-s3c64xx/mach-crag6410.c +1
-1@@ -57,7 +57,7 @@#include <plat/keypad.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/pm.h> #include <plat/samsung-time.h> arch/arm/mach-s3c64xx/mach-mini6410.c +1
-1@@ -27,7 +27,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-real6410.c +1
-1@@ -29,7 +29,7 @@#include <mach/gpio-samsung.h> #include <mach/irqs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-smdk6410.c +1
-1@@ -60,7 +60,7 @@#include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/keypad.h> #include <plat/samsung-time.h> arch/arm/plat-samsung/adc.c +1
-1@@ -20,7 +20,7 @@#include <linux/regulator/consumer.h> #include <plat/regs-adc.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between * the touchscreen and any other drivers that may need to use it, such as arch/arm/plat-samsung/devs.c +1
-1@@ -44,7 +44,7 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> #include <plat/fb-s3c2410.h> drivers/hwmon/s3c-hwmon.c +1
-1@@ -20,7 +20,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/hwmon-s3c.h> struct s3c_hwmon_attr {drivers/input/touchscreen/s3c2410_ts.c +35
-2@@ -21,10 +21,43 @@#include <linux/clk.h> #include <linux/io.h> -#include <plat/adc.h> -#include <plat/regs-adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#define S3C2410_ADCCON (0x00) +#define S3C2410_ADCTSC (0x04) +#define S3C2410_ADCDLY (0x08) +#define S3C2410_ADCDAT0 (0x0C) +#define S3C2410_ADCDAT1 (0x10) +#define S3C64XX_ADCUPDN (0x14) +#define S3C2443_ADCMUX (0x18) +#define S3C64XX_ADCCLRINT (0x18) +#define S5P_ADCMUX (0x1C) +#define S3C64XX_ADCCLRINTPNDNUP (0x20) + +/* ADCTSC Register Bits */ +#define S3C2443_ADCTSC_UD_SEN (1 << 8) +#define S3C2410_ADCTSC_YM_SEN (1<<7) +#define S3C2410_ADCTSC_YP_SEN (1<<6) +#define S3C2410_ADCTSC_XM_SEN (1<<5) +#define S3C2410_ADCTSC_XP_SEN (1<<4) +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) +#define S3C2410_ADCTSC_AUTO_PST (1<<2) +#define S3C2410_ADCTSC_XY_PST (x) (((x)&0x3)<<0) + +/* ADCDAT0 Bits */ +#define S3C2410_ADCDAT0_UPDOWN (1<<15) +#define S3C2410_ADCDAT0_AUTO_PST (1<<14) +#define S3C2410_ADCDAT0_XY_PST (0x3<<12) +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF) + +/* ADCDAT1 Bits */ +#define S3C2410_ADCDAT1_UPDOWN (1<<15) +#define S3C2410_ADCDAT1_AUTO_PST (1<<14) +#define S3C2410_ADCDAT1_XY_PST (0x3<<12) +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF) + +#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))#define INT_DOWN (0)drivers/power/supply/s3c_adc_battery.c +1
-1@@ -22,7 +22,7 @@#include <linux/init.h> #include <linux/module.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #define BAT_POLL_INTERVAL 10000/* ms */ #define JITTER_DELAY 500/* ms */ include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0
-0
Re: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
Quoted 6 lines · Guenter Roeck
Quoted 5 lines · Arnd Bergmann
There are multiple drivers using the private adc interface. It seems unlikely that they would ever get converted to iio, so make the current state official by making the header file global.
Quoted 8 lines
Quoted 4 lines
The
s3c2410_tsdriver needs a couple of register definitions as well.Signed-off-by Arnd Bergmann <[email protected]>For hwmon:
Acked-by Guenter Roeck <[email protected]>
For input:
Quoted 162 lines
Quoted 161 lines
--- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++- drivers/power/supply/s3c_adc_battery.c | 2 +- .../linux/soc/samsung/s3c-adc.h | 0 10 files changed, 43 insertions(+), 10 deletions(-)rename
arch/arm/plat-samsung/include/plat/adc.h=>include/linux/soc/samsung/s3c-adc.h(100%)arch/arm/mach-s3c64xx/mach-crag6410.c +1
-1@@ -57,7 +57,7 @@#include <plat/keypad.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/pm.h> #include <plat/samsung-time.h> arch/arm/mach-s3c64xx/mach-mini6410.c +1
-1@@ -27,7 +27,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-real6410.c +1
-1@@ -29,7 +29,7 @@#include <mach/gpio-samsung.h> #include <mach/irqs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-smdk6410.c +1
-1@@ -60,7 +60,7 @@#include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/keypad.h> #include <plat/samsung-time.h> arch/arm/plat-samsung/adc.c +1
-1@@ -20,7 +20,7 @@#include <linux/regulator/consumer.h> #include <plat/regs-adc.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between * the touchscreen and any other drivers that may need to use it, such as arch/arm/plat-samsung/devs.c +1
-1@@ -44,7 +44,7 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> #include <plat/fb-s3c2410.h> drivers/hwmon/s3c-hwmon.c +1
-1@@ -20,7 +20,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/hwmon-s3c.h> struct s3c_hwmon_attr {drivers/input/touchscreen/s3c2410_ts.c +35
-2@@ -21,10 +21,43 @@#include <linux/clk.h> #include <linux/io.h> -#include <plat/adc.h> -#include <plat/regs-adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#define S3C2410_ADCCON (0x00) +#define S3C2410_ADCTSC (0x04) +#define S3C2410_ADCDLY (0x08) +#define S3C2410_ADCDAT0 (0x0C) +#define S3C2410_ADCDAT1 (0x10) +#define S3C64XX_ADCUPDN (0x14) +#define S3C2443_ADCMUX (0x18) +#define S3C64XX_ADCCLRINT (0x18) +#define S5P_ADCMUX (0x1C) +#define S3C64XX_ADCCLRINTPNDNUP (0x20) + +/* ADCTSC Register Bits */ +#define S3C2443_ADCTSC_UD_SEN (1 << 8) +#define S3C2410_ADCTSC_YM_SEN (1<<7) +#define S3C2410_ADCTSC_YP_SEN (1<<6) +#define S3C2410_ADCTSC_XM_SEN (1<<5) +#define S3C2410_ADCTSC_XP_SEN (1<<4) +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) +#define S3C2410_ADCTSC_AUTO_PST (1<<2) +#define S3C2410_ADCTSC_XY_PST (x) (((x)&0x3)<<0) + +/* ADCDAT0 Bits */ +#define S3C2410_ADCDAT0_UPDOWN (1<<15) +#define S3C2410_ADCDAT0_AUTO_PST (1<<14) +#define S3C2410_ADCDAT0_XY_PST (0x3<<12) +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF) + +/* ADCDAT1 Bits */ +#define S3C2410_ADCDAT1_UPDOWN (1<<15) +#define S3C2410_ADCDAT1_AUTO_PST (1<<14) +#define S3C2410_ADCDAT1_XY_PST (0x3<<12) +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF) + +#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))#define INT_DOWN (0)drivers/power/supply/s3c_adc_battery.c +1
-1@@ -22,7 +22,7 @@#include <linux/init.h> #include <linux/module.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #define BAT_POLL_INTERVAL 10000/* ms */ #define JITTER_DELAY 500/* ms */ include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0
-0
Signature · 1 line
Dmitry
Re: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
Hi,
Quoted 12 lines · Dmitry Torokhov
Quoted 11 lines · Guenter Roeck
Quoted 9 lines · Arnd Bergmann
There are multiple drivers using the private adc interface. It seems unlikely that they would ever get converted to iio, so make the current state official by making the header file global.
The
s3c2410_tsdriver needs a couple of register definitions as well.Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
Quoted 3 lines
For hwmon:
Acked-by Guenter Roeck <[email protected]>For input:
Acked-by Dmitry Torokhov <[email protected]>
For power-supply:
-- Sebastian
Quoted 153 lines
Quoted 153 lines
Quoted 153 lines
--- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++- drivers/power/supply/s3c_adc_battery.c | 2 +- .../linux/soc/samsung/s3c-adc.h | 0 10 files changed, 43 insertions(+), 10 deletions(-)rename
arch/arm/plat-samsung/include/plat/adc.h=>include/linux/soc/samsung/s3c-adc.h(100%)arch/arm/mach-s3c64xx/mach-crag6410.c +1
-1@@ -57,7 +57,7 @@#include <plat/keypad.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/pm.h> #include <plat/samsung-time.h> arch/arm/mach-s3c64xx/mach-mini6410.c +1
-1@@ -27,7 +27,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-real6410.c +1
-1@@ -29,7 +29,7 @@#include <mach/gpio-samsung.h> #include <mach/irqs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-smdk6410.c +1
-1@@ -60,7 +60,7 @@#include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/keypad.h> #include <plat/samsung-time.h> arch/arm/plat-samsung/adc.c +1
-1@@ -20,7 +20,7 @@#include <linux/regulator/consumer.h> #include <plat/regs-adc.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between * the touchscreen and any other drivers that may need to use it, such as arch/arm/plat-samsung/devs.c +1
-1@@ -44,7 +44,7 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> #include <plat/fb-s3c2410.h> drivers/hwmon/s3c-hwmon.c +1
-1@@ -20,7 +20,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/hwmon-s3c.h> struct s3c_hwmon_attr {drivers/input/touchscreen/s3c2410_ts.c +35
-2@@ -21,10 +21,43 @@#include <linux/clk.h> #include <linux/io.h> -#include <plat/adc.h> -#include <plat/regs-adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#define S3C2410_ADCCON (0x00) +#define S3C2410_ADCTSC (0x04) +#define S3C2410_ADCDLY (0x08) +#define S3C2410_ADCDAT0 (0x0C) +#define S3C2410_ADCDAT1 (0x10) +#define S3C64XX_ADCUPDN (0x14) +#define S3C2443_ADCMUX (0x18) +#define S3C64XX_ADCCLRINT (0x18) +#define S5P_ADCMUX (0x1C) +#define S3C64XX_ADCCLRINTPNDNUP (0x20) + +/* ADCTSC Register Bits */ +#define S3C2443_ADCTSC_UD_SEN (1 << 8) +#define S3C2410_ADCTSC_YM_SEN (1<<7) +#define S3C2410_ADCTSC_YP_SEN (1<<6) +#define S3C2410_ADCTSC_XM_SEN (1<<5) +#define S3C2410_ADCTSC_XP_SEN (1<<4) +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) +#define S3C2410_ADCTSC_AUTO_PST (1<<2) +#define S3C2410_ADCTSC_XY_PST (x) (((x)&0x3)<<0) + +/* ADCDAT0 Bits */ +#define S3C2410_ADCDAT0_UPDOWN (1<<15) +#define S3C2410_ADCDAT0_AUTO_PST (1<<14) +#define S3C2410_ADCDAT0_XY_PST (0x3<<12) +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF) + +/* ADCDAT1 Bits */ +#define S3C2410_ADCDAT1_UPDOWN (1<<15) +#define S3C2410_ADCDAT1_AUTO_PST (1<<14) +#define S3C2410_ADCDAT1_XY_PST (0x3<<12) +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF) + +#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))#define INT_DOWN (0)drivers/power/supply/s3c_adc_battery.c +1
-1@@ -22,7 +22,7 @@#include <linux/init.h> #include <linux/module.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h>
Quoted 11 lines
Quoted 8 lines
Quoted 7 lines
drivers/power/supply/s3c_adc_battery.c +0
-0#define BAT_POLL_INTERVAL 10000/* ms */ #define JITTER_DELAY 500/* ms */ include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0
-0Signature · 1 line
Dmitry
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Krzysztof Kozlowski
maintainerRe: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
In reply to Arnd Bergmanninclude/linux/soc/samsung/s3c-adc.h
Quoted 181 lines · Arnd Bergmann
There are multiple drivers using the private adc interface. It seems unlikely that they would ever get converted to iio, so make the current state official by making the header file global.
The
s3c2410_tsdriver needs a couple of register definitions as well.Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/devs.c | 2 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 ++++++++++++++++++- drivers/power/supply/s3c_adc_battery.c | 2 +- .../linux/soc/samsung/s3c-adc.h | 0 10 files changed, 43 insertions(+), 10 deletions(-) rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (100%)arch/arm/mach-s3c64xx/mach-crag6410.c +1
-1@@ -57,7 +57,7 @@#include <plat/keypad.h> #include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/pm.h> #include <plat/samsung-time.h> arch/arm/mach-s3c64xx/mach-mini6410.c +1
-1@@ -27,7 +27,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-real6410.c +1
-1@@ -29,7 +29,7 @@#include <mach/gpio-samsung.h> #include <mach/irqs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> arch/arm/mach-s3c64xx/mach-smdk6410.c +1
-1@@ -60,7 +60,7 @@#include <plat/devs.h> #include <plat/cpu.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <plat/keypad.h> #include <plat/samsung-time.h> arch/arm/plat-samsung/adc.c +1
-1@@ -20,7 +20,7 @@#include <linux/regulator/consumer.h> #include <plat/regs-adc.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between * the touchscreen and any other drivers that may need to use it, such as arch/arm/plat-samsung/devs.c +1
-1@@ -44,7 +44,7 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> #include <plat/fb-s3c2410.h> drivers/hwmon/s3c-hwmon.c +1
-1@@ -20,7 +20,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/hwmon-s3c.h> struct s3c_hwmon_attr {drivers/input/touchscreen/s3c2410_ts.c +35
-2@@ -21,10 +21,43 @@#include <linux/clk.h> #include <linux/io.h> -#include <plat/adc.h> -#include <plat/regs-adc.h> +#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#define S3C2410_ADCCON (0x00) +#define S3C2410_ADCTSC (0x04) +#define S3C2410_ADCDLY (0x08) +#define S3C2410_ADCDAT0 (0x0C) +#define S3C2410_ADCDAT1 (0x10) +#define S3C64XX_ADCUPDN (0x14) +#define S3C2443_ADCMUX (0x18) +#define S3C64XX_ADCCLRINT (0x18) +#define S5P_ADCMUX (0x1C) +#define S3C64XX_ADCCLRINTPNDNUP (0x20) + +/* ADCTSC Register Bits */ +#define S3C2443_ADCTSC_UD_SEN (1 << 8) +#define S3C2410_ADCTSC_YM_SEN (1<<7) +#define S3C2410_ADCTSC_YP_SEN (1<<6) +#define S3C2410_ADCTSC_XM_SEN (1<<5) +#define S3C2410_ADCTSC_XP_SEN (1<<4) +#define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) +#define S3C2410_ADCTSC_AUTO_PST (1<<2) +#define S3C2410_ADCTSC_XY_PST (x) (((x)&0x3)<<0) + +/* ADCDAT0 Bits */ +#define S3C2410_ADCDAT0_UPDOWN (1<<15) +#define S3C2410_ADCDAT0_AUTO_PST (1<<14) +#define S3C2410_ADCDAT0_XY_PST (0x3<<12) +#define S3C2410_ADCDAT0_XPDATA_MASK (0x03FF) + +/* ADCDAT1 Bits */ +#define S3C2410_ADCDAT1_UPDOWN (1<<15) +#define S3C2410_ADCDAT1_AUTO_PST (1<<14) +#define S3C2410_ADCDAT1_XY_PST (0x3<<12) +#define S3C2410_ADCDAT1_YPDATA_MASK (0x03FF) + +#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))#define INT_DOWN (0)drivers/power/supply/s3c_adc_battery.c +1
-1@@ -22,7 +22,7 @@#include <linux/init.h> #include <linux/module.h> -#include <plat/adc.h> +#include <linux/soc/samsung/s3c-adc.h> #define BAT_POLL_INTERVAL 10000/* ms */ #define JITTER_DELAY 500/* ms */ include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0
-0
Can you update the name of header guard? __LINUX_SOC_SAMSUNG_S3C_ADC_H?
Best regards,
Krzysztof
Re: [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung
Quoted 6 lines · Krzysztof Kozlowski
include/linux/soc/samsung/s3c-adc.h
Quoted 4 lines
include/linux/soc/samsung/s3c-adc.h renamed from arch/arm/plat-samsung/include/plat/adc.h +0
-0Can you update the name of header guard?
__LINUX_SOC_SAMSUNG_S3C_ADC_H?
Ok, done.
Arnd
PATCH 16/36 ARM: s3c: move spi fiq handler into platform
In reply to Arnd BergmannThe 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.
--- 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%)
arch/arm/mach-s3c24xx/Makefile +2 -0
@@ -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
arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c new file +9 -0
@@ -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);
arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S renamed from drivers/spi/spi-s3c24xx-fiq.S +1 -1
@@ -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)
drivers/spi/Makefile +0 -1
@@ -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
drivers/spi/spi-s3c24xx.c +1 -6
@@ -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);
include/linux/spi/s3c24xx-fiq.h renamed from drivers/spi/spi-s3c24xx-fiq.h +5 -0
@@ -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
Signature · 1 line
2.20.0
PATCH 17/36 ARM: s3c: h1940-audio: turn into platform driver
In reply to Arnd BergmannAvoid machine specific headers by using a gpio lookup table combined with a platform_driver for this board.
--- arch/arm/mach-s3c24xx/mach-h1940.c | 18 ++++++++ sound/soc/samsung/h1940_uda1380.c | 71 ++++++++++-------------------- 2 files changed, 41 insertions(+), 48 deletions(-)
arch/arm/mach-s3c24xx/mach-h1940.c +18 -0
@@ -475,6 +475,22 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { }, }; +static struct gpiod_lookup_table h1940_audio_gpio_table = { + .dev_id ="h1940-audio" , + .table = { +GPIO_LOOKUP ("H1940_LATCH" , +H1940_LATCH_AUDIO_POWER -H1940_LATCH_GPIO (0 ), +"speaker-power" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("GPIOG" ,4 ,"hp" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; + +static struct platform_device h1940_audio = { + .name ="h1940-audio" , + .id =-1 , +}; +static struct pwm_lookup h1940_pwm_lookup[] = {PWM_LOOKUP ("samsung-pwm" ,0 ,"pwm-backlight" ,NULL ,36296 ,PWM_POLARITY_NORMAL ),
@@ -652,6 +668,7 @@ static struct platform_device *h1940_devices[] __initdata = { &s3c_device_ts, &power_supply, &h1940_battery, + &h1940_audio, };static void __init h1940_map_io (void )
@@ -691,6 +708,7 @@ static void __init h1940_init(void)s3c24xx_fb_set_platdata (&h1940_fb_info);gpiod_add_lookup_table (&h1940_mmc_gpio_table); +gpiod_add_lookup_table (&h1940_audio_gpio_table);s3c24xx_mci_set_platdata (&h1940_mmc_cfg);s3c24xx_udc_set_platdata (&h1940_udc_cfg);s3c24xx_ts_set_platdata (&h1940_ts_cfg);
sound/soc/samsung/h1940_uda1380.c +23 -48
117 lines not on this page · raw message
Signature · 1 line
2.20.0
PATCH 18/36 ARM: s3c: gta02-audio: turn into platform driver
In reply to Arnd BergmannAvoid machine specific headers by using a gpio lookup table combined with a platform_driver for this board.
--- arch/arm/mach-s3c24xx/mach-gta02.c | 17 ++++++ sound/soc/samsung/neo1973_wm8753.c | 85 +++++++++--------------------- 2 files changed, 43 insertions(+), 59 deletions(-)
arch/arm/mach-s3c24xx/mach-gta02.c +17 -0
@@ -15,6 +15,7 @@#include <linux/delay.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/gpio/machine.h> #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/workqueue.h>
@@ -474,6 +475,20 @@ static struct platform_device gta02_buttons_device = { }, }; +static struct gpiod_lookup_table gta02_audio_gpio_table = { + .dev_id ="neo1973-audio" , + .table = { +GPIO_LOOKUP ("GPIOJ" ,2 ,"amp-shut" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("GPIOJ" ,1 ,"hp" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; + +static struct platform_device gta02_audio = { + .name ="neo1973-audio" , + .id =-1 , +}; +static void __init gta02_map_io (void ) {s3c24xx_init_io (gta02_iodesc,ARRAY_SIZE (gta02_iodesc));
@@ -498,6 +513,7 @@ static struct platform_device *gta02_devices[] __initdata = { >a02_buttons_device, &s3c_device_adc, &s3c_device_ts, + >a02_audio, };static void gta02_poweroff (void )
@@ -524,6 +540,7 @@ static void __init gta02_machine_init(void)i2c_register_board_info (0 , gta02_i2c_devs,ARRAY_SIZE (gta02_i2c_devs)); +gpiod_add_lookup_table (>a02_audio_gpio_table);platform_add_devices (gta02_devices,ARRAY_SIZE (gta02_devices)); pm_power_off = gta02_poweroff;
sound/soc/samsung/neo1973_wm8753.c +26 -59
135 lines not on this page · raw message
Signature · 1 line
2.20.0
PATCH 19/36 ARM: s3c: rx1950: turn into platform driver
In reply to Arnd BergmannAvoid machine specific headers by using a gpio lookup table combined with a platform_driver for this board.
--- arch/arm/mach-s3c24xx/mach-rx1950.c | 16 +++++++ sound/soc/samsung/rx1950_uda1380.c | 72 +++++++++-------------------- 2 files changed, 39 insertions(+), 49 deletions(-)
arch/arm/mach-s3c24xx/mach-rx1950.c +16 -0
@@ -724,6 +724,20 @@ static struct i2c_board_info rx1950_i2c_devices[] = { }, }; +static struct gpiod_lookup_table rx1950_audio_gpio_table = { + .dev_id ="rx1950-audio" , + .table = { +GPIO_LOOKUP ("GPIOG" ,12 ,"hp-gpio" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("GPIOA" ,1 ,"speaker-power" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; + +static struct platform_device rx1950_audio = { + .name ="rx1950-audio" , + .id =-1 , +}; +static struct platform_device *rx1950_devices[]__initdata = { &s3c2410_device_dclk, &s3c_device_lcd,
@@ -742,6 +756,7 @@ static struct platform_device *rx1950_devices[] __initdata = { &power_supply, &rx1950_battery, &rx1950_leds, + &rx1950_audio, };static void __init rx1950_map_io (void )
@@ -809,6 +824,7 @@ static void __init rx1950_init_machine(void)gpio_direction_output (S3C2410_GPJ (6 ),0 );pwm_add_table (rx1950_pwm_lookup,ARRAY_SIZE (rx1950_pwm_lookup)); +gpiod_add_lookup_table (&rx1950_audio_gpio_table);platform_add_devices (rx1950_devices,ARRAY_SIZE (rx1950_devices)); i2c_register_board_info(0, rx1950_i2c_devices,
sound/soc/samsung/rx1950_uda1380.c +23 -49
124 lines not on this page · raw message
Signature · 1 line
2.20.0
PATCH 20/36 ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS
In reply to Arnd BergmannThe constant requires indirectly including a machine header file, but it's not actually used any more since commit 87b132bc0315 ("ASoC:
samsung: s3c24{xx,12}-i2s: port to use generic dmaengine API"), so remove it completely.
--- sound/soc/samsung/s3c-i2s-v2.c | 3 +-- sound/soc/samsung/s3c-i2s-v2.h | 3 +-- sound/soc/samsung/s3c2412-i2s.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
sound/soc/samsung/s3c-i2s-v2.c +1 -2
@@ -616,8 +616,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,EXPORT_SYMBOL_GPL (s3c_i2sv2_iis_calc_rate);int s3c_i2sv2_probe (struct snd_soc_dai *dai, -struct s3c_i2sv2_info *i2s, -unsigned long base) +struct s3c_i2sv2_info *i2s) {struct device *dev = dai->dev;unsigned int iismod;
sound/soc/samsung/s3c-i2s-v2.h +1 -2
@@ -83,8 +83,7 @@ extern int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,* @base: The base address for the registers. */ extern int s3c_i2sv2_probe (struct snd_soc_dai *dai, -struct s3c_i2sv2_info *i2s, -unsigned long base); +struct s3c_i2sv2_info *i2s);/** * s3c_i2sv2_cleanup - cleanup resources allocated in s3c_i2sv2_probe
sound/soc/samsung/s3c2412-i2s.c +1 -1
@@ -49,7 +49,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)snd_soc_dai_init_dma_data (dai, &s3c2412_i2s_pcm_stereo_out, &s3c2412_i2s_pcm_stereo_in); - ret =s3c_i2sv2_probe (dai, &s3c2412_i2s,S3C2410_PA_IIS ); + ret =s3c_i2sv2_probe (dai, &s3c2412_i2s);if (ret)return ret;
Signature · 1 line
2.20.0
Re: [PATCH 20/36] ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS
Quoted 4 lines · Arnd Bergmann
The constant requires indirectly including a machine header file, but it's not actually used any more since commit
87b132bc0315("ASoC:
samsung: s3c24{xx,12}-i2s: port to use generic dmaengine API"), so remove it completely.
PATCH 21/36 ARM: s3c: move iis pinctrl config into boards
In reply to Arnd BergmannThe s3c_gpio_cfgall_range() function is an internal interface of the samsung gpio driver and should not be called directly by drivers, so move the iis pin initialization into the boards.
Note that the s3c2412-i2s driver has no boards using it in mainline linux, the driver gets selected for the jive machine but is never instantiated.
--- arch/arm/mach-s3c24xx/mach-gta02.c | 4 ++++ arch/arm/mach-s3c24xx/mach-h1940.c | 3 +++ arch/arm/mach-s3c24xx/mach-mini2440.c | 5 +++++ arch/arm/mach-s3c24xx/mach-n30.c | 5 +++++ arch/arm/mach-s3c24xx/mach-nexcoder.c | 5 +++++ arch/arm/mach-s3c24xx/mach-otom.c | 6 ++++++ arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +++ arch/arm/mach-s3c24xx/mach-rx1950.c | 3 +++ arch/arm/mach-s3c24xx/mach-rx3715.c | 4 ++++ arch/arm/mach-s3c24xx/mach-smdk2410.c | 5 +++++ arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 ++++ arch/arm/mach-s3c24xx/mach-smdk2440.c | 6 +++++- arch/arm/mach-s3c24xx/mach-vstms.c | 6 +++++- arch/arm/mach-s3c24xx/simtec-audio.c | 6 ++++++ sound/soc/samsung/s3c2412-i2s.c | 7 ------- sound/soc/samsung/s3c24xx-i2s.c | 7 ------- 16 files changed, 63 insertions(+), 16 deletions(-)
arch/arm/mach-s3c24xx/mach-gta02.c +4 -0
@@ -540,6 +540,10 @@ static void __init gta02_machine_init(void)i2c_register_board_info (0 , gta02_i2c_devs,ARRAY_SIZE (gta02_i2c_devs)); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +gpiod_add_lookup_table (>a02_audio_gpio_table);platform_add_devices (gta02_devices,ARRAY_SIZE (gta02_devices)); pm_power_off = gta02_poweroff;
arch/arm/mach-s3c24xx/mach-h1940.c +3 -0
@@ -709,6 +709,9 @@ static void __init h1940_init(void)s3c24xx_fb_set_platdata (&h1940_fb_info);gpiod_add_lookup_table (&h1940_mmc_gpio_table);gpiod_add_lookup_table (&h1940_audio_gpio_table); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );s3c24xx_mci_set_platdata (&h1940_mmc_cfg);s3c24xx_udc_set_platdata (&h1940_udc_cfg);s3c24xx_ts_set_platdata (&h1940_ts_cfg);
arch/arm/mach-s3c24xx/mach-mini2440.c +5 -0
@@ -685,6 +685,11 @@ static void __init mini2440_init(void)s3c_gpio_setpull (mini2440_buttons[i].gpio,S3C_GPIO_PULL_UP );s3c_gpio_cfgpin (mini2440_buttons[i].gpio,S3C2410_GPIO_INPUT ); } + +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +if (features.lcd_index !=-1 ) {int li;
arch/arm/mach-s3c24xx/mach-n30.c +5 -0
@@ -36,6 +36,7 @@#include <mach/regs-gpio.h> #include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <asm/mach/arch.h> #include <asm/mach/irq.h>
@@ -570,6 +571,10 @@ static void __init n30_init(void)S3C2410_MISCCR_USBSUSPND0 | S3C2410_MISCCR_USBSUSPND1, 0x0); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +if (machine_is_n30 ()) {/* Turn off suspend on both USB ports, and switch the * selectable USB port to USB device mode. */
arch/arm/mach-s3c24xx/mach-nexcoder.c +5 -0
@@ -145,6 +145,11 @@ static void __init nexcoder_init_time(void)static void __init nexcoder_init (void ) {s3c_i2c0_set_platdata (NULL ); + +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +platform_add_devices (nexcoder_devices,ARRAY_SIZE (nexcoder_devices)); };
arch/arm/mach-s3c24xx/mach-otom.c +6 -0
@@ -24,6 +24,8 @@#include <mach/hardware.h> #include <mach/regs-gpio.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <plat/cpu.h> #include <plat/devs.h>
@@ -107,6 +109,10 @@ static void __init otom11_init_time(void)static void __init otom11_init (void ) {s3c_i2c0_set_platdata (NULL ); + +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (otom11_devices,ARRAY_SIZE (otom11_devices)); }
arch/arm/mach-s3c24xx/mach-qt2410.c +3 -0
@@ -337,6 +337,9 @@ static void __init qt2410_machine_init(void)s3c24xx_udc_set_platdata (&qt2410_udc_cfg);s3c_i2c0_set_platdata (NULL ); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );gpiod_add_lookup_table (&qt2410_spi_gpiod_table);platform_add_devices (qt2410_devices,ARRAY_SIZE (qt2410_devices));s3c_pm_init ();
arch/arm/mach-s3c24xx/mach-rx1950.c +3 -0
@@ -825,6 +825,9 @@ static void __init rx1950_init_machine(void)pwm_add_table (rx1950_pwm_lookup,ARRAY_SIZE (rx1950_pwm_lookup));gpiod_add_lookup_table (&rx1950_audio_gpio_table); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (rx1950_devices,ARRAY_SIZE (rx1950_devices)); i2c_register_board_info(0, rx1950_i2c_devices,
arch/arm/mach-s3c24xx/mach-rx3715.c +4 -0
@@ -39,6 +39,7 @@#include <mach/regs-gpio.h> #include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <plat/cpu.h> #include <plat/devs.h>
@@ -199,6 +200,9 @@ static void __init rx3715_init_machine(void)s3c_nand_set_platdata (&rx3715_nand_info);s3c24xx_fb_set_platdata (&rx3715_fb_info); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (rx3715_devices,ARRAY_SIZE (rx3715_devices)); }
arch/arm/mach-s3c24xx/mach-smdk2410.c +5 -0
@@ -19,6 +19,8 @@#include <linux/serial_s3c.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -94,6 +96,9 @@ static void __init smdk2410_init(void) {s3c_i2c0_set_platdata (NULL );platform_add_devices (smdk2410_devices,ARRAY_SIZE (smdk2410_devices)); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );smdk_machine_init (); }
arch/arm/mach-s3c24xx/mach-smdk2413.c +4 -0
@@ -37,6 +37,7 @@#include <linux/platform_data/i2c-s3c2410.h> #include <mach/gpio-samsung.h> #include <mach/fb.h> +#include <plat/gpio-cfg.h> #include <plat/devs.h> #include <plat/cpu.h>
@@ -119,6 +120,9 @@ static void __init smdk2413_machine_init(void)s3c24xx_udc_set_platdata (&smdk2413_udc_cfg);s3c_i2c0_set_platdata (NULL ); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (smdk2413_devices,ARRAY_SIZE (smdk2413_devices));smdk_machine_init ();
arch/arm/mach-s3c24xx/mach-smdk2440.c +5 -1
@@ -29,6 +29,8 @@#include <mach/regs-gpio.h> #include <mach/regs-lcd.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <mach/fb.h> #include <linux/platform_data/i2c-s3c2410.h>
@@ -167,7 +169,9 @@ static void __init smdk2440_machine_init(void) {s3c24xx_fb_set_platdata (&smdk2440_fb_info);s3c_i2c0_set_platdata (NULL ); - +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (smdk2440_devices,ARRAY_SIZE (smdk2440_devices));smdk_machine_init (); }
arch/arm/mach-s3c24xx/mach-vstms.c +5 -1
@@ -31,6 +31,8 @@#include <mach/regs-gpio.h> #include <mach/regs-lcd.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <mach/fb.h>
@@ -149,7 +151,9 @@ static void __init vstms_init(void) {s3c_i2c0_set_platdata (NULL );s3c_nand_set_platdata (&vstms_nand_info); - +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );platform_add_devices (vstms_devices,ARRAY_SIZE (vstms_devices)); }
arch/arm/mach-s3c24xx/simtec-audio.c +6 -0
@@ -14,6 +14,8 @@#include <mach/hardware.h> #include <mach/regs-gpio.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <linux/platform_data/asoc-s3c24xx_simtec.h> #include <plat/devs.h>
@@ -65,6 +67,10 @@ int __init simtec_audio_add(const char *name, bool has_lr_routing,if (has_lr_routing) simtec_audio_platdata.startup = simtec_audio_startup_lrroute; +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +platform_device_register (&s3c_device_iis);platform_device_register (&simtec_audio_dev);return 0 ;
sound/soc/samsung/s3c2412-i2s.c +0 -7
@@ -19,9 +19,6 @@#include <sound/soc.h> #include <sound/pcm_params.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> -#include "dma.h" #include "regs-i2s-v2.h" #include "s3c2412-i2s.h"
@@ -70,10 +67,6 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)if (ret) goto err; -/* Configure the I2S pins (GPE0...GPE4) in correct mode */ -s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), -S3C_GPIO_PULL_NONE ); -return 0 ; err:
sound/soc/samsung/s3c24xx-i2s.c +0 -7
@@ -18,10 +18,7 @@#include <sound/soc.h> #include <sound/pcm_params.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> #include "regs-iis.h" -#include "dma.h" #include "s3c24xx-i2s.h"
@@ -348,10 +345,6 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)if (ret)return ret; -/* Configure the I2S pins (GPE0...GPE4) in correct mode */ -s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), -S3C_GPIO_PULL_NONE ); -writel (S3C2410_IISCON_IISEN , s3c24xx_i2s.regs +S3C2410_IISCON );s3c24xx_snd_txctrl (0 );
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 21/36] ARM: s3c: move iis pinctrl config into boards
Quoted 33 lines · Arnd Bergmann
The
s3c_gpio_cfgall_range()function is an internal interface of the samsung gpio driver and should not be called directly by drivers, so move the iis pin initialization into the boards.Note that the s3c2412-i2s driver has no boards using it in mainline linux, the driver gets selected for the jive machine but is never instantiated.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/mach-gta02.c | 4 ++++ arch/arm/mach-s3c24xx/mach-h1940.c | 3 +++ arch/arm/mach-s3c24xx/mach-mini2440.c | 5 +++++ arch/arm/mach-s3c24xx/mach-n30.c | 5 +++++ arch/arm/mach-s3c24xx/mach-nexcoder.c | 5 +++++ arch/arm/mach-s3c24xx/mach-otom.c | 6 ++++++ arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +++ arch/arm/mach-s3c24xx/mach-rx1950.c | 3 +++ arch/arm/mach-s3c24xx/mach-rx3715.c | 4 ++++ arch/arm/mach-s3c24xx/mach-smdk2410.c | 5 +++++ arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 ++++ arch/arm/mach-s3c24xx/mach-smdk2440.c | 6 +++++- arch/arm/mach-s3c24xx/mach-vstms.c | 6 +++++- arch/arm/mach-s3c24xx/simtec-audio.c | 6 ++++++ sound/soc/samsung/s3c2412-i2s.c | 7 ------- sound/soc/samsung/s3c24xx-i2s.c | 7 ------- 16 files changed, 63 insertions(+), 16 deletions(-)arch/arm/mach-s3c24xx/mach-gta02.c +0
-0
arch/arm/mach-s3c24xx/mach-gta02.c static void __init gta02_machine_init(void) · line 545
Quoted 6 lines
arch/arm/mach-s3c24xx/mach-gta02.c +3
-0@@ -540,6 +540,10 @@ static void __init gta02_machine_init(void)i2c_register_board_info (0 , gta02_i2c_devs,ARRAY_SIZE (gta02_i2c_devs)); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE );
This is not entirely equivalent move as before this was probe (so being executed also on rebinds) and now it is init. I guess it should not make any difference so let it be.
Best regards,
Krzysztof
Re: [PATCH 21/36] ARM: s3c: move iis pinctrl config into boards
Quoted 5 lines · Krzysztof Kozlowski
Quoted 4 lines · Arnd Bergmann
The
s3c_gpio_cfgall_range()function is an internal interface of the samsung gpio driver and should not be called directly by drivers, so move the iis pin initialization into the boards.
Quoted 7 lines
Quoted 3 lines
Note that the s3c2412-i2s driver has no boards using it in mainline linux, the driver gets selected for the jive machine but is never instantiated.
This is not entirely equivalent move as before this was probe (so being executed also on rebinds) and now it is init. I guess it should not make any difference so let it be.
Right, I've added an explanation in the changelog text now:
The s3c_gpio_cfgall_range() function is an internal interface of the samsung gpio driver and should not be called directly by drivers, so move the iis pin initialization into the boards.
+This means the pin configuration is only run once at early boot, rather +than each time the driver binds, but the effect should be the same.
Arnd
PATCH 22/36 ARM: s3c: leds: move setpull() calls into board files
In reply to Arnd BergmannThe leds-s3c24xx driver calls the private s3c_gpio_setpull() interface for each gpio line, but doing this requires access to the machine header files.
Move those calls into the machine init functions for any board that uses the driver.
--- arch/arm/mach-s3c24xx/common-smdk.c | 6 ++++-- arch/arm/mach-s3c24xx/mach-mini2440.c | 6 ++++++ arch/arm/mach-s3c24xx/mach-n30.c | 5 +++++ arch/arm/mach-s3c24xx/mach-qt2410.c | 1 + arch/arm/mach-s3c24xx/mach-vr1000.c | 7 +++++++ drivers/leds/leds-s3c24xx.c | 7 ------- 6 files changed, 23 insertions(+), 9 deletions(-)
arch/arm/mach-s3c24xx/common-smdk.c +4 -2
@@ -189,11 +189,13 @@ static const struct gpio smdk_led_gpios[] = {void __init smdk_machine_init (void ) {/* Configure the LEDs (even if we have no LED support)*/ +int i, ret; -int ret =gpio_request_array (smdk_led_gpios, -ARRAY_SIZE (smdk_led_gpios)); + ret =gpio_request_array (smdk_led_gpios,ARRAY_SIZE (smdk_led_gpios));if (!WARN_ON (ret <0 ))gpio_free_array (smdk_led_gpios,ARRAY_SIZE (smdk_led_gpios)); +for (i =0 ; i <ARRAY_SIZE (smdk_led_gpios); i++) +s3c_gpio_setpull (smdk_led_gpios[i].gpio,S3C_GPIO_PULL_NONE );if (machine_is_smdk2443 ()) smdk_nand_info.twrph0 =50 ;
arch/arm/mach-s3c24xx/mach-mini2440.c +6 -0
@@ -690,6 +690,12 @@ static void __init mini2440_init(void)s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ),S3C_GPIO_PULL_NONE ); +/* LEDs: no point in having a pull-up if we are always driving */ +s3c_gpio_setpull (S3C2410_GPB (5 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPB (6 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPB (7 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPB (8 ),S3C_GPIO_PULL_NONE ); +if (features.lcd_index !=-1 ) {int li;
arch/arm/mach-s3c24xx/mach-n30.c +5 -0
@@ -571,6 +571,11 @@ static void __init n30_init(void)S3C2410_MISCCR_USBSUSPND0 | S3C2410_MISCCR_USBSUSPND1, 0x0); +/* LEDs: no point in having a pull-up if we are always driving */ +s3c_gpio_setpull (S3C2410_GPG (6 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPD (8 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPD (9 ),S3C_GPIO_PULL_NONE ); +/* Configure the I2S pins (GPE0...GPE4) in correct mode */ s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ),S3C_GPIO_PULL_NONE );
arch/arm/mach-s3c24xx/mach-qt2410.c +1 -0
@@ -332,6 +332,7 @@ static void __init qt2410_machine_init(void)/* set initial state of the LED GPIO */ WARN_ON (gpio_request_one (S3C2410_GPB (0 ),GPIOF_OUT_INIT_HIGH ,NULL )); +s3c_gpio_setpull (S3C2410_GPB (0 ),S3C_GPIO_PULL_NONE );gpio_free (S3C2410_GPB (0 ));s3c24xx_udc_set_platdata (&qt2410_udc_cfg);
arch/arm/mach-s3c24xx/mach-vr1000.c +7 -0
@@ -37,6 +37,7 @@#include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <plat/cpu.h> #include <plat/devs.h>
@@ -322,6 +323,12 @@ static void __init vr1000_init(void)i2c_register_board_info (0 , vr1000_i2c_devs,ARRAY_SIZE (vr1000_i2c_devs)); + +/* LEDs: no point in having a pull-up if we are always driving */ +s3c_gpio_setpull (S3C2410_GPB (0 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPB (1 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPB (2 ),S3C_GPIO_PULL_NONE ); +nor_simtec_init ();simtec_audio_add (NULL , true,NULL );
drivers/leds/leds-s3c24xx.c +0 -7
@@ -16,9 +16,6 @@#include <linux/module.h> #include <linux/platform_data/leds-s3c24xx.h> -#include <mach/regs-gpio.h> -#include <plat/gpio-cfg.h> -/* our context */ struct s3c24xx_gpio_led {
@@ -73,10 +70,6 @@ static int s3c24xx_led_probe(struct platform_device *dev)if (ret <0 )return ret; -/* no point in having a pull-up if we are always driving */ - -s3c_gpio_setpull (pdata->gpio,S3C_GPIO_PULL_NONE ); -if (pdata->flags &S3C24XX_LEDF_TRISTATE )gpio_direction_input (pdata->gpio);else
Signature · 1 line
2.20.0
PATCH 23/36 ARM: s3c: move s3cmci pinctrl handling into board files
In reply to Arnd BergmannRather than call the internal s3c_gpio_cfgall_range() function through a platform header, move the code into the set_power callback that is already exported by the board, and add a default implementation.
In DT mode, the code already does not set the pin config, so nothing changes there.
--- arch/arm/mach-s3c24xx/include/mach/pm-core.h | 1 + arch/arm/mach-s3c24xx/mach-amlm5900.c | 15 +++++ arch/arm/mach-s3c24xx/mach-at2440evb.c | 10 ++- arch/arm/mach-s3c24xx/mach-gta02.c | 15 +++++ arch/arm/mach-s3c24xx/mach-h1940.c | 8 +++ arch/arm/mach-s3c24xx/mach-mini2440.c | 9 ++- arch/arm/mach-s3c24xx/mach-n30.c | 9 +++ arch/arm/mach-s3c24xx/mach-qt2410.c | 15 +++++ arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +++ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 15 +++++ arch/arm/plat-samsung/devs.c | 29 ++++++++ drivers/mmc/host/s3cmci.c | 69 +++++--------------- include/linux/platform_data/mmc-s3cmci.h | 2 + 13 files changed, 152 insertions(+), 54 deletions(-)
arch/arm/mach-s3c24xx/include/mach/pm-core.h +1 -0
@@ -12,6 +12,7 @@#include "regs-clock.h" #include "regs-irq.h" +#include <mach/irqs.h> static inline void s3c_pm_debug_init_uart (void ) {
arch/arm/mach-s3c24xx/mach-amlm5900.c +15 -0
@@ -13,6 +13,7 @@#include <linux/list.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/gpio/machine.h> #include <linux/gpio.h> #include <linux/device.h> #include <linux/platform_device.h>
@@ -124,6 +125,19 @@ static struct s3c2410_uartcfg amlm5900_uartcfgs[] = { } }; +static struct gpiod_lookup_table amlm5900_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +};static struct platform_device *amlm5900_devices[]__initdata = { #ifdef CONFIG_FB_S3C2410
@@ -219,6 +233,7 @@ static void __init amlm5900_init(void)s3c24xx_fb_set_platdata (&amlm5900_fb_info);#endif s3c_i2c0_set_platdata (NULL ); +gpiod_add_lookup_table (&amlm5900_mmc_gpio_table);platform_add_devices (amlm5900_devices,ARRAY_SIZE (amlm5900_devices)); }
arch/arm/mach-s3c24xx/mach-at2440evb.c +9 -1
@@ -136,7 +136,7 @@ static struct platform_device at2440evb_device_eth = { };static struct s3c24xx_mci_pdata at2440evb_mci_pdata__initdata = { -/* Intentionally left blank */ + .set_power = s3c24xx_mci_def_set_power, };static struct gpiod_lookup_table at2440evb_mci_gpio_table = {
@@ -144,10 +144,18 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { .table = {/* Card detect S3C2410_GPG(10) */ GPIO_LOOKUP ("GPG" ,10 ,"cd" ,GPIO_ACTIVE_LOW ), +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, }; +/* 7" LCD panel */ static struct s3c2410fb_display at2440evb_lcd_cfg __initdata = {
arch/arm/mach-s3c24xx/mach-gta02.c +15 -0
@@ -489,6 +489,20 @@ static struct platform_device gta02_audio = { .id = -1, }; +static struct gpiod_lookup_table gta02_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +static void __init gta02_map_io (void ) {s3c24xx_init_io (gta02_iodesc,ARRAY_SIZE (gta02_iodesc));
@@ -545,6 +559,7 @@ static void __init gta02_machine_init(void) S3C_GPIO_PULL_NONE);gpiod_add_lookup_table (>a02_audio_gpio_table); +gpiod_add_lookup_table (>a02_mmc_gpio_table);platform_add_devices (gta02_devices,ARRAY_SIZE (gta02_devices)); pm_power_off = gta02_poweroff;
arch/arm/mach-s3c24xx/mach-h1940.c +8 -0
@@ -462,6 +462,7 @@ static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)static struct s3c24xx_mci_pdata h1940_mmc_cfg__initdata = { .set_power = h1940_set_mmc_power, .ocr_avail =MMC_VDD_32_33 , + .set_power = s3c24xx_mci_def_set_power, };static struct gpiod_lookup_table h1940_mmc_gpio_table = {
@@ -471,6 +472,13 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };
arch/arm/mach-s3c24xx/mach-mini2440.c +8 -1
@@ -236,7 +236,7 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {static struct s3c24xx_mci_pdata mini2440_mmc_cfg__initdata = { .wprotect_invert =1 , - .set_power =NULL , + .set_power = s3c24xx_mci_def_set_power, .ocr_avail =MMC_VDD_32_33 |MMC_VDD_33_34 , };
@@ -247,6 +247,13 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { GPIO_LOOKUP("GPG", 8, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };
arch/arm/mach-s3c24xx/mach-n30.c +9 -0
@@ -339,6 +339,8 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = {static void n30_sdi_set_power (unsigned char power_mode,unsigned short vdd) { +s3c24xx_mci_def_set_power (power_mode, vdd); +switch (power_mode) {case MMC_POWER_ON :case MMC_POWER_UP :
@@ -364,6 +366,13 @@ static struct gpiod_lookup_table n30_mci_gpio_table = {/* Write protect S3C2410_GPG(10) */ GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW), { }, +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), }, };
arch/arm/mach-s3c24xx/mach-qt2410.c +15 -0
@@ -219,6 +219,20 @@ static struct gpiod_lookup_table qt2410_spi_gpiod_table = { }, }; +static struct gpiod_lookup_table qt2410_mmc_gpiod_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +/* Board devices */ static struct platform_device *qt2410_devices[]__initdata = {
@@ -342,6 +356,7 @@ static void __init qt2410_machine_init(void)s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ),S3C_GPIO_PULL_NONE );gpiod_add_lookup_table (&qt2410_spi_gpiod_table); +gpiod_add_lookup_table (&qt2410_mmc_gpiod_table);platform_add_devices (qt2410_devices,ARRAY_SIZE (qt2410_devices));s3c_pm_init (); }
arch/arm/mach-s3c24xx/mach-rx1950.c +9 -0
@@ -545,6 +545,8 @@ static struct platform_device rx1950_backlight = {static void rx1950_set_mmc_power (unsigned char power_mode,unsigned short vdd) { +s3c24xx_mci_def_set_power (power_mode, vdd); +switch (power_mode) {case MMC_POWER_OFF :gpio_direction_output (S3C2410_GPJ (1 ),0 );
@@ -570,6 +572,13 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };
arch/arm/mach-s3c24xx/mach-tct_hammer.c +15 -0
@@ -7,6 +7,7 @@// derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by // Ben Dooks <[email protected]> +#include <linux/gpio/machine.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h>
@@ -103,6 +104,19 @@ static struct s3c2410_uartcfg tct_hammer_uartcfgs[] = { } }; +static struct gpiod_lookup_table tct_hammer_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +};static struct platform_device *tct_hammer_devices[]__initdata = { &s3c_device_adc,
@@ -131,6 +145,7 @@ static void __init tct_hammer_init_time(void)static void __init tct_hammer_init (void ) {s3c_i2c0_set_platdata (NULL ); +gpiod_add_lookup_table (&tct_hammer_mmc_gpio_table);platform_add_devices (tct_hammer_devices,ARRAY_SIZE (tct_hammer_devices)); }
arch/arm/plat-samsung/devs.c +29 -0
@@ -5,6 +5,7 @@// // Base SAMSUNG platform device definitions +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h>
@@ -40,6 +41,8 @@#include <mach/dma.h> #include <mach/irqs.h> #include <mach/map.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <mach/regs-s3c2443-clock.h> #include <plat/cpu.h>
@@ -833,16 +836,42 @@ struct platform_device s3c_device_rtc = {/* SDI */ #ifdef CONFIG_PLAT_S3C24XX +void s3c24xx_mci_def_set_power (unsigned char power_mode,unsigned short vdd) +{ +switch (power_mode) { +case MMC_POWER_ON : +case MMC_POWER_UP : +/* Configure GPE5...GPE10 pins in SD mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (5 ),6 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +break ; + +case MMC_POWER_OFF : +default : +gpio_direction_output (S3C2410_GPE (5 ),0 ); +break ; + } +} +static struct resource s3c_sdi_resource[] = { [0 ] =DEFINE_RES_MEM (S3C24XX_PA_SDI ,S3C24XX_SZ_SDI ), [1 ] =DEFINE_RES_IRQ (IRQ_SDI ), }; +static struct s3c24xx_mci_pdata s3cmci_def_pdata = { +/* This is currently here to avoid a number of if (host->pdata) +* checks. Any zero fields to ensure reasonable defaults are picked. */ + .no_wprotect =1 , + .no_detect =1 , + .set_power = s3c24xx_mci_def_set_power, +}; +struct platform_device s3c_device_sdi = { .name ="s3c2410-sdi" , .id =-1 , .num_resources =ARRAY_SIZE (s3c_sdi_resource), .resource = s3c_sdi_resource, + .dev.platform_data = &s3cmci_def_pdata, };void __init s3c24xx_mci_set_platdata (struct s3c24xx_mci_pdata *pdata)
drivers/mmc/host/s3cmci.c +17 -52
152 lines not on this page · raw message
include/linux/platform_data/mmc-s3cmci.h +2 -0
@@ -35,6 +35,7 @@ struct s3c24xx_mci_pdata {unsigned long ocr_avail;void (*set_power)(unsigned char power_mode,unsigned short vdd); +struct gpio_desc *bus[6 ]; };/**
@@ -44,6 +45,7 @@ struct s3c24xx_mci_pdata {* Copy the platform data supplied by @pdata so that this can be marked * __initdata. */ +extern void s3c24xx_mci_def_set_power (unsigned char power_mode,unsigned short vdd);extern void s3c24xx_mci_set_platdata (struct s3c24xx_mci_pdata *pdata);#endif /* _ARCH_NCI_H */
Signature · 1 line
2.20.0
Re: [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling into board files
Quoted 10 lines · Arnd Bergmann
Rather than call the internal
s3c_gpio_cfgall_range()function through a platform header, move the code into theset_powercallback that is already exported by the board, and add a default implementation.In DT mode, the code already does not set the pin config, so nothing changes there.
Signed-off-by Arnd Bergmann <[email protected]>
This looks good to me!
Kind regards
Uffe
Quoted 567 lines
--- arch/arm/mach-s3c24xx/include/mach/pm-core.h | 1 + arch/arm/mach-s3c24xx/mach-amlm5900.c | 15 +++++ arch/arm/mach-s3c24xx/mach-at2440evb.c | 10 ++- arch/arm/mach-s3c24xx/mach-gta02.c | 15 +++++ arch/arm/mach-s3c24xx/mach-h1940.c | 8 +++ arch/arm/mach-s3c24xx/mach-mini2440.c | 9 ++- arch/arm/mach-s3c24xx/mach-n30.c | 9 +++ arch/arm/mach-s3c24xx/mach-qt2410.c | 15 +++++ arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +++ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 15 +++++ arch/arm/plat-samsung/devs.c | 29 ++++++++ drivers/mmc/host/s3cmci.c | 69 +++++--------------- include/linux/platform_data/mmc-s3cmci.h | 2 + 13 files changed, 152 insertions(+), 54 deletions(-)arch/arm/mach-s3c24xx/include/mach/pm-core.h +1
-0@@ -12,6 +12,7 @@#include "regs-clock.h" #include "regs-irq.h" +#include <mach/irqs.h> static inline void s3c_pm_debug_init_uart (void ) {arch/arm/mach-s3c24xx/mach-amlm5900.c +15
-0@@ -13,6 +13,7 @@#include <linux/list.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/gpio/machine.h> #include <linux/gpio.h> #include <linux/device.h> #include <linux/platform_device.h> @@ -124,6 +125,19 @@ static struct s3c2410_uartcfg amlm5900_uartcfgs[] = { } }; +static struct gpiod_lookup_table amlm5900_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +};static struct platform_device *amlm5900_devices[]__initdata = { #ifdef CONFIG_FB_S3C2410@@ -219,6 +233,7 @@ static void __init amlm5900_init(void)s3c24xx_fb_set_platdata (&amlm5900_fb_info);#endif s3c_i2c0_set_platdata (NULL ); +gpiod_add_lookup_table (&amlm5900_mmc_gpio_table);platform_add_devices (amlm5900_devices,ARRAY_SIZE (amlm5900_devices)); }arch/arm/mach-s3c24xx/mach-at2440evb.c +9
-1@@ -136,7 +136,7 @@ static struct platform_device at2440evb_device_eth = { };static struct s3c24xx_mci_pdata at2440evb_mci_pdata__initdata = { -/* Intentionally left blank */ + .set_power = s3c24xx_mci_def_set_power, };static struct gpiod_lookup_table at2440evb_mci_gpio_table = {@@ -144,10 +144,18 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { .table = {/* Card detect S3C2410_GPG(10) */ GPIO_LOOKUP ("GPG" ,10 ,"cd" ,GPIO_ACTIVE_LOW ), +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, }; +/* 7" LCD panel */ static struct s3c2410fb_display at2440evb_lcd_cfg __initdata = {arch/arm/mach-s3c24xx/mach-gta02.c +15
-0@@ -489,6 +489,20 @@ static struct platform_device gta02_audio = { .id = -1, }; +static struct gpiod_lookup_table gta02_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +static void __init gta02_map_io (void ) {s3c24xx_init_io (gta02_iodesc,ARRAY_SIZE (gta02_iodesc));@@ -545,6 +559,7 @@ static void __init gta02_machine_init(void) S3C_GPIO_PULL_NONE);gpiod_add_lookup_table (>a02_audio_gpio_table); +gpiod_add_lookup_table (>a02_mmc_gpio_table);platform_add_devices (gta02_devices,ARRAY_SIZE (gta02_devices)); pm_power_off = gta02_poweroff;arch/arm/mach-s3c24xx/mach-h1940.c +8
-0@@ -462,6 +462,7 @@ static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)static struct s3c24xx_mci_pdata h1940_mmc_cfg__initdata = { .set_power = h1940_set_mmc_power, .ocr_avail =MMC_VDD_32_33 , + .set_power = s3c24xx_mci_def_set_power, };static struct gpiod_lookup_table h1940_mmc_gpio_table = {@@ -471,6 +472,13 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };arch/arm/mach-s3c24xx/mach-mini2440.c +8
-1@@ -236,7 +236,7 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {static struct s3c24xx_mci_pdata mini2440_mmc_cfg__initdata = { .wprotect_invert =1 , - .set_power =NULL , + .set_power = s3c24xx_mci_def_set_power, .ocr_avail =MMC_VDD_32_33 |MMC_VDD_33_34 , };@@ -247,6 +247,13 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { GPIO_LOOKUP("GPG", 8, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };arch/arm/mach-s3c24xx/mach-n30.c +9
-0@@ -339,6 +339,8 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = {static void n30_sdi_set_power (unsigned char power_mode,unsigned short vdd) { +s3c24xx_mci_def_set_power (power_mode, vdd); +switch (power_mode) {case MMC_POWER_ON :case MMC_POWER_UP :@@ -364,6 +366,13 @@ static struct gpiod_lookup_table n30_mci_gpio_table = {/* Write protect S3C2410_GPG(10) */ GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW), { }, +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), }, };arch/arm/mach-s3c24xx/mach-qt2410.c +15
-0@@ -219,6 +219,20 @@ static struct gpiod_lookup_table qt2410_spi_gpiod_table = { }, }; +static struct gpiod_lookup_table qt2410_mmc_gpiod_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +/* Board devices */ static struct platform_device *qt2410_devices[]__initdata = {@@ -342,6 +356,7 @@ static void __init qt2410_machine_init(void)s3c_gpio_cfgall_range (S3C2410_GPE (0 ),5 ,S3C_GPIO_SFN (2 ),S3C_GPIO_PULL_NONE );gpiod_add_lookup_table (&qt2410_spi_gpiod_table); +gpiod_add_lookup_table (&qt2410_mmc_gpiod_table);platform_add_devices (qt2410_devices,ARRAY_SIZE (qt2410_devices));s3c_pm_init (); }arch/arm/mach-s3c24xx/mach-rx1950.c +9
-0@@ -545,6 +545,8 @@ static struct platform_device rx1950_backlight = {static void rx1950_set_mmc_power (unsigned char power_mode,unsigned short vdd) { +s3c24xx_mci_def_set_power (power_mode, vdd); +switch (power_mode) {case MMC_POWER_OFF :gpio_direction_output (S3C2410_GPJ (1 ),0 );@@ -570,6 +572,13 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),/* Write protect S3C2410_GPH(8) */ GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), +/* bus pins */ + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), { }, }, };arch/arm/mach-s3c24xx/mach-tct_hammer.c +15
-0@@ -7,6 +7,7 @@// derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by // Ben Dooks <[email protected]> +#include <linux/gpio/machine.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h> @@ -103,6 +104,19 @@ static struct s3c2410_uartcfg tct_hammer_uartcfgs[] = { } }; +static struct gpiod_lookup_table tct_hammer_mmc_gpio_table = { + .dev_id ="s3c2410-sdi" , + .table = { +/* bus pins */ +GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,6 ,"bus" ,1 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,7 ,"bus" ,2 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,8 ,"bus" ,3 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,9 ,"bus" ,4 ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP_IDX ("GPIOE" ,10 ,"bus" ,5 ,GPIO_ACTIVE_HIGH ), + { }, + }, +};static struct platform_device *tct_hammer_devices[]__initdata = { &s3c_device_adc,@@ -131,6 +145,7 @@ static void __init tct_hammer_init_time(void)static void __init tct_hammer_init (void ) {s3c_i2c0_set_platdata (NULL ); +gpiod_add_lookup_table (&tct_hammer_mmc_gpio_table);platform_add_devices (tct_hammer_devices,ARRAY_SIZE (tct_hammer_devices)); }arch/arm/plat-samsung/devs.c +29
-0@@ -5,6 +5,7 @@// // Base SAMSUNG platform device definitions +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h> @@ -40,6 +41,8 @@#include <mach/dma.h> #include <mach/irqs.h> #include <mach/map.h> +#include <mach/gpio-samsung.h> +#include <plat/gpio-cfg.h> #include <mach/regs-s3c2443-clock.h> #include <plat/cpu.h> @@ -833,16 +836,42 @@ struct platform_device s3c_device_rtc = {/* SDI */ #ifdef CONFIG_PLAT_S3C24XX +void s3c24xx_mci_def_set_power (unsigned char power_mode,unsigned short vdd) +{ +switch (power_mode) { +case MMC_POWER_ON : +case MMC_POWER_UP : +/* Configure GPE5...GPE10 pins in SD mode */ +s3c_gpio_cfgall_range (S3C2410_GPE (5 ),6 ,S3C_GPIO_SFN (2 ), +S3C_GPIO_PULL_NONE ); +break ; + +case MMC_POWER_OFF : +default : +gpio_direction_output (S3C2410_GPE (5 ),0 ); +break ; + } +} +static struct resource s3c_sdi_resource[] = { [0 ] =DEFINE_RES_MEM (S3C24XX_PA_SDI ,S3C24XX_SZ_SDI ), [1 ] =DEFINE_RES_IRQ (IRQ_SDI ), }; +static struct s3c24xx_mci_pdata s3cmci_def_pdata = { +/* This is currently here to avoid a number of if (host->pdata) +* checks. Any zero fields to ensure reasonable defaults are picked. */ + .no_wprotect =1 , + .no_detect =1 , + .set_power = s3c24xx_mci_def_set_power, +}; +struct platform_device s3c_device_sdi = { .name ="s3c2410-sdi" , .id =-1 , .num_resources =ARRAY_SIZE (s3c_sdi_resource), .resource = s3c_sdi_resource, + .dev.platform_data = &s3cmci_def_pdata, };void __init s3c24xx_mci_set_platdata (struct s3c24xx_mci_pdata *pdata)drivers/mmc/host/s3cmci.c +17
-52@@ -25,9 +25,7 @@#include <linux/of_device.h> #include <linux/mmc/slot-gpio.h> -#include <plat/gpio-cfg.h> #include <mach/dma.h> -#include <mach/gpio-samsung.h> #include <linux/platform_data/mmc-s3cmci.h> @@ -307,7 +305,8 @@ static inline void clear_imask(struct s3cmci_host *host)static void s3cmci_check_sdio_irq (struct s3cmci_host *host) {if (host->sdio_irqen) { -if (gpio_get_value (S3C2410_GPE (8 )) ==0 ) { +if (host->pdata->bus[3 ] && +gpiod_get_value (host->pdata->bus[3 ]) ==0 ) {pr_debug ("%s: signalling irq\n" , __func__);mmc_signal_sdio_irq (host->mmc); }@@ -1213,33 +1212,20 @@ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)switch (ios->power_mode) {case MMC_POWER_ON :case MMC_POWER_UP : -/* Configure GPE5...GPE10 pins in SD mode */ -if (!host->pdev->dev.of_node) -s3c_gpio_cfgall_range (S3C2410_GPE (5 ),6 ,S3C_GPIO_SFN (2 ), -S3C_GPIO_PULL_NONE ); - -if (host->pdata->set_power) - host->pdata->set_power (ios->power_mode, ios->vdd); -if (!host->is2440) mci_con |=S3C2410_SDICON_FIFORESET ; -break ;case MMC_POWER_OFF :default : -if (!host->pdev->dev.of_node) -gpio_direction_output (S3C2410_GPE (5 ),0 ); -if (host->is2440) mci_con |=S3C2440_SDICON_SDRESET ; - -if (host->pdata->set_power) - host->pdata->set_power (ios->power_mode, ios->vdd); -break ; } +if (host->pdata->set_power) + host->pdata->set_power (ios->power_mode, ios->vdd); +s3cmci_set_clk (host, ios);/* Set CLOCK_ENABLE */ @@ -1317,13 +1303,6 @@ static const struct mmc_host_ops s3cmci_ops = { .enable_sdio_irq = s3cmci_enable_sdio_irq, }; -static struct s3c24xx_mci_pdata s3cmci_def_pdata = { -/* This is currently here to avoid a number of if (host->pdata) -* checks. Any zero fields to ensure reasonable defaults are picked. */ - .no_wprotect =1 , - .no_detect =1 , -}; -#ifdef CONFIG_ARM_S3C24XX_CPUFREQ static int s3cmci_cpufreq_transition(struct notifier_block *nb,@@ -1477,24 +1456,21 @@ static int s3cmci_probe_pdata(struct s3cmci_host *host)int i, ret; host->is2440 =platform_get_device_id (pdev)->driver_data; + pdata = pdev->dev.platform_data; +if (!pdata) { +dev_err (&pdev->dev,"need platform data" ); +return -ENXIO ; + } -for (i =S3C2410_GPE (5 ); i <=S3C2410_GPE (10 ); i++) { - ret =gpio_request (i,dev_name (&pdev->dev)); -if (ret) { +for (i =0 ; i <6 ; i++) { + pdata->bus[i] =devm_gpiod_get_index (&pdev->dev,"bus" , i, +GPIOD_OUT_LOW ); +if (IS_ERR (pdata->bus[i])) {dev_err (&pdev->dev,"failed to get gpio %d\n" , i); - -for (i--; i >=S3C2410_GPE (5 ); i--) -gpio_free (i); - -return ret; +return PTR_ERR (pdata->bus[i]); } } -if (!pdev->dev.platform_data) - pdev->dev.platform_data = &s3cmci_def_pdata; - - pdata = pdev->dev.platform_data; -if (pdata->no_wprotect) mmc->caps2 |=MMC_CAP2_NO_WRITE_PROTECT ;@@ -1549,7 +1525,6 @@ static int s3cmci_probe(struct platform_device *pdev)struct s3cmci_host *host;struct mmc_host *mmc;int ret; -int i; mmc =mmc_alloc_host (sizeof (struct s3cmci_host ), &pdev->dev);if (!mmc) {@@ -1593,7 +1568,7 @@ static int s3cmci_probe(struct platform_device *pdev) "failed to get io memory region resource.\n"); ret = -ENOENT ; - goto probe_free_gpio; + goto probe_free_host; } host->mem = request_mem_region(host->mem->start,@@ -1602,7 +1577,7 @@ static int s3cmci_probe(struct platform_device *pdev)if (!host->mem) {dev_err (&pdev->dev,"failed to request io memory region.\n" ); ret = -ENOENT ; - goto probe_free_gpio; + goto probe_free_host; } host->base =ioremap (host->mem->start,resource_size (host->mem));@@ -1726,11 +1701,6 @@ static int s3cmci_probe(struct platform_device *pdev) probe_free_mem_region:release_mem_region (host->mem->start,resource_size (host->mem)); - probe_free_gpio: -if (!pdev->dev.of_node) -for (i =S3C2410_GPE (5 ); i <=S3C2410_GPE (10 ); i++) -gpio_free (i); - probe_free_host:mmc_free_host (mmc);@@ -1756,7 +1726,6 @@ static int s3cmci_remove(struct platform_device *pdev) {struct mmc_host *mmc =platform_get_drvdata (pdev);struct s3cmci_host *host =mmc_priv (mmc); -int i;s3cmci_shutdown (pdev);@@ -1769,10 +1738,6 @@ static int s3cmci_remove(struct platform_device *pdev)free_irq (host->irq, host); -if (!pdev->dev.of_node) -for (i =S3C2410_GPE (5 ); i <=S3C2410_GPE (10 ); i++) -gpio_free (i); -iounmap (host->base);release_mem_region (host->mem->start,resource_size (host->mem));include/linux/platform_data/mmc-s3cmci.h +2
-1@@ -35,6 +35,7 @@ struct s3c24xx_mci_pdata {unsigned long ocr_avail;void (*set_power)(unsigned char power_mode,unsigned short vdd); +struct gpio_desc *bus[6 ]; };/** @@ -44,6 +45,7 @@ struct s3c24xx_mci_pdata {* Copy the platform data supplied by @pdata so that this can be marked * __initdata. */ +extern void s3c24xx_mci_def_set_power (unsigned char power_mode,unsigned short vdd);extern void s3c24xx_mci_set_platdata (struct s3c24xx_mci_pdata *pdata);#endif /* _ARCH_NCI_H */ --2.20.0
Re: [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling into board files
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
Rather than call the internal
s3c_gpio_cfgall_range()function through a platform header, move the code into theset_powercallback that is already exported by the board, and add a default implementation.In DT mode, the code already does not set the pin config, so nothing changes there.
Signed-off-by Arnd Bergmann <[email protected]>
It looks good:
It would feel better if someone was actually testing it on these boards. I see Ben is listed as maintainer so I bet he will pull the board out :)
Yours,
Linus Walleij
PATCH 24/36 ARM: s3c: include mach/irqs.h where needed
In reply to Arnd BergmannPreparing for a later conversion to sparse IRQs, this ensures that the mach/irqs.h header is still visible in files that reference an IRQ number.
--- arch/arm/mach-s3c24xx/bast-ide.c | 1 + arch/arm/mach-s3c24xx/bast-irq.c | 1 + arch/arm/mach-s3c24xx/common.h | 1 + arch/arm/mach-s3c24xx/irq-s3c24xx.c | 1 + arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 ++ arch/arm/mach-s3c24xx/s3c2443.c | 1 + arch/arm/mach-s3c24xx/simtec-usb.c | 1 + 7 files changed, 8 insertions(+)
arch/arm/mach-s3c24xx/bast-ide.c +1 -0
@@ -20,6 +20,7 @@#include <asm/mach/irq.h> #include <mach/map.h> +#include <mach/irqs.h> #include "bast.h"
arch/arm/mach-s3c24xx/bast-irq.c +1 -0
@@ -17,6 +17,7 @@#include <mach/hardware.h> #include <mach/regs-irq.h> +#include <mach/irqs.h> #include "bast.h"
arch/arm/mach-s3c24xx/common.h +1 -0
@@ -10,6 +10,7 @@#define __ARCH_ARM_MACH_S3C24XX_COMMON_H __FILE__#include <linux/reboot.h> +#include <mach/irqs.h> struct s3c2410_uartcfg ;
arch/arm/mach-s3c24xx/irq-s3c24xx.c +1 -0
@@ -25,6 +25,7 @@#include <asm/exception.h> #include <asm/mach/irq.h> +#include <mach/irqs.h> #include <mach/regs-irq.h> #include <mach/regs-gpio.h>
arch/arm/mach-s3c24xx/pm-s3c2412.c +2 -0
@@ -20,6 +20,8 @@#include <asm/irq.h> #include <mach/hardware.h> +#include <mach/irqs.h> +#include <mach/regs-gpio.h> #include <plat/cpu.h>
arch/arm/mach-s3c24xx/s3c2443.c +1 -0
@@ -25,6 +25,7 @@#include <mach/hardware.h> #include <mach/gpio-samsung.h> +#include <mach/irqs.h> #include <asm/irq.h> #include <asm/system_misc.h>
arch/arm/mach-s3c24xx/simtec-usb.c +1 -0
@@ -25,6 +25,7 @@#include <mach/hardware.h> #include <mach/gpio-samsung.h> +#include <mach/irqs.h> #include <asm/irq.h> #include <linux/platform_data/usb-ohci-s3c2410.h>
Signature · 1 line
2.20.0
PATCH 25/36 ARM: s3c: spi: avoid hardcoding fiq number in driver
In reply to Arnd BergmannThe 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.
--- 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(-)
arch/arm/mach-s3c24xx/irq-s3c24xx.c +9 -3
@@ -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);
drivers/spi/spi-s3c24xx.c +2 -16
@@ -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 ;
include/linux/spi/s3c24xx.h +1 -1
@@ -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 */
Signature · 1 line
2.20.0
PATCH 26/36 ARM: s3c: bast: avoid irq_desc array usage
In reply to Arnd BergmannOnce we move to sparse irqs, the irq_desc[] array is no longer accessible, so replace the two uses in bast-irq.c. The first one can use irq_to_desc(), the second one seems completely unneeded as we already have a pointer to the correct descriptor.
--- arch/arm/mach-s3c24xx/bast-irq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-s3c24xx/bast-irq.c +1 -3
@@ -63,7 +63,7 @@ bast_pc104_mask(struct irq_data *data)static void bast_pc104_maskack (struct irq_data *data) { -struct irq_desc *desc = irq_desc +BAST_IRQ_ISA ; +struct irq_desc *desc =irq_to_desc (BAST_IRQ_ISA );bast_pc104_mask (data); desc->irq_data.chip->irq_ack (&desc->irq_data);
@@ -95,8 +95,6 @@ static void bast_irq_pc104_demux(struct irq_desc *desc)if (unlikely (stat ==0 )) {/* ack if we get an irq with nothing (ie, startup) */ - - desc = irq_desc +BAST_IRQ_ISA ; desc->irq_data.chip->irq_ack (&desc->irq_data); }else {/* handle the IRQ */
Signature · 1 line
2.20.0
PATCH 27/36 ARM: s3c: fix mmc gpio lookup tables
In reply to Arnd BergmannThe gpio controller names differ between s3c24xx and s3c64xx, and it seems that these all got the wrong names, using GPx instead of GPIOx.
--- arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +- arch/arm/mach-s3c24xx/mach-h1940.c | 4 ++-- arch/arm/mach-s3c24xx/mach-mini2440.c | 4 ++-- arch/arm/mach-s3c24xx/mach-n30.c | 4 ++-- arch/arm/mach-s3c24xx/mach-rx1950.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-s3c24xx/mach-at2440evb.c +1 -1
@@ -143,7 +143,7 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { .dev_id = "s3c2410-sdi", .table = {/* Card detect S3C2410_GPG(10) */ -GPIO_LOOKUP ("GPG" ,10 ,"cd" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOG" ,10 ,"cd" ,GPIO_ACTIVE_LOW ),/* bus pins */ GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH),
arch/arm/mach-s3c24xx/mach-h1940.c +2 -2
@@ -469,9 +469,9 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = {/* Card detect S3C2410_GPF(5) */ -GPIO_LOOKUP ("GPF" ,5 ,"cd" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOF" ,5 ,"cd" ,GPIO_ACTIVE_LOW ),/* Write protect S3C2410_GPH(8) */ -GPIO_LOOKUP ("GPH" ,8 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOH" ,8 ,"wp" ,GPIO_ACTIVE_LOW ),/* bus pins */ GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH),
arch/arm/mach-s3c24xx/mach-mini2440.c +2 -2
@@ -244,9 +244,9 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = {/* Card detect S3C2410_GPG(8) */ -GPIO_LOOKUP ("GPG" ,8 ,"cd" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOG" ,8 ,"cd" ,GPIO_ACTIVE_LOW ),/* Write protect S3C2410_GPH(8) */ -GPIO_LOOKUP ("GPH" ,8 ,"wp" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("GPIOH" ,8 ,"wp" ,GPIO_ACTIVE_HIGH ),/* bus pins */ GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH),
arch/arm/mach-s3c24xx/mach-n30.c +2 -2
@@ -362,9 +362,9 @@ static struct gpiod_lookup_table n30_mci_gpio_table = { .dev_id = "s3c2410-sdi", .table = {/* Card detect S3C2410_GPF(1) */ -GPIO_LOOKUP ("GPF" ,1 ,"cd" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOF" ,1 ,"cd" ,GPIO_ACTIVE_LOW ),/* Write protect S3C2410_GPG(10) */ -GPIO_LOOKUP ("GPG" ,10 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOG" ,10 ,"wp" ,GPIO_ACTIVE_LOW ), { },/* bus pins */ GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH),
arch/arm/mach-s3c24xx/mach-rx1950.c +2 -2
@@ -569,9 +569,9 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = {/* Card detect S3C2410_GPF(5) */ -GPIO_LOOKUP ("GPF" ,5 ,"cd" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOF" ,5 ,"cd" ,GPIO_ACTIVE_LOW ),/* Write protect S3C2410_GPH(8) */ -GPIO_LOOKUP ("GPH" ,8 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("GPIOH" ,8 ,"wp" ,GPIO_ACTIVE_LOW ),/* bus pins */ GPIO_LOOKUP_IDX ("GPIOE" ,5 ,"bus" ,0 ,GPIO_ACTIVE_HIGH ), GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH),
Signature · 1 line
2.20.0
PATCH 28/36 fbdev: s3c2410fb: remove mach header dependency
In reply to Arnd BergmannThe s3c2410fb driver is too deeply intertwined with the s3c24xx platform code. Change it in a way that avoids the use of platform header files but having all interface data in a platform_data header, and the private register definitions next to the driver itself.
One ugly bit here is that the driver pokes directly into gpio registers, which are owned by another driver. Passing the mapped addresses in platform_data is somewhat suboptimal, but it is a small improvement over the previous version.
---
arch/arm/mach-s3c24xx/include/mach/fb.h | 2 --
arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 ++--
arch/arm/mach-s3c24xx/mach-anubis.c | 1 -
arch/arm/mach-s3c24xx/mach-at2440evb.c | 3 +-
arch/arm/mach-s3c24xx/mach-bast.c | 3 +-
arch/arm/mach-s3c24xx/mach-gta02.c | 2 +-
arch/arm/mach-s3c24xx/mach-h1940.c | 7 ++--
arch/arm/mach-s3c24xx/mach-jive.c | 10 ++++--
arch/arm/mach-s3c24xx/mach-mini2440.c | 9 +++--
arch/arm/mach-s3c24xx/mach-n30.c | 3 +-
arch/arm/mach-s3c24xx/mach-osiris.c | 1 -
arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +++--
arch/arm/mach-s3c24xx/mach-rx3715.c | 7 ++--
arch/arm/mach-s3c24xx/mach-smdk2413.c | 3 +-
arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 -
arch/arm/mach-s3c24xx/mach-smdk2440.c | 8 +++--
arch/arm/mach-s3c24xx/mach-smdk2443.c | 3 +-
arch/arm/mach-s3c24xx/mach-vstms.c | 3 +-
arch/arm/plat-samsung/devs.c | 2 +-
.../video/fbdev/s3c2410fb-regs-lcd.h | 28 ++++------------
drivers/video/fbdev/s3c2410fb.c | 16 +++++----
.../linux/platform_data}/fb-s3c2410.h | 33 ++++++++++++++++++-
23 files changed, 98 insertions(+), 65 deletions(-)
delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h
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%)arch/arm/mach-s3c24xx/include/mach/fb.h deleted +0 -2
@@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <plat/fb-s3c2410.h>
arch/arm/mach-s3c24xx/mach-amlm5900.c +5 -2
@@ -30,9 +30,8 @@#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> -#include <mach/regs-lcd.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h>
@@ -194,13 +193,17 @@ static struct s3c2410fb_mach_info __initdata amlm5900_fb_info = { .gpccon = 0xaaaaaaaa, .gpccon_mask = 0xffffffff, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaaaaaaaa, .gpdcon_mask = 0xffffffff, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000ffff, .gpdup_mask = 0xffffffff, + .gpdup_reg = S3C2410_GPDUP, };#endif
arch/arm/mach-s3c24xx/mach-anubis.c +0 -1
@@ -29,7 +29,6 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h>
arch/arm/mach-s3c24xx/mach-at2440evb.c +1 -2
@@ -25,12 +25,11 @@#include <asm/mach/irq.h> #include <mach/hardware.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h>
arch/arm/mach-s3c24xx/mach-bast.c +1 -2
@@ -40,10 +40,9 @@#include <asm/mach/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> #include <mach/hardware.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-gta02.c +1 -1
@@ -57,8 +57,8 @@#include <linux/platform_data/touchscreen-s3c2410.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> +#include <linux/platform_data/fb-s3c2410.h> -#include <mach/fb.h> #include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/regs-irq.h>
arch/arm/mach-s3c24xx/mach-h1940.c +5 -2
@@ -47,11 +47,10 @@#include <sound/uda1380.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/hardware.h> #include <mach/regs-clock.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h>
@@ -211,12 +210,16 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { .lpcsel = 0x02, .gpccon = 0xaa940659, .gpccon_mask = 0xffffc0f0, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaa84aaa0, .gpdcon_mask = 0xffffffff, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000faff, .gpdup_mask = 0xffffffff, + .gpdup_reg = S3C2410_GPDUP, };static int power_supply_init (struct device *dev)
arch/arm/mach-s3c24xx/mach-jive.c +8 -2
@@ -32,8 +32,7 @@#include <linux/platform_data/i2c-s3c2410.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/gpio-samsung.h> #include <asm/mach-types.h>
@@ -321,6 +320,7 @@ static struct s3c2410fb_mach_info jive_lcd_config = {* data. */ .gpcup = (0xf << 1) | (0x3f << 10), + .gpcup_reg = S3C2410_GPCUP, .gpccon = (S3C2410_GPC1_VCLK | S3C2410_GPC2_VLINE | S3C2410_GPC3_VFRAME | S3C2410_GPC4_VM |
@@ -334,8 +334,12 @@ static struct s3c2410fb_mach_info jive_lcd_config = {S3C2410_GPCCON_MASK (12 ) |S3C2410_GPCCON_MASK (13 ) | S3C2410_GPCCON_MASK(14) | S3C2410_GPCCON_MASK(15)), + .gpccon_reg = S3C2410_GPCCON, + .gpdup = (0x3f << 2) | (0x3f << 10), + .gpdup_reg = S3C2410_GPDUP, + .gpdcon = (S3C2410_GPD2_VD10 | S3C2410_GPD3_VD11 | S3C2410_GPD4_VD12 | S3C2410_GPD5_VD13 | S3C2410_GPD6_VD14 | S3C2410_GPD7_VD15 |
@@ -349,6 +353,8 @@ static struct s3c2410fb_mach_info jive_lcd_config = {S3C2410_GPDCON_MASK (10 ) |S3C2410_GPDCON_MASK (11 )|S3C2410_GPDCON_MASK (12 ) |S3C2410_GPDCON_MASK (13 )| S3C2410_GPDCON_MASK(14) | S3C2410_GPDCON_MASK(15)), + + .gpdcon_reg = S3C2410_GPDCON, };/* ILI9320 support. */
arch/arm/mach-s3c24xx/mach-mini2440.c +7 -2
@@ -30,13 +30,12 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/hardware.h> -#include <mach/fb.h> #include <asm/mach-types.h> #include <mach/regs-gpio.h> #include <linux/platform_data/leds-s3c24xx.h> -#include <mach/regs-lcd.h> #include <mach/irqs.h> #include <mach/gpio-samsung.h> #include <linux/platform_data/mtd-nand-s3c2410.h>
@@ -215,6 +214,9 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {S3C2410_GPCCON_MASK (12 ) |S3C2410_GPCCON_MASK (13 ) | S3C2410_GPCCON_MASK(14) | S3C2410_GPCCON_MASK(15)), + .gpccon_reg = S3C2410_GPCCON, + .gpcup_reg = S3C2410_GPCUP, + .gpdup = (0x3f << 2) | (0x3f << 10), .gpdcon = (S3C2410_GPD2_VD10 | S3C2410_GPD3_VD11 |
@@ -230,6 +232,9 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = {S3C2410_GPDCON_MASK (10 ) |S3C2410_GPDCON_MASK (11 )|S3C2410_GPDCON_MASK (12 ) |S3C2410_GPDCON_MASK (13 )| S3C2410_GPDCON_MASK(14) | S3C2410_GPDCON_MASK(15)), + + .gpdcon_reg = S3C2410_GPDCON, + .gpdup_reg = S3C2410_GPDUP, };/* MMC/SD */
arch/arm/mach-s3c24xx/mach-n30.c +1 -2
@@ -31,10 +31,9 @@#include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/leds-s3c24xx.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-osiris.c +0 -1
@@ -44,7 +44,6 @@#include <mach/hardware.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include "common.h"
arch/arm/mach-s3c24xx/mach-qt2410.c +1 -2
@@ -33,8 +33,7 @@#include <asm/mach-types.h> #include <linux/platform_data/leds-s3c24xx.h> -#include <mach/regs-lcd.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/i2c-s3c2410.h>
arch/arm/mach-s3c24xx/mach-rx1950.c +5 -3
@@ -42,12 +42,11 @@#include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> +#include <linux/platform_data/fb-s3c2410.h> #include <sound/uda1380.h> -#include <mach/fb.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h>
@@ -361,14 +360,17 @@ static struct s3c2410fb_mach_info rx1950_lcd_cfg = { .lpcsel = 0x02, .gpccon = 0xaa9556a9, .gpccon_mask = 0xffc003fc, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaa90aaa1, .gpdcon_mask = 0xffc0fff0, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000fcfd, .gpdup_mask = 0xffffffff, - + .gpdup_reg = S3C2410_GPDUP, };static struct pwm_lookup rx1950_pwm_lookup[] = {
arch/arm/mach-s3c24xx/mach-rx3715.c +5 -2
@@ -30,14 +30,13 @@#include <asm/mach/map.h> #include <linux/platform_data/mtd-nand-s3c2410.h> +#include <linux/platform_data/fb-s3c2410.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> #include <mach/hardware.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/gpio-cfg.h>
@@ -126,13 +125,17 @@ static struct s3c2410fb_mach_info rx3715_fb_info __initdata = { .gpccon = 0xaa955699, .gpccon_mask = 0xffc003cc, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaa95aaa1, .gpdcon_mask = 0xffc0fff0, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000faff, .gpdup_mask = 0xffffffff, + .gpdup_reg = S3C2410_GPDUP, };static struct mtd_partition __initdata rx3715_nand_part[] = {
arch/arm/mach-s3c24xx/mach-smdk2413.c +1 -2
@@ -31,12 +31,11 @@//#include <asm/debug-ll.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/gpio-samsung.h> -#include <mach/fb.h> #include <plat/gpio-cfg.h> #include <plat/devs.h>
arch/arm/mach-s3c24xx/mach-smdk2416.c +0 -1
@@ -30,7 +30,6 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/regs-s3c2443-clock.h> #include <mach/gpio-samsung.h>
arch/arm/mach-s3c24xx/mach-smdk2440.c +6 -2
@@ -28,11 +28,10 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/gpio-cfg.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/devs.h>
@@ -139,6 +138,11 @@ static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { .gpdcon_mask = 0xffffffff, .gpdup = 0x0000faff, .gpdup_mask = 0xffffffff, + + .gpccon_reg = S3C2410_GPCCON, + .gpcup_reg = S3C2410_GPCUP, + .gpdcon_reg = S3C2410_GPDCON, + .gpdup_reg = S3C2410_GPDUP, #endif .lpcsel = ((0xCE6) & ~7) | 1<<4,
arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -2
@@ -27,9 +27,8 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/devs.h>
arch/arm/mach-s3c24xx/mach-vstms.c +1 -2
@@ -30,11 +30,10 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/gpio-cfg.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/mtd-nand-s3c2410.h>
arch/arm/plat-samsung/devs.c +1 -1
@@ -50,7 +50,7 @@#include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> #include <plat/fb.h> -#include <plat/fb-s3c2410.h> +#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/hwmon-s3c.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/keypad.h>
drivers/video/fbdev/s3c2410fb-regs-lcd.h renamed from arch/arm/mach-s3c24xx/include/mach/regs-lcd.h +7 -21
@@ -7,6 +7,13 @@#ifndef ___ASM_ARCH_REGS_LCD_H#define ___ASM_ARCH_REGS_LCD_H +/* +* a couple of values are used as platform data in +* include/linux/platform_data/fb-s3c2410.h and not +* duplicated here. +*/ +#include <linux/platform_data/fb-s3c2410.h> +#define S3C2410_LCDREG (x) (x)/* LCD control registers */
@@ -29,13 +36,6 @@#define S3C2410_LCDCON1_STN8BPP (3<<1)#define S3C2410_LCDCON1_STN12BPP (4<<1) -#define S3C2410_LCDCON1_TFT1BPP (8<<1) -#define S3C2410_LCDCON1_TFT2BPP (9<<1) -#define S3C2410_LCDCON1_TFT4BPP (10<<1) -#define S3C2410_LCDCON1_TFT8BPP (11<<1) -#define S3C2410_LCDCON1_TFT16BPP (12<<1) -#define S3C2410_LCDCON1_TFT24BPP (13<<1) -#define S3C2410_LCDCON1_ENVID (1)#define S3C2410_LCDCON1_MODEMASK 0x1E
@@ -66,20 +66,6 @@#define S3C2410_LCDCON4_GET_HSPW (x) ( ((x) >> 0) & 0xFF) -#define S3C2410_LCDCON5_BPP24BL (1<<12) -#define S3C2410_LCDCON5_FRM565 (1<<11) -#define S3C2410_LCDCON5_INVVCLK (1<<10) -#define S3C2410_LCDCON5_INVVLINE (1<<9) -#define S3C2410_LCDCON5_INVVFRAME (1<<8) -#define S3C2410_LCDCON5_INVVD (1<<7) -#define S3C2410_LCDCON5_INVVDEN (1<<6) -#define S3C2410_LCDCON5_INVPWREN (1<<5) -#define S3C2410_LCDCON5_INVLEND (1<<4) -#define S3C2410_LCDCON5_PWREN (1<<3) -#define S3C2410_LCDCON5_ENLEND (1<<2) -#define S3C2410_LCDCON5_BSWP (1<<1) -#define S3C2410_LCDCON5_HWSWP (1<<0) -/* framebuffer start addressed */ #define S3C2410_LCDSADDR1 S3C2410_LCDREG(0x14)#define S3C2410_LCDSADDR2 S3C2410_LCDREG(0x18)
drivers/video/fbdev/s3c2410fb.c +9 -7
@@ -29,19 +29,18 @@#include <linux/clk.h> #include <linux/cpufreq.h> #include <linux/io.h> +#include <linux/platform_data/fb-s3c2410.h> #include <asm/div64.h> #include <asm/mach/map.h> -#include <mach/regs-lcd.h> -#include <mach/regs-gpio.h> -#include <mach/fb.h> #ifdef CONFIG_PM #include <linux/pm.h> #endif #include "s3c2410fb.h" +#include "s3c2410fb-regs-lcd.h" /* Debugging stuff */ #ifdef CONFIG_FB_S3C2410_DEBUG
@@ -676,6 +675,9 @@ static inline void modify_gpio(void __iomem *reg, {unsigned long tmp; +if (!reg) +return ; + tmp =readl (reg) & ~mask;writel (tmp | set, reg); }
@@ -706,10 +708,10 @@ static int s3c2410fb_init_registers(struct fb_info *info)/* modify the gpio(s) with interrupts set (bjd) */ -modify_gpio (S3C2410_GPCUP , mach_info->gpcup, mach_info->gpcup_mask); -modify_gpio (S3C2410_GPCCON , mach_info->gpccon, mach_info->gpccon_mask); -modify_gpio (S3C2410_GPDUP , mach_info->gpdup, mach_info->gpdup_mask); -modify_gpio (S3C2410_GPDCON , mach_info->gpdcon, mach_info->gpdcon_mask); +modify_gpio (mach_info->gpcup_reg, mach_info->gpcup, mach_info->gpcup_mask); +modify_gpio (mach_info->gpccon_reg, mach_info->gpccon, mach_info->gpccon_mask); +modify_gpio (mach_info->gpdup_reg, mach_info->gpdup, mach_info->gpdup_mask); +modify_gpio (mach_info->gpdcon_reg, mach_info->gpdcon, mach_info->gpdcon_mask);local_irq_restore (flags);
include/linux/platform_data/fb-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/fb-s3c2410.h +32 -1
@@ -8,6 +8,8 @@ #ifndef __ASM_PLAT_FB_S3C2410_H #define __ASM_PLAT_FB_S3C2410_H __FILE__ +#include <linux/compiler_types.h> + struct s3c2410fb_hw { unsigned long lcdcon1; unsigned long lcdcon2;
@@ -20,6 +22,17 @@ struct s3c2410fb_hw {struct s3c2410fb_display {/* LCD type */ unsigned type; +#define S3C2410_LCDCON1_DSCAN4 (0<<5) +#define S3C2410_LCDCON1_STN4 (1<<5) +#define S3C2410_LCDCON1_STN8 (2<<5) +#define S3C2410_LCDCON1_TFT (3<<5) + +#define S3C2410_LCDCON1_TFT1BPP (8<<1) +#define S3C2410_LCDCON1_TFT2BPP (9<<1) +#define S3C2410_LCDCON1_TFT4BPP (10<<1) +#define S3C2410_LCDCON1_TFT8BPP (11<<1) +#define S3C2410_LCDCON1_TFT16BPP (12<<1) +#define S3C2410_LCDCON1_TFT24BPP (13<<1)/* Screen size */ unsigned short width;
@@ -40,6 +53,19 @@ struct s3c2410fb_display {/* lcd configuration registers */ unsigned long lcdcon5; +#define S3C2410_LCDCON5_BPP24BL (1<<12) +#define S3C2410_LCDCON5_FRM565 (1<<11) +#define S3C2410_LCDCON5_INVVCLK (1<<10) +#define S3C2410_LCDCON5_INVVLINE (1<<9) +#define S3C2410_LCDCON5_INVVFRAME (1<<8) +#define S3C2410_LCDCON5_INVVD (1<<7) +#define S3C2410_LCDCON5_INVVDEN (1<<6) +#define S3C2410_LCDCON5_INVPWREN (1<<5) +#define S3C2410_LCDCON5_INVLEND (1<<4) +#define S3C2410_LCDCON5_PWREN (1<<3) +#define S3C2410_LCDCON5_ENLEND (1<<2) +#define S3C2410_LCDCON5_BSWP (1<<1) +#define S3C2410_LCDCON5_HWSWP (1<<0) };struct s3c2410fb_mach_info {
@@ -59,10 +85,15 @@ struct s3c2410fb_mach_info {unsigned long gpdcon;unsigned long gpdcon_mask; +void __iomem * gpccon_reg; +void __iomem * gpcup_reg; +void __iomem * gpdcon_reg; +void __iomem * gpdup_reg; +/* lpc3600 control register */ unsigned long lpcsel; }; -extern void __init s3c24xx_fb_set_platdata (struct s3c2410fb_mach_info *); +extern void s3c24xx_fb_set_platdata (struct s3c2410fb_mach_info *);#endif /* __ASM_PLAT_FB_S3C2410_H */
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency
Quoted 191 lines · Arnd Bergmann
The s3c2410fb driver is too deeply intertwined with the s3c24xx platform code. Change it in a way that avoids the use of platform header files but having all interface data in a
platform_dataheader, and the private register definitions next to the driver itself.One ugly bit here is that the driver pokes directly into gpio registers, which are owned by another driver. Passing the mapped addresses in
platform_datais somewhat suboptimal, but it is a small improvement over the previous version.Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/include/mach/fb.h | 2 -- arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 ++-- arch/arm/mach-s3c24xx/mach-anubis.c | 1 - arch/arm/mach-s3c24xx/mach-at2440evb.c | 3 +- arch/arm/mach-s3c24xx/mach-bast.c | 3 +- arch/arm/mach-s3c24xx/mach-gta02.c | 2 +- arch/arm/mach-s3c24xx/mach-h1940.c | 7 ++-- arch/arm/mach-s3c24xx/mach-jive.c | 10 ++++-- arch/arm/mach-s3c24xx/mach-mini2440.c | 9 +++-- arch/arm/mach-s3c24xx/mach-n30.c | 3 +- arch/arm/mach-s3c24xx/mach-osiris.c | 1 - arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +- arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +++-- arch/arm/mach-s3c24xx/mach-rx3715.c | 7 ++-- arch/arm/mach-s3c24xx/mach-smdk2413.c | 3 +- arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 - arch/arm/mach-s3c24xx/mach-smdk2440.c | 8 +++-- arch/arm/mach-s3c24xx/mach-smdk2443.c | 3 +- arch/arm/mach-s3c24xx/mach-vstms.c | 3 +- arch/arm/plat-samsung/devs.c | 2 +- .../video/fbdev/s3c2410fb-regs-lcd.h | 28 ++++------------ drivers/video/fbdev/s3c2410fb.c | 16 +++++---- .../linux/platform_data}/fb-s3c2410.h | 33 ++++++++++++++++++- 23 files changed, 98 insertions(+), 65 deletions(-) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h 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%)arch/arm/mach-s3c24xx/include/mach/fb.h deleted +0
-2@@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <plat/fb-s3c2410.h> arch/arm/mach-s3c24xx/mach-amlm5900.c +5
-2@@ -30,9 +30,8 @@#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> -#include <mach/regs-lcd.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> @@ -194,13 +193,17 @@ static struct s3c2410fb_mach_info __initdata amlm5900_fb_info = { .gpccon = 0xaaaaaaaa, .gpccon_mask = 0xffffffff, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaaaaaaaa, .gpdcon_mask = 0xffffffff, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000ffff, .gpdup_mask = 0xffffffff, + .gpdup_reg = S3C2410_GPDUP, };#endif arch/arm/mach-s3c24xx/mach-anubis.c +0
-1@@ -29,7 +29,6 @@#include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> arch/arm/mach-s3c24xx/mach-at2440evb.c +1
-2@@ -25,12 +25,11 @@#include <asm/mach/irq.h> #include <mach/hardware.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> arch/arm/mach-s3c24xx/mach-bast.c +1
-2@@ -40,10 +40,9 @@#include <asm/mach/irq.h> #include <asm/mach-types.h> -#include <mach/fb.h> #include <mach/hardware.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h> arch/arm/mach-s3c24xx/mach-gta02.c +1
-1@@ -57,8 +57,8 @@#include <linux/platform_data/touchscreen-s3c2410.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> +#include <linux/platform_data/fb-s3c2410.h> -#include <mach/fb.h> #include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/regs-irq.h> arch/arm/mach-s3c24xx/mach-h1940.c +5
-2@@ -47,11 +47,10 @@#include <sound/uda1380.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/hardware.h> #include <mach/regs-clock.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h> @@ -211,12 +210,16 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { .lpcsel = 0x02, .gpccon = 0xaa940659, .gpccon_mask = 0xffffc0f0, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaa84aaa0, .gpdcon_mask = 0xffffffff, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000faff, .gpdup_mask = 0xffffffff, + .gpdup_reg = S3C2410_GPDUP, };static int power_supply_init (struct device *dev)arch/arm/mach-s3c24xx/mach-jive.c +1
-2@@ -32,8 +32,7 @@#include <linux/platform_data/i2c-s3c2410.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> -#include <mach/fb.h> +#include <linux/platform_data/fb-s3c2410.h> #include <mach/gpio-samsung.h> #include <asm/mach-types.h>
arch/arm/mach-s3c24xx/mach-jive.c static struct s3c2410fb_mach_info jive_lcd_config = { · line 323
Quoted 4 lines
arch/arm/mach-s3c24xx/mach-jive.c +1
-0@@ -321,6 +320,7 @@ static struct s3c2410fb_mach_info jive_lcd_config = {* data. */ .gpcup = (0xf << 1) | (0x3f << 10), + .gpcup_reg = S3C2410_GPCUP,
Nits: indentation before/after '=' looks wrong. Tab should be before '=', one space after.
Best regards,
Krzysztof
Re: [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency
Quoted 10 lines · Krzysztof Kozlowski
arch/arm/mach-s3c24xx/mach-jive.c static struct s3c2410fb_mach_info jive_lcd_config = { · line 323
Quoted 5 lines · Arnd Bergmann
arch/arm/mach-s3c24xx/mach-jive.c +1
-0@@ -321,6 +320,7 @@ static struct s3c2410fb_mach_info jive_lcd_config = {* data. */ .gpcup = (0xf << 1) | (0x3f << 10), + .gpcup_reg = S3C2410_GPCUP,Nits: indentation before/after '=' looks wrong. Tab should be before '=', one space after.
Ok, fixed now for the four boards that had inconsistent indentation -- jive, mini2440, smdk2440, and rx1950. Unfortunately each board seemed to have its own way of doing this.
Arnd
PATCH 29/36 ARM: s3c: cpufreq: split out registers
In reply to Arnd BergmannEach of the cpufreq drivers uses a fixed set of register bits, copy those definitions into the drivers to avoid including mach/regs-clock.h.
--- drivers/cpufreq/s3c2410-cpufreq.c | 11 +++++++++-- drivers/cpufreq/s3c2412-cpufreq.c | 20 +++++++++++++++++++- drivers/cpufreq/s3c2440-cpufreq.c | 24 ++++++++++++++++++++++-- drivers/cpufreq/s3c24xx-cpufreq.c | 4 +++- 4 files changed, 53 insertions(+), 6 deletions(-)
drivers/cpufreq/s3c2410-cpufreq.c +9 -2
@@ -20,11 +20,18 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/regs-clock.h> -#include <plat/cpu.h> #include <plat/cpu-freq-core.h> +#include <mach/map.h> + +#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) + +#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) + +#define S3C2410_CLKDIVN_PDIVN (1<<0) +#define S3C2410_CLKDIVN_HDIVN (1<<1) +/* Note, 2410A has an extra mode for 1:4:4 ratio, bit 2 of CLKDIV */ static void s3c2410_cpufreq_setdivs (struct s3c_cpufreq_config *cfg)
drivers/cpufreq/s3c2412-cpufreq.c +19 -1
@@ -23,12 +23,30 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/regs-clock.h> #include <mach/s3c2412.h> #include <plat/cpu.h> #include <plat/cpu-freq-core.h> +#include <mach/map.h> + +#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) + +#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) + +#define S3C2412_CLKDIVN_PDIVN (1<<2) +#define S3C2412_CLKDIVN_HDIVN_MASK (3<<0) +#define S3C2412_CLKDIVN_ARMDIVN (1<<3) +#define S3C2412_CLKDIVN_DVSEN (1<<4) +#define S3C2412_CLKDIVN_HALFHCLK (1<<5) +#define S3C2412_CLKDIVN_USB48DIV (1<<6) +#define S3C2412_CLKDIVN_UARTDIV_MASK (15<<8) +#define S3C2412_CLKDIVN_UARTDIV_SHIFT (8) +#define S3C2412_CLKDIVN_I2SDIV_MASK (15<<12) +#define S3C2412_CLKDIVN_I2SDIV_SHIFT (12) +#define S3C2412_CLKDIVN_CAMDIV_MASK (15<<16) +#define S3C2412_CLKDIVN_CAMDIV_SHIFT (16) +/* our clock resources. */ static struct clk *xtal;static struct clk *fclk;
drivers/cpufreq/s3c2440-cpufreq.c +22 -2
@@ -24,11 +24,31 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/regs-clock.h> -#include <plat/cpu.h> #include <plat/cpu-freq-core.h> +#include <mach/map.h> + +#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) +#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) +#define S3C2440_CAMDIVN S3C2410_CLKREG(0x18) + +#define S3C2440_CLKDIVN_PDIVN (1<<0) +#define S3C2440_CLKDIVN_HDIVN_MASK (3<<1) +#define S3C2440_CLKDIVN_HDIVN_1 (0<<1) +#define S3C2440_CLKDIVN_HDIVN_2 (1<<1) +#define S3C2440_CLKDIVN_HDIVN_4_8 (2<<1) +#define S3C2440_CLKDIVN_HDIVN_3_6 (3<<1) +#define S3C2440_CLKDIVN_UCLK (1<<3) + +#define S3C2440_CAMDIVN_CAMCLK_MASK (0xf<<0) +#define S3C2440_CAMDIVN_CAMCLK_SEL (1<<4) +#define S3C2440_CAMDIVN_HCLK3_HALF (1<<8) +#define S3C2440_CAMDIVN_HCLK4_HALF (1<<9) +#define S3C2440_CAMDIVN_DVSEN (1<<12) + +#define S3C2442_CAMDIVN_CAMCLK_DIV3 (1<<5) +static struct clk *xtal;static struct clk *fclk;static struct clk *hclk;
drivers/cpufreq/s3c24xx-cpufreq.c +3 -1
@@ -28,9 +28,11 @@#include <plat/cpu.h> #include <plat/cpu-freq-core.h> -#include <mach/regs-clock.h> +#include <mach/map.h> /* note, cpufreq support deals in kHz, no Hz */ +#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) +#define S3C2410_MPLLCON S3C2410_CLKREG(0x04)static struct cpufreq_driver s3c24xx_driver;static struct s3c_cpufreq_config cpu_cur;
Signature · 1 line
2.20.0
PATCH 30/36 ARM: s3c: remove cpufreq header dependencies
In reply to Arnd BergmannThe cpufreq drivers are split between the machine directory and the drivers/cpufreq directory. In order to share header files after we convert s3c to multiplatform, those headers have to live in a different global location.
Move them to linux/soc/samsung/ in lack of a better place.
--- arch/arm/mach-s3c24xx/common.c | 1 - arch/arm/mach-s3c24xx/cpufreq-utils.c | 2 +- arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/mach-s3c24xx/mach-bast.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- arch/arm/mach-s3c24xx/pll-s3c2410.c | 4 ++-- arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 4 ++-- arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 4 ++-- arch/arm/mach-s3c24xx/s3c2410.c | 1 - arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/mach-s3c24xx/s3c244x.c | 2 -- arch/arm/mach-s3c64xx/s3c6400.c | 1 - arch/arm/mach-s3c64xx/s3c6410.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 9 --------- drivers/cpufreq/s3c2410-cpufreq.c | 5 ++--- drivers/cpufreq/s3c2412-cpufreq.c | 5 ++--- drivers/cpufreq/s3c2440-cpufreq.c | 5 ++--- drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +- drivers/cpufreq/s3c24xx-cpufreq.c | 5 ++--- .../linux/soc/samsung/s3c-cpu-freq.h | 0 .../linux/soc/samsung/s3c-cpufreq-core.h | 2 +- include/linux/soc/samsung/s3c-pm.h | 10 ++++++++++ 24 files changed, 33 insertions(+), 42 deletions(-) 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 (99%)
arch/arm/mach-s3c24xx/common.c +0 -1
@@ -35,7 +35,6 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/cpu-freq.h> #include <plat/pwm-core.h> #include "common.h"
arch/arm/mach-s3c24xx/cpufreq-utils.c +1 -1
@@ -15,7 +15,7 @@#include <mach/map.h> #include <mach/regs-clock.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include "regs-mem.h"
arch/arm/mach-s3c24xx/iotiming-s3c2410.c +1 -1
@@ -17,7 +17,7 @@#include <mach/map.h> #include <mach/regs-clock.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include "regs-mem.h"
arch/arm/mach-s3c24xx/iotiming-s3c2412.c +1 -1
@@ -24,7 +24,7 @@#include <asm/mach/map.h> #include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include <mach/s3c2412.h>
arch/arm/mach-s3c24xx/mach-bast.c +1 -1
@@ -46,7 +46,7 @@#include <mach/gpio-samsung.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> #include <plat/samsung-time.h>
arch/arm/mach-s3c24xx/mach-osiris-dvs.c +1 -1
@@ -14,7 +14,7 @@#include <linux/mfd/tps65010.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <mach/gpio-samsung.h> #define OSIRIS_GPIO_DVS S3C2410_GPB(5)
arch/arm/mach-s3c24xx/mach-osiris.c +1 -1
@@ -37,7 +37,7 @@#include <linux/mtd/partitions.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> #include <plat/samsung-time.h>
arch/arm/mach-s3c24xx/pll-s3c2410.c +2 -2
@@ -15,8 +15,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table pll_vals_12MHz[] = {
arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c +2 -2
@@ -13,8 +13,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table s3c2440_plls_12[] = {
arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +2 -2
@@ -13,8 +13,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table s3c2440_plls_169344[] = {
arch/arm/mach-s3c24xx/s3c2410.c +0 -1
@@ -30,7 +30,6 @@#include <asm/irq.h> #include <asm/system_misc.h> -#include <plat/cpu-freq.h> #include <mach/regs-clock.h>
arch/arm/mach-s3c24xx/s3c2412.c +0 -1
@@ -34,7 +34,6 @@#include <mach/regs-gpio.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> #include <plat/devs.h> #include <plat/pm.h>
arch/arm/mach-s3c24xx/s3c244x.c +0 -2
@@ -28,8 +28,6 @@#include <mach/hardware.h> #include <asm/irq.h> -#include <plat/cpu-freq.h> -#include <mach/regs-clock.h> #include <mach/regs-gpio.h>
arch/arm/mach-s3c64xx/s3c6400.c +0 -1
@@ -28,7 +28,6 @@#include <asm/irq.h> -#include <plat/cpu-freq.h> #include <mach/regs-clock.h> #include <plat/cpu.h>
arch/arm/mach-s3c64xx/s3c6410.c +1 -1
@@ -29,7 +29,7 @@#include <asm/irq.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-pm.h> #include <mach/regs-clock.h> #include <plat/cpu.h>
arch/arm/plat-samsung/include/plat/cpu.h +0 -9
@@ -124,15 +124,6 @@ extern struct syscore_ops s3c2412_pm_syscore_ops;extern struct syscore_ops s3c2416_pm_syscore_ops;extern struct syscore_ops s3c244x_pm_syscore_ops; -/* system device subsystems */ - -extern struct bus_type s3c2410_subsys; -extern struct bus_type s3c2410a_subsys; -extern struct bus_type s3c2412_subsys; -extern struct bus_type s3c2416_subsys; -extern struct bus_type s3c2440_subsys; -extern struct bus_type s3c2442_subsys; -extern struct bus_type s3c2443_subsys;extern struct bus_type s3c6410_subsys;#endif
drivers/cpufreq/s3c2410-cpufreq.c +2 -3
@@ -16,13 +16,12 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)
drivers/cpufreq/s3c2412-cpufreq.c +2 -3
@@ -19,15 +19,14 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <mach/s3c2412.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)
drivers/cpufreq/s3c2440-cpufreq.c +2 -3
@@ -20,13 +20,12 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c +1 -1
@@ -18,7 +18,7 @@#include <linux/seq_file.h> #include <linux/err.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> static struct dentry *dbgfs_root;static struct dentry *dbgfs_file_io;
drivers/cpufreq/s3c24xx-cpufreq.c +2 -3
@@ -21,13 +21,12 @@#include <linux/device.h> #include <linux/sysfs.h> #include <linux/slab.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> /* note, cpufreq support deals in kHz, no Hz */
include/linux/soc/samsung/s3c-cpu-freq.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq.h +0 -0
include/linux/soc/samsung/s3c-cpufreq-core.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq-core.h +1 -1
@@ -7,7 +7,7 @@* S3C CPU frequency scaling support - core support */ -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> struct seq_file ;
include/linux/soc/samsung/s3c-pm.h +10 -0
@@ -81,4 +81,14 @@ extern void s3c_pm_check_store(void);#define s3c_pm_check_store () do { } while (0)#endif +/* system device subsystems */ + +extern struct bus_type s3c2410_subsys; +extern struct bus_type s3c2410a_subsys; +extern struct bus_type s3c2412_subsys; +extern struct bus_type s3c2416_subsys; +extern struct bus_type s3c2440_subsys; +extern struct bus_type s3c2442_subsys; +extern struct bus_type s3c2443_subsys; +#endif
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 30/36] ARM: s3c: remove cpufreq header dependencies
include/linux/soc/samsung/s3c-cpufreq-core.h
Quoted 358 lines · Arnd Bergmann
The cpufreq drivers are split between the machine directory and the
drivers/cpufreqdirectory. In order to share header files after we convert s3c to multiplatform, those headers have to live in a different global location.Move them to linux/soc/samsung/ in lack of a better place.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/common.c | 1 - arch/arm/mach-s3c24xx/cpufreq-utils.c | 2 +- arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/mach-s3c24xx/mach-bast.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- arch/arm/mach-s3c24xx/pll-s3c2410.c | 4 ++-- arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 4 ++-- arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 4 ++-- arch/arm/mach-s3c24xx/s3c2410.c | 1 - arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/mach-s3c24xx/s3c244x.c | 2 -- arch/arm/mach-s3c64xx/s3c6400.c | 1 - arch/arm/mach-s3c64xx/s3c6410.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 9 --------- drivers/cpufreq/s3c2410-cpufreq.c | 5 ++--- drivers/cpufreq/s3c2412-cpufreq.c | 5 ++--- drivers/cpufreq/s3c2440-cpufreq.c | 5 ++--- drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +- drivers/cpufreq/s3c24xx-cpufreq.c | 5 ++--- .../linux/soc/samsung/s3c-cpu-freq.h | 0 .../linux/soc/samsung/s3c-cpufreq-core.h | 2 +- include/linux/soc/samsung/s3c-pm.h | 10 ++++++++++ 24 files changed, 33 insertions(+), 42 deletions(-) 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 (99%)arch/arm/mach-s3c24xx/common.c +0
-1@@ -35,7 +35,6 @@#include <plat/cpu.h> #include <plat/devs.h> -#include <plat/cpu-freq.h> #include <plat/pwm-core.h> #include "common.h" arch/arm/mach-s3c24xx/cpufreq-utils.c +1
-1@@ -15,7 +15,7 @@#include <mach/map.h> #include <mach/regs-clock.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include "regs-mem.h" arch/arm/mach-s3c24xx/iotiming-s3c2410.c +1
-1@@ -17,7 +17,7 @@#include <mach/map.h> #include <mach/regs-clock.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include "regs-mem.h" arch/arm/mach-s3c24xx/iotiming-s3c2412.c +1
-1@@ -24,7 +24,7 @@#include <asm/mach/map.h> #include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> #include <mach/s3c2412.h> arch/arm/mach-s3c24xx/mach-bast.c +1
-1@@ -46,7 +46,7 @@#include <mach/gpio-samsung.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> #include <plat/samsung-time.h> arch/arm/mach-s3c24xx/mach-osiris-dvs.c +1
-1@@ -14,7 +14,7 @@#include <linux/mfd/tps65010.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <mach/gpio-samsung.h> #define OSIRIS_GPIO_DVS S3C2410_GPB(5)arch/arm/mach-s3c24xx/mach-osiris.c +1
-1@@ -37,7 +37,7 @@#include <linux/mtd/partitions.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-cpu-freq.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> #include <plat/samsung-time.h> arch/arm/mach-s3c24xx/pll-s3c2410.c +2
-2@@ -15,8 +15,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table pll_vals_12MHz[] = {arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c +2
-2@@ -13,8 +13,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table s3c2440_plls_12[] = {arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +2
-2@@ -13,8 +13,8 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> /* This array should be sorted in ascending order of the frequencies */ static struct cpufreq_frequency_table s3c2440_plls_169344[] = {arch/arm/mach-s3c24xx/s3c2410.c +0
-1@@ -30,7 +30,6 @@#include <asm/irq.h> #include <asm/system_misc.h> -#include <plat/cpu-freq.h> #include <mach/regs-clock.h> arch/arm/mach-s3c24xx/s3c2412.c +0
-1@@ -34,7 +34,6 @@#include <mach/regs-gpio.h> #include <plat/cpu.h> -#include <plat/cpu-freq.h> #include <plat/devs.h> #include <plat/pm.h> arch/arm/mach-s3c24xx/s3c244x.c +0
-2@@ -28,8 +28,6 @@#include <mach/hardware.h> #include <asm/irq.h> -#include <plat/cpu-freq.h> -#include <mach/regs-clock.h> #include <mach/regs-gpio.h> arch/arm/mach-s3c64xx/s3c6400.c +0
-1@@ -28,7 +28,6 @@#include <asm/irq.h> -#include <plat/cpu-freq.h> #include <mach/regs-clock.h> #include <plat/cpu.h> arch/arm/mach-s3c64xx/s3c6410.c +1
-1@@ -29,7 +29,7 @@#include <asm/irq.h> -#include <plat/cpu-freq.h> +#include <linux/soc/samsung/s3c-pm.h> #include <mach/regs-clock.h> #include <plat/cpu.h> arch/arm/plat-samsung/include/plat/cpu.h +0
-9@@ -124,15 +124,6 @@ extern struct syscore_ops s3c2412_pm_syscore_ops;extern struct syscore_ops s3c2416_pm_syscore_ops;extern struct syscore_ops s3c244x_pm_syscore_ops; -/* system device subsystems */ - -extern struct bus_type s3c2410_subsys; -extern struct bus_type s3c2410a_subsys; -extern struct bus_type s3c2412_subsys; -extern struct bus_type s3c2416_subsys; -extern struct bus_type s3c2440_subsys; -extern struct bus_type s3c2442_subsys; -extern struct bus_type s3c2443_subsys;extern struct bus_type s3c6410_subsys;#endif drivers/cpufreq/s3c2410-cpufreq.c +2
-3@@ -16,13 +16,12 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)drivers/cpufreq/s3c2412-cpufreq.c +2
-3@@ -19,15 +19,14 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <mach/s3c2412.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)drivers/cpufreq/s3c2440-cpufreq.c +2
-3@@ -20,13 +20,12 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)drivers/cpufreq/s3c24xx-cpufreq-debugfs.c +1
-1@@ -18,7 +18,7 @@#include <linux/seq_file.h> #include <linux/err.h> -#include <plat/cpu-freq-core.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> static struct dentry *dbgfs_root;static struct dentry *dbgfs_file_io;drivers/cpufreq/s3c24xx-cpufreq.c +2
-3@@ -21,13 +21,12 @@#include <linux/device.h> #include <linux/sysfs.h> #include <linux/slab.h> +#include <linux/soc/samsung/s3c-cpufreq-core.h> +#include <linux/soc/samsung/s3c-pm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/cpu-freq-core.h> -#include <mach/map.h> /* note, cpufreq support deals in kHz, no Hz */ include/linux/soc/samsung/s3c-cpu-freq.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq.h +0
-0include/linux/soc/samsung/s3c-cpufreq-core.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq-core.h +0
-0
Can you also update the header guard names to match new location?
Best regards,
Krzysztof
Re: [PATCH 30/36] ARM: s3c: remove cpufreq header dependencies
Quoted 12 lines · Krzysztof Kozlowski
include/linux/soc/samsung/s3c-cpufreq-core.h
Quoted 9 lines · Arnd Bergmann
include/linux/soc/samsung/s3c-cpu-freq.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq.h +0
-0include/linux/soc/samsung/s3c-cpufreq-core.h renamed from arch/arm/plat-samsung/include/plat/cpu-freq-core.h +0
-0Can you also update the header guard names to match new location?
Neither of those files had header guards, added them now.
Arnd
PATCH 31/36 ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh
In reply to Arnd BergmannThere are two identical copies of the s3c2412_cpufreq_setrefresh
function: a static one in the cpufreq driver and a global version in iotiming-s3c2412.c.
As the function requires the use of a hardcoded register address from a header that we want to not be visible to drivers, just move the existing global function and add a declaration in one of the cpufreq header files.
--- drivers/cpufreq/s3c2412-cpufreq.c | 23 -------------------- include/linux/soc/samsung/s3c-cpufreq-core.h | 1 + 2 files changed, 1 insertion(+), 23 deletions(-)
drivers/cpufreq/s3c2412-cpufreq.c +0 -23
@@ -25,8 +25,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/s3c2412.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)
@@ -156,27 +154,6 @@ static void s3c2412_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)clk_set_parent (armclk, cfg->divs.dvs ? hclk : fclk); } -static void s3c2412_cpufreq_setrefresh (struct s3c_cpufreq_config *cfg) -{ -struct s3c_cpufreq_board *board = cfg->board; -unsigned long refresh; - -s3c_freq_dbg ("%s: refresh %u ns, hclk %lu\n" , __func__, - board->refresh, cfg->freq.hclk); - -/* Reduce both the refresh time (in ns) and the frequency (in MHz) -* by 10 each to ensure that we do not overflow 32 bit numbers. This -* should work for HCLK up to 133MHz and refresh period up to 30usec. -*/ - - refresh = (board->refresh /10 ); - refresh *= (cfg->freq.hclk /100 ); - refresh /= (1 *1000 *1000 );/* 10^6 */ - -s3c_freq_dbg ("%s: setting refresh 0x%08lx\n" , __func__, refresh); -__raw_writel (refresh,S3C2412_REFRESH ); -} -/* set the default cpu frequency information, based on an 200MHz part * as we have no other way of detecting the speed rating in software. */
include/linux/soc/samsung/s3c-cpufreq-core.h +1 -0
@@ -246,6 +246,7 @@ extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg,extern void s3c2412_iotiming_set (struct s3c_cpufreq_config *cfg,struct s3c_iotimings *iot); +extern void s3c2412_cpufreq_setrefresh (struct s3c_cpufreq_config *cfg);#else #define s3c2412_iotiming_debugfs NULL#define s3c2412_iotiming_calc NULL
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 31/36] ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh
Quoted 61 lines · Arnd Bergmann
There are two identical copies of the
s3c2412_cpufreq_setrefresh
function: a static one in the cpufreq driver and a global version iniotiming-s3c2412.c.As the function requires the use of a hardcoded register address from a header that we want to not be visible to drivers, just move the existing global function and add a declaration in one of the cpufreq header files.
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/cpufreq/s3c2412-cpufreq.c | 23 -------------------- include/linux/soc/samsung/s3c-cpufreq-core.h | 1 + 2 files changed, 1 insertion(+), 23 deletions(-)drivers/cpufreq/s3c2412-cpufreq.c +0
-23@@ -25,8 +25,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/s3c2412.h> -#include <mach/map.h> #define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)@@ -156,27 +154,6 @@ static void s3c2412_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)clk_set_parent (armclk, cfg->divs.dvs ? hclk : fclk); } -static void s3c2412_cpufreq_setrefresh (struct s3c_cpufreq_config *cfg) -{ -struct s3c_cpufreq_board *board = cfg->board; -unsigned long refresh; - -s3c_freq_dbg ("%s: refresh %u ns, hclk %lu\n" , __func__, - board->refresh, cfg->freq.hclk); - -/* Reduce both the refresh time (in ns) and the frequency (in MHz) -* by 10 each to ensure that we do not overflow 32 bit numbers. This -* should work for HCLK up to 133MHz and refresh period up to 30usec. -*/ - - refresh = (board->refresh /10 ); - refresh *= (cfg->freq.hclk /100 ); - refresh /= (1 *1000 *1000 );/* 10^6 */ - -s3c_freq_dbg ("%s: setting refresh 0x%08lx\n" , __func__, refresh); -__raw_writel (refresh,S3C2412_REFRESH ); -} -/* set the default cpu frequency information, based on an 200MHz part * as we have no other way of detecting the speed rating in software. */ include/linux/soc/samsung/s3c-cpufreq-core.h +0
-0
include/linux/soc/samsung/s3c-cpufreq-core.h extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg, · line 249
Quoted 4 lines
include/linux/soc/samsung/s3c-cpufreq-core.h +1
-0@@ -246,6 +246,7 @@ extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg,extern void s3c2412_iotiming_set (struct s3c_cpufreq_config *cfg,struct s3c_iotimings *iot); +extern void s3c2412_cpufreq_setrefresh (struct s3c_cpufreq_config *cfg);
I think that it does not cover the !CONFIG_S3C2412_IOTIMING case. Either you need to provide also the empty stub or add default=y to S3C2412_IOTIMING. Otherwise cpufreq driver might end up without this.
Best regards,
Krzysztof
Re: [PATCH 31/36] ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh
Quoted 11 lines · Krzysztof Kozlowski
include/linux/soc/samsung/s3c-cpufreq-core.h extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg, · line 249
Quoted 5 lines · Arnd Bergmann
include/linux/soc/samsung/s3c-cpufreq-core.h +1
-0@@ -246,6 +246,7 @@ extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg,extern void s3c2412_iotiming_set (struct s3c_cpufreq_config *cfg,struct s3c_iotimings *iot); +extern void s3c2412_cpufreq_setrefresh (struct s3c_cpufreq_config *cfg);I think that it does not cover the !CONFIG_S3C2412_IOTIMING case. Either you need to provide also the empty stub or add default=y to
S3C2412_IOTIMING. Otherwise cpufreq driver might end up without this.
S3C2412_IOTIMING is not currently optional, it always gets selected by ARM_S3C2412_CPUFREQ, unlike S3C2410_IOTIMING which is only selected by specific boards for reasons I don't understand.
Arnd
PATCH 32/36 ARM: s3c: iotiming: make functions static
In reply to Arnd BergmannThere are two functions in this file that are never called from anywhere else, so they should be static to allow the compiler to optimize it better and not pollute the global namespace.
--- arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-s3c24xx/iotiming-s3c2410.c +3 -3
@@ -129,7 +129,7 @@ static unsigned int calc_0124(unsigned int cyc, unsigned long hclk_tns,return 0 ; } -int calc_tacp (unsigned int cyc,unsigned long hclk,unsigned long *v) +static int calc_tacp (unsigned int cyc,unsigned long hclk,unsigned long *v) {/* Currently no support for Tacp calculations. */ return 0 ;
@@ -288,8 +288,8 @@ static unsigned int get_0124(unsigned long hclk_tns,* Given the BANKCON setting in @bt and the current frequency settings * in @cfg, update the cycle timing information. */ -void s3c2410_iotiming_getbank (struct s3c_cpufreq_config *cfg, -struct s3c2410_iobank_timing *bt) +static void s3c2410_iotiming_getbank (struct s3c_cpufreq_config *cfg, +struct s3c2410_iobank_timing *bt) {unsigned long bankcon = bt->bankcon;unsigned long hclk = cfg->freq.hclk_tns;
Signature · 1 line
2.20.0
PATCH 33/36 ARM: s3c: move low-level clk reg access into platform code
In reply to Arnd BergmannRather than have the cpufreq drivers touch include the common headers to get the constants, add a small indirection. This is still not the proper way that would do this through the common clk API, but it lets us kill off the header file usage.
--- arch/arm/mach-s3c24xx/Makefile | 2 +- arch/arm/mach-s3c24xx/cpufreq-utils.c | 32 ++++++++++++++++++++ drivers/cpufreq/s3c2410-cpufreq.c | 8 +---- drivers/cpufreq/s3c2412-cpufreq.c | 10 ++---- drivers/cpufreq/s3c2440-cpufreq.c | 16 +++------- drivers/cpufreq/s3c24xx-cpufreq.c | 11 ++----- include/linux/soc/samsung/s3c-cpufreq-core.h | 7 +++++ 7 files changed, 51 insertions(+), 35 deletions(-)
arch/arm/mach-s3c24xx/Makefile +1 -1
@@ -38,7 +38,7 @@ obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o # common code -obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += cpufreq-utils.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += cpufreq-utils.o obj-$(CONFIG_S3C2410_IOTIMING) += iotiming-s3c2410.o obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o
arch/arm/mach-s3c24xx/cpufreq-utils.c +32 -0
@@ -60,3 +60,35 @@ void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg)if (!IS_ERR (cfg->mpll))clk_set_rate (cfg->mpll, cfg->pll.frequency); } + +#if defined(CONFIG_CPU_S3C2440 ) || defined(CONFIG_CPU_S3C2442 ) +u32 s3c2440_read_camdivn () +{ +return __raw_readl (S3C2440_CAMDIVN ); +} + +void s3c2440_write_camdivn (u32 camdiv) +{ +__raw_writel (camdiv,S3C2440_CAMDIVN ); +} +#endif + +u32 s3c24xx_read_clkdivn () +{ +return __raw_readl (S3C2410_CLKDIVN ); +} + +void s3c24xx_write_clkdivn (u32 clkdiv) +{ +__raw_writel (clkdiv,S3C2410_CLKDIVN ); +} + +u32 s3c24xx_read_mpllcon () +{ +return __raw_readl (S3C2410_MPLLCON ); +} + +void s3c24xx_write_locktime (u32 locktime) +{ +return __raw_writel (locktime,S3C2410_LOCKTIME ); +}
drivers/cpufreq/s3c2410-cpufreq.c +1 -7
@@ -22,12 +22,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> - -#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) - -#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) -#define S3C2410_CLKDIVN_PDIVN (1<<0)#define S3C2410_CLKDIVN_HDIVN (1<<1)
@@ -43,7 +37,7 @@ static void s3c2410_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)if (cfg->divs.p_divisor != cfg->divs.h_divisor) clkdiv |=S3C2410_CLKDIVN_PDIVN ; -__raw_writel (clkdiv,S3C2410_CLKDIVN ); +s3c24xx_write_clkdivn (clkdiv); }static int s3c2410_cpufreq_calcdivs (struct s3c_cpufreq_config *cfg)
drivers/cpufreq/s3c2412-cpufreq.c +2 -8
@@ -25,12 +25,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> - -#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) - -#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) -#define S3C2412_CLKDIVN_PDIVN (1<<2)#define S3C2412_CLKDIVN_HDIVN_MASK (3<<0)#define S3C2412_CLKDIVN_ARMDIVN (1<<3)
@@ -132,7 +126,7 @@ static void s3c2412_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)unsigned long clkdiv;unsigned long olddiv; - olddiv = clkdiv =__raw_readl (S3C2410_CLKDIVN ); + olddiv = clkdiv =s3c24xx_read_clkdivn ();/* clear off current clock info */
@@ -149,7 +143,7 @@ static void s3c2412_cpufreq_setdivs(struct s3c_cpufreq_config *cfg) clkdiv |=S3C2412_CLKDIVN_PDIVN ;s3c_freq_dbg ("%s: div %08lx => %08lx\n" , __func__, olddiv, clkdiv); -__raw_writel (clkdiv,S3C2410_CLKDIVN ); +s3c24xx_write_clkdivn (clkdiv);clk_set_parent (armclk, cfg->divs.dvs ? hclk : fclk); }
drivers/cpufreq/s3c2440-cpufreq.c +5 -11
@@ -26,12 +26,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> - -#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) -#define S3C2410_CLKDIVN S3C2410_CLKREG(0x14) -#define S3C2440_CAMDIVN S3C2410_CLKREG(0x18) -#define S3C2440_CLKDIVN_PDIVN (1<<0)#define S3C2440_CLKDIVN_HDIVN_MASK (3<<1)#define S3C2440_CLKDIVN_HDIVN_1 (0<<1)
@@ -162,8 +156,8 @@ static void s3c2440_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)s3c_freq_dbg ("%s: divisors: h=%d, p=%d\n" , __func__, cfg->divs.h_divisor, cfg->divs.p_divisor); - clkdiv =__raw_readl (S3C2410_CLKDIVN ); - camdiv =__raw_readl (S3C2440_CAMDIVN ); + clkdiv =s3c24xx_read_clkdivn (); + camdiv =s3c2440_read_camdivn (); clkdiv &= ~(S3C2440_CLKDIVN_HDIVN_MASK |S3C2440_CLKDIVN_PDIVN ); camdiv &= ~CAMDIVN_HCLK_HALF ;
@@ -203,11 +197,11 @@ static void s3c2440_cpufreq_setdivs(struct s3c_cpufreq_config *cfg)* then make a short delay and remove the hclk halving if necessary. */ -__raw_writel (camdiv |CAMDIVN_HCLK_HALF ,S3C2440_CAMDIVN ); -__raw_writel (clkdiv,S3C2410_CLKDIVN ); +s3c2440_write_camdivn (camdiv |CAMDIVN_HCLK_HALF ); +s3c24xx_write_clkdivn (clkdiv);ndelay (20 ); -__raw_writel (camdiv,S3C2440_CAMDIVN ); +s3c2440_write_camdivn (camdiv);clk_set_parent (armclk, cfg->divs.dvs ? hclk : fclk); }
drivers/cpufreq/s3c24xx-cpufreq.c +3 -8
@@ -27,12 +27,7 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -/* note, cpufreq support deals in kHz, no Hz */ -#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR) -#define S3C2410_MPLLCON S3C2410_CLKREG(0x04) -static struct cpufreq_driver s3c24xx_driver;static struct s3c_cpufreq_config cpu_cur;static struct s3c_iotimings s3c24xx_iotiming;
@@ -69,7 +64,7 @@ static void s3c_cpufreq_getcur(struct s3c_cpufreq_config *cfg) cfg->freq.pclk = pclk =clk_get_rate (clk_pclk); cfg->freq.armclk = armclk =clk_get_rate (clk_arm); - cfg->pll.driver_data =__raw_readl (S3C2410_MPLLCON ); + cfg->pll.driver_data =s3c24xx_read_mpllcon (); cfg->pll.frequency = fclk; cfg->freq.hclk_tns =1000000000 / (cfg->freq.hclk /10 );
@@ -387,7 +382,7 @@ static unsigned int suspend_freq;static int s3c_cpufreq_suspend (struct cpufreq_policy *policy) { suspend_pll.frequency =clk_get_rate (_clk_mpll); - suspend_pll.driver_data =__raw_readl (S3C2410_MPLLCON ); + suspend_pll.driver_data =s3c24xx_read_mpllcon (); suspend_freq =clk_get_rate (clk_arm);return 0 ;
@@ -548,7 +543,7 @@ static void s3c_cpufreq_update_loctkime(void) val |=calc_locktime (rate, cpu_cur.info->locktime_m);pr_info ("%s: new locktime is 0x%08x\n" , __func__, val); -__raw_writel (val,S3C2410_LOCKTIME ); +s3c24xx_write_locktime (val); }static int s3c_cpufreq_build_freq (void )
include/linux/soc/samsung/s3c-cpufreq-core.h +7 -0
@@ -286,3 +286,10 @@ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table,return index +1 ; } + +u32 s3c2440_read_camdivn (void ); +void s3c2440_write_camdivn (u32 camdiv); +u32 s3c24xx_read_clkdivn (void ); +void s3c24xx_write_clkdivn (u32 clkdiv); +u32 s3c24xx_read_mpllcon (void ); +void s3c24xx_write_locktime (u32 locktime);
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 33/36] ARM: s3c: move low-level clk reg access into platform code
Quoted 22 lines · Arnd Bergmann
Rather than have the cpufreq drivers touch include the common headers to get the constants, add a small indirection. This is still not the proper way that would do this through the common clk API, but it lets us kill off the header file usage.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/Makefile | 2 +- arch/arm/mach-s3c24xx/cpufreq-utils.c | 32 ++++++++++++++++++++ drivers/cpufreq/s3c2410-cpufreq.c | 8 +---- drivers/cpufreq/s3c2412-cpufreq.c | 10 ++---- drivers/cpufreq/s3c2440-cpufreq.c | 16 +++------- drivers/cpufreq/s3c24xx-cpufreq.c | 11 ++----- include/linux/soc/samsung/s3c-cpufreq-core.h | 7 +++++ 7 files changed, 51 insertions(+), 35 deletions(-)arch/arm/mach-s3c24xx/Makefile +0
-0
arch/arm/mach-s3c24xx/Makefile obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o · line 41
Quoted 5 lines
arch/arm/mach-s3c24xx/Makefile +1
-1@@ -38,7 +38,7 @@ obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o # common code -obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += cpufreq-utils.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += cpufreq-utils.o
Drop also here S3C2410_CPUFREQ_UTILS entirely.
Best regards,
Krzysztof
Re: [PATCH 33/36] ARM: s3c: move low-level clk reg access into platform code
Quoted 7 lines · Krzysztof Kozlowski
arch/arm/mach-s3c24xx/Makefile obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o · line 41
Quoted 4 lines
# common codearch/arm/mach-s3c24xx/Makefile +1
-1-obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += cpufreq-utils.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += cpufreq-utils.oDrop also here
S3C2410_CPUFREQ_UTILSentirely.
Ok, done.
Arnd
PATCH 34/36 ARM: s3c: stop including mach/hardware.h from mach/io.h
In reply to Arnd BergmannA 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.
--- 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(-)
arch/arm/mach-s3c24xx/common.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +2 -0
@@ -14,6 +14,8 @@#ifndef GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H +#include <mach/map.h> +/* * GPIO sizes for various SoCs: *
arch/arm/mach-s3c24xx/include/mach/hardware.h +0 -7
@@ -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 */
arch/arm/mach-s3c24xx/include/mach/io.h +1 -2
@@ -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,
arch/arm/mach-s3c24xx/include/mach/regs-clock.h +2 -0
@@ -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)))
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h +2 -0
@@ -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 */
arch/arm/mach-s3c24xx/include/mach/regs-irq.h +2 -0
@@ -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)
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +1 -0
@@ -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)
arch/arm/mach-s3c24xx/include/mach/s3c2412.h +2 -0
@@ -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))
arch/arm/mach-s3c24xx/mach-h1940.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-jive.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-rx1950.c +1 -0
@@ -46,6 +46,7 @@#include <sound/uda1380.h> +#include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h>
arch/arm/mach-s3c24xx/pm-h1940.S +0 -1
@@ -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>
arch/arm/mach-s3c24xx/regs-mem.h +2 -0
@@ -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)
arch/arm/mach-s3c24xx/s3c2410.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/s3c2412.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/s3c2416.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/s3c2443.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/s3c244x.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/sleep-s3c2410.S +0 -1
@@ -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>
arch/arm/mach-s3c24xx/sleep-s3c2412.S +0 -1
@@ -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>
arch/arm/mach-s3c24xx/sleep.S +0 -1
@@ -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>
drivers/spi/spi-s3c24xx-regs.h +2 -0
@@ -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 */
drivers/usb/gadget/udc/s3c2410_udc_regs.h +2 -0
@@ -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)
Signature · 1 line
2.20.0
Russell King - ARM Linux admin
maintainerRe: [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h
Quoted 51 lines · Arnd Bergmann
A number of other files rely on
mach/map.hto be indirectly included frommach/io.hthroughmach/hardware.h.Reduce this to the minimal
plat/map-base.hand add explicit includes everywhere else.Signed-off-by Arnd Bergmann <[email protected]>--- 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(-)arch/arm/mach-s3c24xx/common.c +1
-0@@ -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> arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +0
-0
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h line 18
Quoted 5 lines
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +2
-0@@ -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
Quoted 40 lines
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +0
-0/* * GPIO sizes for various SoCs: * arch/arm/mach-s3c24xx/include/mach/hardware.h +0
-7@@ -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 */ arch/arm/mach-s3c24xx/include/mach/io.h +1
-2@@ -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, arch/arm/mach-s3c24xx/include/mach/regs-clock.h +0
-0
arch/arm/mach-s3c24xx/include/mach/regs-clock.h line 13
Quoted 5 lines
arch/arm/mach-s3c24xx/include/mach/regs-clock.h +2
-0@@ -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
Quoted 221 lines
arch/arm/mach-s3c24xx/include/mach/regs-clock.h +0
-0#define S3C2410_CLKREG (x) ((x) + S3C24XX_VA_CLKPWR)#define S3C2410_PLLVAL (_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))arch/arm/mach-s3c24xx/include/mach/regs-gpio.h +2
-0@@ -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 */ arch/arm/mach-s3c24xx/include/mach/regs-irq.h +2
-0@@ -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)arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +1
-0@@ -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)arch/arm/mach-s3c24xx/include/mach/s3c2412.h +2
-0@@ -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))arch/arm/mach-s3c24xx/mach-h1940.c +1
-0@@ -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> arch/arm/mach-s3c24xx/mach-jive.c +1
-0@@ -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> arch/arm/mach-s3c24xx/mach-rx1950.c +1
-0@@ -46,6 +46,7 @@#include <sound/uda1380.h> +#include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> arch/arm/mach-s3c24xx/pm-h1940.S +0
-1@@ -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>arch/arm/mach-s3c24xx/regs-mem.h +2
-0@@ -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)arch/arm/mach-s3c24xx/s3c2410.c +1
-1@@ -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> arch/arm/mach-s3c24xx/s3c2412.c +1
-1@@ -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> arch/arm/mach-s3c24xx/s3c2416.c +1
-1@@ -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> arch/arm/mach-s3c24xx/s3c2443.c +1
-1@@ -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> arch/arm/mach-s3c24xx/s3c244x.c +1
-1@@ -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> arch/arm/mach-s3c24xx/sleep-s3c2410.S +0
-1@@ -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>arch/arm/mach-s3c24xx/sleep-s3c2412.S +0
-1@@ -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>arch/arm/mach-s3c24xx/sleep.S +0
-1@@ -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>drivers/spi/spi-s3c24xx-regs.h +0
-0
drivers/spi/spi-s3c24xx-regs.h line 12
Quoted 5 lines
drivers/spi/spi-s3c24xx-regs.h +2
-0@@ -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.
drivers/usb/gadget/udc/s3c2410_udc_regs.h line 10
Quoted 13 lines
drivers/spi/spi-s3c24xx-regs.h +0
-0#define S3C2410_SPCON (0x00)#define S3C2410_SPCON_SMOD_DMA (2 << 5)/* DMA mode */ drivers/usb/gadget/udc/s3c2410_udc_regs.h +2
-0@@ -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.
Quoted 12 lines
drivers/usb/gadget/udc/s3c2410_udc_regs.h +0
-0#define S3C2410_USBDREG (x) (x)#define S3C2410_UDC_FUNC_ADDR_REG S3C2410_USBDREG(0x0140)Signature · 7 lines
2.20.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 3 lines
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
Re: [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h
Quoted 10 lines · Russell King - ARM Linux admin
Quoted 8 lines · Arnd Bergmann
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +0
-0@@ -14,6 +14,8 @@#ifndef GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H
Quoted 4 lines
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h line 18
Quoted 2 lines
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +2
-0+#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.
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-s3c24xx/include/mach/regs-clock.h +0
-0@@ -9,6 +9,8 @@#ifndef __ASM_ARM_REGS_CLOCK#define __ASM_ARM_REGS_CLOCK
Quoted 4 lines
arch/arm/mach-s3c24xx/include/mach/regs-clock.h line 13
Quoted 2 lines
arch/arm/mach-s3c24xx/include/mach/regs-clock.h +2
-0+#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
Quoted 8 lines
Quoted 8 lines
drivers/spi/spi-s3c24xx-regs.h +0
-0@@ -8,6 +8,8 @@#ifndef __ASM_ARCH_REGS_SPI_H#define __ASM_ARCH_REGS_SPI_H
Quoted 5 lines
drivers/spi/spi-s3c24xx-regs.h line 12
Quoted 2 lines
drivers/spi/spi-s3c24xx-regs.h +2
-0+#include <mach/map.h> +If this is outside of
arch/arm, it shouldn't need anything frommach/map.h-mach/map.his 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.
Quoted 8 lines
Quoted 8 lines
drivers/usb/gadget/udc/s3c2410_udc_regs.h +0
-0@@ -6,6 +6,8 @@#ifndef __ASM_ARCH_REGS_UDC_H#define __ASM_ARCH_REGS_UDC_H
Quoted 5 lines
drivers/usb/gadget/udc/s3c2410_udc_regs.h line 10
Quoted 2 lines
drivers/usb/gadget/udc/s3c2410_udc_regs.h +2
-0+#include <mach/map.h> +If this is outside of
arch/arm, it shouldn't need anything frommach/map.h-mach/map.his not for driver use.
Same here.
Thanks for taking a look, I'll fix it all up tomorrow.
Arnd
Re: [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect
In reply to Arnd BergmannHi Arnd,
2019年10月11日(金) 5:30 Arnd Bergmann <[email protected]>:
Quoted 21 lines
The clk driver uses both a function call into an exported platform file and a direct register access to a hardcoded virtual address for accessing the MISCCR register, both become are a problem for a multiplatform kernel because of the header file dependency.
Make this an indirect function call through platform data instead.
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-s3c24xx/common.c | 3 +++ drivers/clk/samsung/clk-s3c2410-dclk.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-)arch/arm/mach-s3c24xx/common.c +0
-0
arch/arm/mach-s3c24xx/common.c struct platform_device s3c2410_device_dclk = { · line 671
Quoted 5 lines
arch/arm/mach-s3c24xx/common.c +2
-0@@ -667,5 +667,8 @@ struct platform_device s3c2410_device_dclk = { .id = 0, .num_resources = ARRAY_SIZE(s3c2410_dclk_resource), .resource = s3c2410_dclk_resource, + .dev = { + .platform_data = s3c2410_modify_misccr,
Thanks for the patch!
Just one minor nit: It doesn't look very nice to pass a function pointer directly as platform data. Could we have a struct defined instead - with a kerneldoc comment describing the function pointer field?
Best regards,
Tomasz