From patchwork Fri Sep 11 14:33:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11770997 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A9EC59D for ; Fri, 11 Sep 2020 16:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07367221E7 for ; Fri, 11 Sep 2020 16:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599843453; bh=p6R2ZHw5cWO8+UxCFv3CDcDXbeixyPGmxEmclz93WA4=; h=From:To:Subject:Date:List-ID:From; b=fXOdi25G8q3Tf9hUw2uh5iWYpWm0hlaNupaTd/2xaHkl87H5XTqPYmokKnoy7q0lz YNavm7nZChIZdbNPnNWceeucoQM/lnREdY0cgPjiek6YXACNe5r/DjzeaLh9oZMfTt xPTR1PaL1MyNRK1MmVs70CF1+P2aGH9Eb1oIRTeE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726177AbgIKQzS (ORCPT ); Fri, 11 Sep 2020 12:55:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:46956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726324AbgIKPFb (ORCPT ); Fri, 11 Sep 2020 11:05:31 -0400 Received: from kozik-lap.mshome.net (unknown [194.230.155.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71F9D222B9; Fri, 11 Sep 2020 14:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599834838; bh=p6R2ZHw5cWO8+UxCFv3CDcDXbeixyPGmxEmclz93WA4=; h=From:To:Subject:Date:From; b=I3tY2ky+hfQbfbyI967PcwUAmFKbSmAZZ1muhVWqDdahxCi/e7Sn3d817K6qSSdbB XLmjr5hb2qlBvpbG29VNR1EFRTzNto8894L2QbcQaQAEyqkFVkJK2T2kgyu9qujjyJ aMM7iK3GzwdS28Qq4i1xMKf/ai8qS0nRitsSxqs8= From: Krzysztof Kozlowski To: Jonathan Corbet , Kukjin Kim , Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/3] Documentation: Update paths of Samsung S3C machine files Date: Fri, 11 Sep 2020 16:33:41 +0200 Message-Id: <20200911143343.498-1-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Documentation references Samsung S3C24xx and S3C64xx machine files in multiple places but the files were traveling around the kernel multiple times. Signed-off-by: Krzysztof Kozlowski --- .../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(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 5debfe238027..6ac5d6dc106c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -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 diff --git a/Documentation/arm/samsung-s3c24xx/gpio.rst b/Documentation/arm/samsung-s3c24xx/gpio.rst index f7c3d7d011a2..f4a8c800a457 100644 --- a/Documentation/arm/samsung-s3c24xx/gpio.rst +++ b/Documentation/arm/samsung-s3c24xx/gpio.rst @@ -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 diff --git a/Documentation/arm/samsung-s3c24xx/overview.rst b/Documentation/arm/samsung-s3c24xx/overview.rst index e9a1dc7276b5..14535e5cffb7 100644 --- a/Documentation/arm/samsung-s3c24xx/overview.rst +++ b/Documentation/arm/samsung-s3c24xx/overview.rst @@ -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. diff --git a/Documentation/arm/samsung-s3c24xx/usb-host.rst b/Documentation/arm/samsung-s3c24xx/usb-host.rst index c84268bd1884..7aaffac89e04 100644 --- a/Documentation/arm/samsung-s3c24xx/usb-host.rst +++ b/Documentation/arm/samsung-s3c24xx/usb-host.rst @@ -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 diff --git a/Documentation/arm/samsung/gpio.rst b/Documentation/arm/samsung/gpio.rst index 5f7cadd7159e..f6e27b07c993 100644 --- a/Documentation/arm/samsung/gpio.rst +++ b/Documentation/arm/samsung/gpio.rst @@ -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. diff --git a/Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst b/Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst index d5458da01083..14eb0a4d4e4e 100644 --- a/Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst +++ b/Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst @@ -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] = { From patchwork Fri Sep 11 14:33:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11770953 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B41CF698 for ; Fri, 11 Sep 2020 16:42:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 919B8221E7 for ; Fri, 11 Sep 2020 16:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599842570; bh=aRm/nSH7/SoWVBtD3aaiB7zpszrW2lrJPlUGWAXYJNk=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=HDWoB0QGmOgJwnwAqkyxBb4HK39RierofTXWCvTJf7D1072KpEvTa0XirHJOmnGXi nocESq1DHsJCus83Nbto3XSFDpPuWfAlllgGL86c3hHXeYjOv/DKjcK5KMJzMSFYxZ S1bPi43yrDpdkVnBxstfx/d4exsdHca/ZdF04cto= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726161AbgIKQl4 (ORCPT ); Fri, 11 Sep 2020 12:41:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:51332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726376AbgIKPKE (ORCPT ); Fri, 11 Sep 2020 11:10:04 -0400 Received: from kozik-lap.mshome.net (unknown [194.230.155.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6FB4222C3; Fri, 11 Sep 2020 14:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599834842; bh=aRm/nSH7/SoWVBtD3aaiB7zpszrW2lrJPlUGWAXYJNk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=tFh2XMpZBBVQfnwhuAwKDsnDbp8gy95H9eEk9cih8VsCD+4pYXSnH1aClS2/5p6ng Yn2X9JpKS8DdRQJCUnyAG7Vwy+US66Q+BeExOoKoIPZrahCZM63lobVJYDuD6zfDNS IqN/EI2OKP/0AKav99/1eTM+wqljTi/r2d6TVWxY= From: Krzysztof Kozlowski To: Jonathan Corbet , Kukjin Kim , Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/3] serial: s3c: Update path of Samsung S3C machine file Date: Fri, 11 Sep 2020 16:33:42 +0200 Message-Id: <20200911143343.498-2-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200911143343.498-1-krzk@kernel.org> References: <20200911143343.498-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Correct the path to Samsung S3C24xx machine file, mentioned in documentation. Signed-off-by: Krzysztof Kozlowski --- include/linux/serial_s3c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h index 463ed28d2b27..ca2c5393dc6b 100644 --- a/include/linux/serial_s3c.h +++ b/include/linux/serial_s3c.h @@ -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 { From patchwork Fri Sep 11 14:33:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11770801 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BCAD746 for ; Fri, 11 Sep 2020 15:26:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A85F20770 for ; Fri, 11 Sep 2020 15:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599837963; bh=ouSe3E1BUgGedI46aMfPRrEMheKNTw50AdAlm0Y74ac=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=VXGxX7LHDX1AjpFOsMgOKDsFXnxD+8Olh4VVshpjYuLw9Uweq9nPVlglzZVUdfTdP rMBghimLoq4Ekmdyo7V6/9+7X8UQ1qFkQvMkOqM+c3pZb8ecqCUDzNwoEfaEUVnIoS c6X7taq4dXdsfgc5HQqOMKXnpbNkKY5o6O0/59Gw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726300AbgIKPZv (ORCPT ); Fri, 11 Sep 2020 11:25:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726262AbgIKPZa (ORCPT ); Fri, 11 Sep 2020 11:25:30 -0400 Received: from kozik-lap.mshome.net (unknown [194.230.155.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E2559222BB; Fri, 11 Sep 2020 14:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599834846; bh=ouSe3E1BUgGedI46aMfPRrEMheKNTw50AdAlm0Y74ac=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TSlmQcxVEbkc4r6vpe2ZTb1CsL7jXAQaU0zDUG/YmAg4hIgTGUmXfaM/KLAl/v5ft syogXF7HnkJbXpg/TB/oTq7Qf1X+dERYaDNVzKzWZD8ZntQgiIya5i53/y+Og4YBzJ ovzPawY47ZwZtbiAAKXiB4jI/3D+kj8MG4RaInHg= From: Krzysztof Kozlowski To: Jonathan Corbet , Kukjin Kim , Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 3/3] ARM: s3c: Bring back notes from removed debug-macro.S Date: Fri, 11 Sep 2020 16:33:43 +0200 Message-Id: <20200911143343.498-3-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200911143343.498-1-krzk@kernel.org> References: <20200911143343.498-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Documentation references notes from a removed debug-macro.S file so bring the contents here. Signed-off-by: Krzysztof Kozlowski --- arch/arm/mach-s3c/s3c64xx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c index b5fc615a482f..4dfb648142f2 100644 --- a/arch/arm/mach-s3c/s3c64xx.c +++ b/arch/arm/mach-s3c/s3c64xx.c @@ -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 = {