Documentation: Update paths of Samsung S3C machine files
Subsystems (6)
Krzysztof Kozlowski
maintainerPATCH 1/3 Documentation: Update paths of Samsung S3C machine files
Documentation references Samsung S3C24xx and S3C64xx machine files in multiple places but the files were traveling around the kernel multiple times.
--- .../admin-guide/kernel-parameters.txt | 2 +- Documentation/arm/samsung-s3c24xx/gpio.rst | 4 ++-- .../arm/samsung-s3c24xx/overview.rst | 22 ++++++------------- .../arm/samsung-s3c24xx/usb-host.rst | 6 ++--- Documentation/arm/samsung/gpio.rst | 3 +-- .../ethernet/davicom/dm9000.rst | 2 +- 6 files changed, 15 insertions(+), 24 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +1 -1
@@ -2943,7 +2943,7 @@ mtdset= [ARM] ARM/S3C2412 JIVE boot control - See arch/arm/mach-s3c2412/mach-jive.c + See arch/arm/mach-s3c/mach-jive.c mtouchusb.raw_coordinates= [HW] Make the MicroTouch USB driver use raw coordinates
Documentation/arm/samsung-s3c24xx/gpio.rst +2 -2
@@ -29,7 +29,7 @@ GPIOLIB The following functions now either have a `s3c_` specific variant or are merged into gpiolib. See the definitions in - arch/arm/plat-samsung/include/plat/gpio-cfg.h: + arch/arm/mach-s3c/gpio-cfg.h: - s3c2410_gpio_setpin() gpio_set_value() or gpio_direction_output() - s3c2410_gpio_getpin() gpio_get_value() or gpio_direction_input()
@@ -86,7 +86,7 @@ between the calls. Headers ------- - See arch/arm/mach-s3c24xx/include/mach/regs-gpio.h for the list + See arch/arm/mach-s3c/regs-gpio-s3c24xx.h for the list of GPIO pins, and the configuration values for them. This is included by using #include <mach/regs-gpio.h>
Documentation/arm/samsung-s3c24xx/overview.rst +7 -15
@@ -18,7 +18,7 @@ Introduction versions. The S3C2416 and S3C2450 devices are very similar and S3C2450 support is - included under the arch/arm/mach-s3c2416 directory. Note, while core + included under the arch/arm/mach-s3c directory. Note, while core support for these SoCs is in, work on some of the extra peripherals and extra interrupts is still ongoing.
@@ -37,19 +37,11 @@ Configuration Layout ------ - The core support files are located in the platform code contained in - arch/arm/plat-s3c24xx with headers in include/asm-arm/plat-s3c24xx. - This directory should be kept to items shared between the platform - code (arch/arm/plat-s3c24xx) and the arch/arm/mach-s3c24* code. + The core support files, register, kernel and paltform data are located in the + platform code contained in arch/arm/mach-s3c with headers in + arch/arm/mach-s3c/include - Each cpu has a directory with the support files for it, and the - machines that carry the device. For example S3C2410 is contained - in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440 - - Register, kernel and platform data definitions are held in the - arch/arm/mach-s3c2410 directory./include/mach - -arch/arm/plat-s3c24xx: +arch/arm/mach-s3c: Files in here are either common to all the s3c24xx family, or are common to only some of them with names to indicate this
@@ -134,7 +126,7 @@ Adding New Machines should keep this in mind before altering items outside of their own machine files. - Machine definitions should be kept in linux/arch/arm/mach-s3c2410, + Machine definitions should be kept in arch/arm/mach-s3c, and there are a number of examples that can be looked at. Read the kernel patch submission policies as well as the
@@ -293,7 +285,7 @@ Platform Data } Note, since the code is marked as __init, it should not be - exported outside arch/arm/mach-s3c2410/, or exported to + exported outside arch/arm/mach-s3c/, or exported to modules via EXPORT_SYMBOL() and related functions.
Documentation/arm/samsung-s3c24xx/usb-host.rst +3 -3
@@ -36,7 +36,7 @@ Board Support ------------- The driver attaches to a platform device, which will need to be - added by the board specific support file in linux/arch/arm/mach-s3c2410, + added by the board specific support file in arch/arm/mach-s3c, such as mach-bast.c or mach-smdk2410.c The platform device's platform_data field is only needed if the
@@ -51,9 +51,9 @@ Board Support Platform Data ------------- - See arch/arm/mach-s3c2410/include/mach/usb-control.h for the + See include/linux/platform_data/usb-ohci-s3c2410.h for the descriptions of the platform device data. An implementation - can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c . + can be found in arch/arm/mach-s3c/simtec-usb.c . The `struct s3c2410_hcd_info` contains a pair of functions that get called to enable over-current detection, and to
Documentation/arm/samsung/gpio.rst +1 -2
@@ -37,5 +37,4 @@ implementation to configure pins as necessary. The s3c_gpio_cfgpin() and s3c_gpio_setpull() provide the means for a driver or machine to change gpio configuration. -See arch/arm/plat-samsung/include/plat/gpio-cfg.h for more information -on these functions. +See arch/arm/mach-s3c/gpio-cfg.h for more information on these functions.
Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst +1 -1
@@ -34,7 +34,7 @@ These resources should be specified in that order, as the ordering of the two address regions is important (the driver expects these to be address and then data). -An example from arch/arm/mach-s3c2410/mach-bast.c is:: +An example from arch/arm/mach-s3c/mach-bast.c is:: static struct resource bast_dm9k_resource[] = { [0] = {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Krzysztof Kozlowski
maintainerPATCH 2/3 serial: s3c: Update path of Samsung S3C machine file
Correct the path to Samsung S3C24xx machine file, mentioned in documentation.
--- include/linux/serial_s3c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/serial_s3c.h +1 -1
@@ -254,7 +254,7 @@* serial port * * the pointer is setup by the machine specific initialisation from the -* arch/arm/mach-s3c2410/ directory. +* arch/arm/mach-s3c/ directory. */ struct s3c2410_uartcfg {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Krzysztof Kozlowski
maintainerPATCH 3/3 ARM: s3c: Bring back notes from removed debug-macro.S
In reply to Krzysztof KozlowskiDocumentation references notes from a removed debug-macro.S file so bring the contents here.
--- arch/arm/mach-s3c/s3c64xx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-s3c/s3c64xx.c +6 -1
@@ -95,7 +95,12 @@ static struct cpu_table cpu_ids[] __initdata = {/* minimal IO mapping */ -/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */ +/* +* note, for the boot process to work we have to keep the UART +* virtual address aligned to an 1MiB boundary for the L1 +* mapping the head code makes. We keep the UART virtual address +* aligned and add in the offset when we load the value here. +*/ #define UART_OFFS (S3C_PA_UART & 0xfffff)static struct map_desc s3c_iodesc[]__initdata = {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 3/3] ARM: s3c: Bring back notes from removed debug-macro.S
Quoted 7 lines · Krzysztof Kozlowski
Documentation references notes from a removed
debug-macro.Sfile so bring the contents here.Signed-off-by Krzysztof Kozlowski <[email protected]>--- arch/arm/mach-s3c/s3c64xx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Applied.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel