From patchwork Wed Jul 31 19:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170210 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4432444ile; Wed, 31 Jul 2019 12:58:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqy6s2Kk0poIvZPBOYqSSvmcHfwswVs0dnW4+hIBx9V8g4rcPIGLD1S+3rzGy223HbMtau/f X-Received: by 2002:a17:902:7781:: with SMTP id o1mr121994058pll.205.1564603108681; Wed, 31 Jul 2019 12:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603108; cv=none; d=google.com; s=arc-20160816; b=z9zOc0/g0A74N9MiJtuA7RjGT9rG+3B+nkoq/tcMygCuudkClEz+09yNsMfJUaiMfk +eHAKRmJvfu+4DZtvPYUGHCeE7SLGXs39XHMTCvLC4MWGmXXYOcFMEGZXQs5+RUfTZWE Y1kwrYazk1jF/k6fHOj+F3K9QpwJgE2sSHRWxF1TAQxr56IKHixPikV4OM7fFNSBj9X6 Tk1+LYg96+JvR2xEWsmIG9JGz2n/srxwFADxCcW5aKzRfCA/EzKpejzQGV+lgSYkywsX gu2oczbgIlNIS41+o0TFet/OLY+JSmTdm3B2AinJne6pw55G8HZ0pJbbOGaNwBARE2Mo EPFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WRM0f6yiH98fabcOMRwDQRBwmHRqjPSAEoLiJsHjRmQ=; b=ZFDmbXhzDriDc+40wvA5KNb7yyIyBxHPuA1H0V+/7wF2LX6cPA8uV6GYp9J0+/cFW3 MJxzBrPq46N1ptRbG+JBsWPzSLYnxIJMjG9b8oZq99d/ye3eC/ptvDyFBn5mc7cZXAGT MDaDAw2xvXl3V3OpupULgB/IOlrBeHhSsKgn5bWM9VVofghY5My5DwVh1hB17UKv8EMJ hgJDBNzSNeGQRxhgUaWlp3fgWuOHM1uSfpSNrAxPARVFkz52TUDP8j3YN8bdk+b3hy3l FvWR2sxdSEPbjRtaduFNr2QcV4aoFt2Jfb8OEwbHY/hEi0aWWNIkj5yVjUEApSqK62kI PXhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l2si33146843pff.221.2019.07.31.12.58.28; Wed, 31 Jul 2019 12:58:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729036AbfGaT62 (ORCPT + 1 other); Wed, 31 Jul 2019 15:58:28 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:48395 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728326AbfGaT62 (ORCPT ); Wed, 31 Jul 2019 15:58:28 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MREqy-1hgjWs14cO-00N7VN; Wed, 31 Jul 2019 21:57:50 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Greg Kroah-Hartman , Alan Stern Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 01/14] usb: ohci-nxp: enable compile-testing Date: Wed, 31 Jul 2019 21:56:43 +0200 Message-Id: <20190731195713.3150463-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Y9P2ZZ0tUv+u7UP+ySO48Qnisfdw/BPCHBVVrPVOhMR0se6XHtZ /rVucQltL2fuAeI04etj2w+UKbl8qnEoBbumQEN4+999lkM3I2ap2LhDhPPYCU+sPUiSn9C MHqmRZQQCJodcJVkIaRsJz/aHzlJ2qbDtR9NKGZoXdpYt9iNJyi2kjLzGDf3w4RZjG9+E0D 3y12ssqwzFQKPPcwF8qWQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Xo1stquwtQs=:bl7JhWbnrGGzdDgrJPO8Kj DFy2wWP0ZHZ9IanjfpKj7idAUI1oh8dwC6+KdJvb4LHeY1JtZMKcx63mjHAi686NYHgQ8VVTE qpvSBbWGUYS5+bYWsQ/4laOaF1bNS8KywD6IBggqWVu/qHZqfq9eI1VEV6NpVr5g5MyaMj1IH P1wdZBUDAvXz+mDSgg7cQloD/0mVegg6up9JQIRaNzmyYHPSzsKpv8GSHgQBiMwAmeah7yIaO cZfZOQzu/09Y4lqBFz/YeeiIARk7oD3Pa0WQbjRh+AZOmhCQaBCG4OrJn3aq3qPwJeOM0Hv1K KKSuKJKjGXmywjGRQ29Orr90FifnUh8cq1ttCAtvmbagDR63yrU64szUpPnzWtecaWIRp6s5b vTO1+amooJrMidahTJqQKSHM2fx4r9Sr5EmLoCZv+/c9BPTs+f02+pADSmTAUS22Fgv+0jaGt 4HQm2+tHlytUCew5ukF92am1YnKG10BWAYbLXeG2MH8pUFBmgRRVR7ilL7WeTx2Gedk/V79ct uGd8u0N8BHw/0ZucXrPbX+CiYkje/6ZXb3B2XMt6A0XjEX+fg0JP5yhXoUELaqnft5n+Wvivf b1eeZZbdGV+ibHimys+Ct4FUkEzW13+8qoPTMA6tfQrU+zhiUJvNpnzkTBP7V31ZHaVtkPotD 0n8Ep6f3eWAW9zElHMZFjMZoVXqmIZUOH9/ZHQqRINOgvWQfv5Zqa7S52aDmMcB7cQFIxgl+w blDIwv7/7PJz7UoT+quSvgJ675iI9iAKHP+p6g== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The driver hardcodes a hardware I/O address the way one should generally not do, and this prevents both compile-testing, and moving the platform to CONFIG_ARCH_MULTIPLATFORM. Change the code to be independent of the machine headers to allow those two. Removing the hardcoded address would be hard and is not necessary, so leave that in place for now. Signed-off-by: Arnd Bergmann --- drivers/usb/host/Kconfig | 3 ++- drivers/usb/host/ohci-nxp.c | 25 ++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) -- 2.20.0 diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 40b5de597112..73d233d3bf4d 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -441,7 +441,8 @@ config USB_OHCI_HCD_S3C2410 config USB_OHCI_HCD_LPC32XX tristate "Support for LPC on-chip OHCI USB controller" - depends on USB_OHCI_HCD && ARCH_LPC32XX + depends on USB_OHCI_HCD + depends on ARCH_LPC32XX || COMPILE_TEST depends on USB_ISP1301 default y ---help--- diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index f5f532601092..c561881d0e79 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c @@ -29,10 +29,7 @@ #include "ohci.h" -#include - #define USB_CONFIG_BASE 0x31020000 -#define USB_OTG_STAT_CONTROL IO_ADDRESS(USB_CONFIG_BASE + 0x110) /* USB_OTG_STAT_CONTROL bit defines */ #define TRANSPARENT_I2C_EN (1 << 7) @@ -122,19 +119,33 @@ static inline void isp1301_vbus_off(void) static void ohci_nxp_start_hc(void) { - unsigned long tmp = __raw_readl(USB_OTG_STAT_CONTROL) | HOST_EN; + void __iomem *usb_otg_stat_control = ioremap(USB_CONFIG_BASE + 0x110, 4); + unsigned long tmp; + + if (WARN_ON(!usb_otg_stat_control)) + return; + + tmp = __raw_readl(usb_otg_stat_control) | HOST_EN; - __raw_writel(tmp, USB_OTG_STAT_CONTROL); + __raw_writel(tmp, usb_otg_stat_control); isp1301_vbus_on(); + + iounmap(usb_otg_stat_control); } static void ohci_nxp_stop_hc(void) { + void __iomem *usb_otg_stat_control = ioremap(USB_CONFIG_BASE + 0x110, 4); unsigned long tmp; + if (WARN_ON(!usb_otg_stat_control)) + return; + isp1301_vbus_off(); - tmp = __raw_readl(USB_OTG_STAT_CONTROL) & ~HOST_EN; - __raw_writel(tmp, USB_OTG_STAT_CONTROL); + tmp = __raw_readl(usb_otg_stat_control) & ~HOST_EN; + __raw_writel(tmp, usb_otg_stat_control); + + iounmap(usb_otg_stat_control); } static int ohci_hcd_nxp_probe(struct platform_device *pdev) From patchwork Wed Jul 31 19:56:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170211 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4432898ile; Wed, 31 Jul 2019 12:59:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqzaYV+TxEkMo1i8MARt2qa8YZwN+X1Nhs9gqZy+gNy3QsU53ieJ4QVcixetugepBCZCkkdN X-Received: by 2002:a17:90a:36a7:: with SMTP id t36mr4514225pjb.34.1564603140515; Wed, 31 Jul 2019 12:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603140; cv=none; d=google.com; s=arc-20160816; b=eSmMN0TpBcPxL0fqiFwVg+yhzaDiErkDh12GjGWrw9J83xVSgXnG55GX1ADcC7mo1d agJ5ohDeLD9Awp57eSLP/qRHfXBThinSiozFim7+ASWBX65U8fmJqZEc34CtCc/SdfUg pfl+K1ZMmdfqgsiXXmPQNzY/nyR+nbRYLn6Jjqwn4DYvHPeH4gODjhzvXErT6n4LcdpV +QH8bSXFvcgUF5bpR4udXhseiKaoMkHC8lt4IJS+IGHVXCXOkHShEgHQZ0s8Yb7WEFtX ck9CJPdW2xAC8P/V6Nfj25a60mTX5sc0PSWEfLTXLACO21pvT/l3iZcYpqhB/nKCX322 VwRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=RWauhkAx14H+/HomWKAYEyeYsN4WvbWb7HdM5GT6pDQ=; b=eydSUWaFKXWKuTq/4P8WI8JzSVKLGAdjB66ferrCknwVXCrlpnI8LAvjsNZVlqOZ+i yQafGtygF8h0VyXSNmDQyagzog7hfnkJYBl/DPJ0b72IO6HoB4T2zFGU3EpDrTF7dHgV Yb/mvi0NlCTouigPSydYONv+8NsvhHB4rGKip3HoYd9SOO7AqVw6AG3EdrjezjIePP/o 5dN0lHPuP+BG9NfTx3HOpyYAXmXXtQHAg7ZmwpVhQOOhDyygI98VWONWyguyMBox261+ EQlaDsrYb64kz8gwW83MDDYDB8lefPS/3SsuTDyv7rF40NJPnaytOlbHom4yZP84qIf+ byTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si31614023pgv.541.2019.07.31.12.59.00; Wed, 31 Jul 2019 12:59:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726626AbfGaT7A (ORCPT + 1 other); Wed, 31 Jul 2019 15:59:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:45277 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbfGaT67 (ORCPT ); Wed, 31 Jul 2019 15:58:59 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1N1u2b-1iL0Pk2PAf-012FfM; Wed, 31 Jul 2019 21:58:21 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Felipe Balbi , Greg Kroah-Hartman Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , Alexandre Belloni , linux-kernel@vger.kernel.org Subject: [PATCH 02/14] usb: udc: lpc32xx: allow compile-testing Date: Wed, 31 Jul 2019 21:56:44 +0200 Message-Id: <20190731195713.3150463-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:owqhEQqZQOrw+U7JIsdudcOU30aZRR/RpfOBJiDYVq8lo61ITu6 OTJHhNMtclaN1XkeL+A2wFbBwyqNYCidX1WsSXk3+KA/6veguARtCTAz1ZYlhjxOmuApKns AuZqlZnGwsNqxk5F3v4MWhYGZB7bO18wtIZMCv99c9HjUdYOkCKOZGk9CoJxCPqMFHPItHh renz7Xxq+4kx8oJTEj0rA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Eh8z57l/pNI=:mdadUktRLMFk1jL652Ne7P zFXuP4XrT3hRm8cGQ1BHQgD8pF33SdZrY2CeyvfCTaJL3XiMrWJlhYVR9/OPlDkIHqDaLQf05 YSL6GiZFkj/XCDvN06vXcqVRCng/jk83sJH3teo1qmVc0vrX9/pUnEIvkcXPERea0ha3RFktU UXb17rrjEwJs6NR9YDO3zMVFN6WZUE6Yo5UbLZ3qBCvu1yCt5hhjyPSDahn8s4TtOGm9KlGwG wlrAaenzh59sLnunl4zylxv8iV/B0MiIbQ5dj01i02AIT16MbNf1YsMQkhry0/AlaIiNQUxZA EehYeeC7x2JEIwuvzAB3KSbmKSnraGIelW2iIXDvqU+yObF3KJa0xH/z6CXbo8SN10kL31zZ7 WUMoKPzLtgIpVrPtErO5npwMdgV1FM8rHxmFbF7Qa/v2h8l/gwi6hGSQXzgnTEt/GQ0yMyycC /odZo/ga1mREGA/9yc8PcSanC4lE8ERC/kepk7fFsc0kOpzh9v5NBE0Qcw1u51XNGbNomOUAl pjdXdQFD2yHEFm83pb9MAfq1ms9NrQouZnUVDXhB/oCpuktZrQwAzH2OoaKx5btmN8OSqmpV+ XALoHKf2pQ8OLObelggBk1g7puywQFXIHlO+yPoYaPI1KdqIy+1g1kDW2Uan5E/Lf5Z9dKB+h m+Y1f8dt6M2err8NjDHsx6rDyCKDMCN3Sz4QOl3JV9qVnrkQNdmjE1szvgBdAD/rFtX2m4p3o 3tNgu7MGtzFonhmt/Qe34m648mNxk6UJQabXqA== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The only thing that prevents building this driver on other platforms is the mach/hardware.h include, which is not actually used here at all, so remove the line and allow CONFIG_COMPILE_TEST. Signed-off-by: Arnd Bergmann --- drivers/usb/gadget/udc/Kconfig | 3 ++- drivers/usb/gadget/udc/lpc32xx_udc.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.20.0 diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig index ef0259a950ba..d354036ff6c8 100644 --- a/drivers/usb/gadget/udc/Kconfig +++ b/drivers/usb/gadget/udc/Kconfig @@ -45,7 +45,8 @@ config USB_AT91 config USB_LPC32XX tristate "LPC32XX USB Peripheral Controller" - depends on ARCH_LPC32XX && I2C + depends on ARCH_LPC32XX || COMPILE_TEST + depends on I2C select USB_ISP1301 help This option selects the USB device controller in the LPC32xx SoC. diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c index 5f1b14f3e5a0..4d8847988a50 100644 --- a/drivers/usb/gadget/udc/lpc32xx_udc.c +++ b/drivers/usb/gadget/udc/lpc32xx_udc.c @@ -35,8 +35,6 @@ #include #endif -#include - /* * USB device configuration structure */ From patchwork Wed Jul 31 19:56:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170212 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4433308ile; Wed, 31 Jul 2019 12:59:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiooIXIQppXg80ibptLj2QmTWwPhUTCYtpD/6Qiavn6q9tzKf/OhM7+U5BQQ3d/nmSTcpy X-Received: by 2002:aa7:86cc:: with SMTP id h12mr41831673pfo.2.1564603166210; Wed, 31 Jul 2019 12:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603166; cv=none; d=google.com; s=arc-20160816; b=AztK7IRVIv4fE5JhoG7DUIGOZPiu1fH/df8VA/SyLHFdoahs/0HTuu4hokUykR7/ne OgqBx1GvXii+SKThN+Vv85tT9qeqTmr92MInMdAisD9EWlJZHdLe9cr0B/96YyZRjLF6 Jbl8lmxOL5ocZU6xOOVIyap0XLHn6NAri4hBz14wdHsrDykH+AzwHDoxrFnQtEk5z1W+ +HXF7XEceiTPrL6CyOZ6BQf3SzHh8cNyWBRk/l4oWlTa60WId+ftTagPiYycUfC6/nC1 AFVKvuddWuz//K07Ul8tNMFUVUi/yZ0TbWEN/dZ7+NCYRVjf8j1rcmB+5VpKioFf1Y/M +BgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ro/pJaAdCIqlzCPU3Oj3CdAFP5kChXClDVXYqbqajeg=; b=aFsHvONs9GtYq3QXrExNvONkWPKCT+ecRoXRt8Mf83Ms5Jgv4Oqa2Jj/2doqwMMlbK E8TOTx4s5/XOb9bp7HPeEvxejy+qohvY5uW6w4X/HlX21yfl94hN3lOx/k3/TYm9mTmd 1eUf3Z8xPPHI+216kwpVEApidJWnwMN8seUXPfn18ydGUDELob2n3diasEtSGcnTa4Uy cP4IpE0tClsp8qLhwN5AZogRP22YJ1B2TKU2bU21LwNHM51z1GVfznAEmoKfg600s4HP EvbKye6FJzmveOYmRJE9Bod81jCSQ1vmLwwW0PVW3s7tJVaktGJMG1vOSQTMRLntsCX8 zCRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id br15si2178979pjb.13.2019.07.31.12.59.26; Wed, 31 Jul 2019 12:59:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728890AbfGaT7Z (ORCPT + 1 other); Wed, 31 Jul 2019 15:59:25 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:44131 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726755AbfGaT7Z (ORCPT ); Wed, 31 Jul 2019 15:59:25 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M60HD-1hzmMa1S2t-007WQU; Wed, 31 Jul 2019 21:58:51 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Wim Van Sebroeck , Guenter Roeck Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Greg Kroah-Hartman , Alan Stern , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 03/14] watchdog: pnx4008_wdt: allow compile-testing Date: Wed, 31 Jul 2019 21:56:45 +0200 Message-Id: <20190731195713.3150463-4-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:9yUamtnf2TIEri8xToHi2HP0bNeq2o/bMYTbPMW/vg0ZGIzRlVZ urODGWophHwj2kamStrDk3IZ7zSpCTCX5t4sMnfLpIcxs9wmaHvSSDo+bNqZzwGdy5UYYR9 e0Y4xZ9D2FHcXdSkv/oCMKk2yUHxFcbeBUTKPhHw7pX66dppRRr1TufSUvH+5QEVggfcs8Z 6oMvoTmm1FtZK8+0oW/wg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:klU/jRvYVso=:PV42qGK6cAWld/OjjZOFZ1 zGMpHnObvYTQrIpVxVh6vZz9g4QDbJfZyHjqGV0KF05shbnRpDiouYuKEl+7RdTrLXQfq6OUE 3iGxoYpQ3HBCtxT3DWbqWWLjzoj7ATK7zwEPmUzqzrqjdRYzJszfhNAkX2yI5YVG3GmeBz7yz 9RDZV4vuOZy22/0qG81uXna7kipOrx0kN2s5FikkKplOevEqJ5tLa4h47HbmthkC8KXX7zbgY pV8i3+EJvVZRSaDGhptWUul3T1jBR2b7BO9BWPZmbjlxSVhOASs7lsyj+eHcuceoXxIJkpoby 7jns4DopRRhHvLL9wlR9ZhyFDkRbdO10LDreatLj5aTesK9vI3kXEjSfxlHluovG3Sm6QKYRF SsmRaoxRh7iE87EyMCkT62zLke0BDT/e7RQv10/x5qVYHLOpOHtZfMVaeh4dcS60FyguGq1Fd 3ZzSA/0jVKSDYqdV5txFh/RZ4uwjHFxMsqS451Oz7732M9uDtqR/CDUNN+MlQKcXzJwbAGxMp dN/OymhwlkaxUFRN1E+sGRFvkVQ9MSPkAOc6KurE8C1j+ohNT7WqJgapbfcUiNpDiXpiDxUyg OGFd2tSeUG/ZzHAGSoQjoTxD08FMp+mpwJN3uF+xl+fiNsAqYJ3JEC4ZzIkQYYCsZHSoOrZhj +/i+eKY1tw950RZ1mXRqF+97hNuHJvmGGLacoaAjuOdNIxSHQXg065UQavatOfy/ovlux6y0Y LxMR5+Bjw4qB9h6YFWvXSUmP198oby4rMT3eBg== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The only thing that prevents building this driver on other platforms is the mach/hardware.h include, which is not actually used here at all, so remove the line and allow CONFIG_COMPILE_TEST. Signed-off-by: Arnd Bergmann --- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/pnx4008_wdt.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.20.0 diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8188963a405b..a45f9e3e442b 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -551,7 +551,7 @@ config OMAP_WATCHDOG config PNX4008_WATCHDOG tristate "LPC32XX Watchdog" - depends on ARCH_LPC32XX + depends on ARCH_LPC32XX || COMPILE_TEST select WATCHDOG_CORE help Say Y here if to include support for the watchdog timer diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 7b446b696f2b..e0ea133c1690 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -30,7 +30,6 @@ #include #include #include -#include /* WatchDog Timer - Chapter 23 Page 207 */ From patchwork Wed Jul 31 19:56:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170213 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4433963ile; Wed, 31 Jul 2019 13:00:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzA0bdNGptuB0F/MTbo5s7o7ka8oro1f7Gis4kGgS5A5CN3THKtm9nTo7+So+NQRpR0r3ju X-Received: by 2002:a17:902:8547:: with SMTP id d7mr124278090plo.171.1564603209317; Wed, 31 Jul 2019 13:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603209; cv=none; d=google.com; s=arc-20160816; b=fWdemYPaJTM3zy0SB18BiIdDaZwJqV33o4jPZI8MU2Nu8QpfbA4O7cdQxLWSoMQEhc ZiB3AKvjfq0QV+rrZ8WUwCfnN2ATZ0YPEjVyfNXoUS+BxvSuwMn9TzCdEysA5TPuAlTI 32/kS4Z+W3ft4IEMAJ91xg32FfRVzPvdWK8t72FQq6/2X5gy8jvXtlmaWHL1Wr9hXafM bl3/4EhUTtOvlCRZR1FjMazlBszx0mRdGcjf1vYqscEL7APQw83YwqlAiV0e6udKs/dE z0pMHNJotlFmTaxjjiHa+9F+GrsrByPxqy9/ScdIyUrGYg87q9lWVPCc925xET+b557z XYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WM6C+9Qsn02wmGI0WnDra9A7Auy34TyhLHakVGBoxkc=; b=yUTOmB4WGiDlmJL7DOklV47Wp7Qwn1sylYjwQ4Ob8MZNP8VrbRCCxmQ0Y089oq21Nw 6fQim1PfLPeEBhIhCVSRciChnrpDJHBZlGJDglwxeaPOawKy6uEY05nQl+3Y+zNYtpQq cWizKn2Qf963h4OCFyoZ5g2vj0NfssAXssgO3+Ge7a6VgJxagcQ1ZN9J+mfAWhAMFdpD btiMLQ+hscY+QVzxiAhr4ZfPfIMZoT7QFCkqsCYQplzOYMMhTUv9/ADsrx9Ai9Cy2p7Z xvUvmUxMxGPygfFH2+RDRZxO0aBystRMd9ICwTUeYv76g4K04DNuY1XW/2guIJQKjyoG c8wg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r11si9210400pgp.390.2019.07.31.13.00.09; Wed, 31 Jul 2019 13:00:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728157AbfGaUAI (ORCPT + 1 other); Wed, 31 Jul 2019 16:00:08 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:34817 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725793AbfGaUAI (ORCPT ); Wed, 31 Jul 2019 16:00:08 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mo6WJ-1ihbS32Skt-00pgri; Wed, 31 Jul 2019 21:59:24 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Greg Kroah-Hartman , Jiri Slaby Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 04/14] serial: lpc32xx_hs: allow compile-testing Date: Wed, 31 Jul 2019 21:56:46 +0200 Message-Id: <20190731195713.3150463-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:FgQXWHBg8JwiLqFUWJflxqSabbAP8JCw6bQWgIJ0su4bbGS+nRK 0kUqcrfqJfWTc10p+TkInneDvk18LhtSmF5HyllYlbCgM6NIe2ax1LYFHpLJUPtftTqVfHY LT8kDYequkxI5Lbi1wDejhDPoHyerdsb7xvK8eoFciT5n0YokYA8TO/pNPuR18xFg1KR67C ohO68gbXz9QjaHkKemAWQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:9zXs2NceyDg=:N9NkeMAe628aOvT2TIb/xb PWR1SJ+Jn/xnW7MzNM80nxT0HFhj0IH9hRJO7YpP3nO1nzkVmMIuBW8MfuEjzvna4yYuw/NrN Xdgphu9Ry1EE8S2qqTWWjhUDz545qonpnL1oJEOm/Hr5xdROH7H2WeLZJpQCtnxVxQ8Wh5hqY nU5h7ie3lhbyDKd1IWAhOejvlfNepdIKHF1pDyXuAnlgQUVMople/U1mBLmt0NoxdvF/6Mcer 8tH++YghoErbfk2yDkMI2HYS3ZeTBZRbPO2ZX3iDLbDarWtrQvzDqEVMyG8Y6EUmP0b4qyFjN PwLeOGDMs4lB0+cFHs97ILEblNeqmOzk14Ox/7D0BPmUuVaxPFJuCwl6Uh4bTDBi8TlEtcnsF qKLNzlhsV4qv+KM3IKY+XI8kOnePo6K95sFf+QHEEqVuX8oAp63/X9aVVWFpNTIHW6Va2GEm5 rWdpIHl6eOJoB+r3wgOJizmqDyGRWK5+D7E47X3Bac211kWk2upDTiYsqftygCXSHNH6sKjd1 AQJoQbtKh20u9ADOyh9GW2ko1Az6jrllCmcnPqt1XDs9uHtH/ygJG0Gn7GWFngWKjOpGMOcj0 CGy7SaTzt3GuiyKDn9gHxUEXhOjsb4aCnEX5bWyLhHzocWJcLWujmLb48VzchIKZJgwZWu7lf UkS5FB881G9+x8p0cLogi/HR4km/FxXNvseAnDybpGdJN33PMpOBWTcW0/y9Clg0W5ImRhw22 ktX8KghGubpyC+mg1c2YtkHDcs3NhemMbCnviw== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The only thing that prevents building this driver on other platforms is the mach/hardware.h include, which is not actually used here at all, so remove the line and allow CONFIG_COMPILE_TEST. Signed-off-by: Arnd Bergmann --- drivers/tty/serial/Kconfig | 3 ++- drivers/tty/serial/lpc32xx_hs.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.20.0 diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 3083dbae35f7..518aac902e4b 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -739,7 +739,8 @@ config SERIAL_PNX8XXX_CONSOLE config SERIAL_HS_LPC32XX tristate "LPC32XX high speed serial port support" - depends on ARCH_LPC32XX && OF + depends on ARCH_LPC32XX || COMPILE_TEST + depends on OF select SERIAL_CORE help Support for the LPC32XX high speed serial ports (up to 900kbps). diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c index f4e27d0ad947..7f14cd8fac47 100644 --- a/drivers/tty/serial/lpc32xx_hs.c +++ b/drivers/tty/serial/lpc32xx_hs.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include /* * High Speed UART register offsets From patchwork Wed Jul 31 19:56:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170214 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4434685ile; Wed, 31 Jul 2019 13:00:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDUsxHVawFz9SVi2vdLg/lomMhRLqcggyizaHVKrW4OGe70DnnRQx6ns65GY05+jdVGwPD X-Received: by 2002:aa7:9359:: with SMTP id 25mr47771794pfn.261.1564603242171; Wed, 31 Jul 2019 13:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603242; cv=none; d=google.com; s=arc-20160816; b=GGOLWz7WgsU3KfcelkXIVLWC8pRgouiQ4Izlqg/xf6Z72bBTjQXNDK/H1+KnwpayVA j3T3eJ8td1lkZS8UcMlvklCk0vwwsHD/Nww4KrdYphWIZOH+s80VFk2UAammABQy6Z6W kY1WDZ0V9PYNpTW29Tl3xhBb7MaYDcbt3Ms5otWXSkA+iZdBLPlFBG3dtYYPNLl++9yT 7R5s98mbeNMkpJF/f4T+U0+x91ofny+mul0yoIK2FKyWBz76tsQ9HZbhZ3aB7bQe8s4S +ZHLb3jye661r1n4l347K103qTuHulUoHIWz5zN6I6X98ktYAWq0WIHH+8uwptQSirV6 r5bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=294ZhmyY2l3qan8/Da1jCq7IwVqa1vI9tCxdzMvwmdk=; b=x6wyzYuDvDiztzpN4IqEEgi0yY6Ew+GcLa5WQ+C7yawvmNDe53jMcipaEOsvrHPsmi 3piCDOL114okqiCWj8R7udEpsK/vghDVzPfVYtsMEYOQnrbuO4UDfK8IKe0pB+fdTx+f npqaAVt6iK1csMzVPJa41n1ivDUhP2lptnhVWrE2gEN5VZo5R9YF8tFpYWF184vX4ne/ q5IXBzxLYobmIzFD5vQx5X1GK44XmBOLoy1UMAXmvIN4wSN/HkeLshNlKZqKVooMXVBP n5XA+85Ghm6p//Se9hQjbcfY3yEPGuofY7QIHT7DXOWXZOFdycBvDwtjjYcZj/1NSimv xS+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v66si33711218pgb.584.2019.07.31.13.00.41; Wed, 31 Jul 2019 13:00:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728050AbfGaUAl (ORCPT + 1 other); Wed, 31 Jul 2019 16:00:41 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:39563 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725793AbfGaUAl (ORCPT ); Wed, 31 Jul 2019 16:00:41 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MCGag-1i2EAl44sU-009SDz; Wed, 31 Jul 2019 22:00:02 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Bartosz Golaszewski Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Greg Kroah-Hartman , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , Lee Jones , linux-kernel@vger.kernel.org Subject: [PATCH 05/14] gpio: lpc32xx: allow building on non-lpc32xx targets Date: Wed, 31 Jul 2019 21:56:47 +0200 Message-Id: <20190731195713.3150463-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:nPvPw9YMOaGoeG2QbL6aN8onQhuRLs7PBsNyvS/8jeZPiB2gXYm WBvj7CT/LrcyNxXCQEKzNhWdVnnmj3/03xr+BhLaTsTY+gJMV1XVz9qEE2q+1RAjiL848GO 3ROgAwuwkP7DloHoG9cMXG3IMfqi20QeI7miijXlSompfK6pMA5NdVHjCuVTSMVNKQMHBQv ET5ttUT9J8Urs8rYK1wFQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:gPysoRTXsu8=:ez7tYz6ZrTKnZ1oPtqCtmg oO0Hqyg8T38hQ03POAmT8MiW64FttY5KCjqVWGK/r1ekR8Rv2ynx4MzliMVdJrRHNI4KWyMjH 58M9y1TxWf6YLBq8BEahuS1+AkO6hBPCyNXc8UUYb1+rqmqr9YSDzkLPUESlyK7lBpcurBh9J hHqMfUfNzY3hFNZ5ch0KJxZP9fCAO3t/qtfY3fSt4OtHgvJY//yWKPe7O3yOXVaY2Rs7EQ26u Fjk26HKsrY9t20yCK9YW5SsiD807oDapqJmc8NzKN+q0oth4f2DriZ3zugda8R+T/Vm5ysFnW vAJiq6zL8PP6UtQWYCx7Vnsj0gJlh7nfUEi4d8Rq+5r6Diub/Y7LGV3W9woilHpbn1hlKMW7l M8UF/nbKRI5SdgwesfA1zlEfFHs5HoiCymGjNLxG0Qp2rFAy++lwaCGliUTNKa2QO3DQbUDkQ M5xZDxk/BIxWh1fADMHgsaWeMWW3nYEezVOtSfOS2h+skjoAkAO7HKrTop4tseWsyBY72IW7c KaE7LeRGXpW9BNTQkLAYmE9wgJmvz67/+9Kl5OfEGpNKsgaDPc6szjLnyGhW6jht3FTUTEMID X/kj42BN3RY/hzSlfv73raCU2Xq0vCJs7YCWr6mYHwiX2jYchEN5NJfoStqIqAx+PVxTyqAW+ 5AJcLpb1KfXvWO8455Tl3pH9h4gTVhLpZBF22a28PG6WIZLG06/Bc8r4f+7hEx/d3Nsb+93ma QUIcMpyzg34VAK/EUMiXn3T8xZlYH1Yfx8URtQ== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The driver uses hardwire MMIO addresses instead of the data that is passed in device tree. Change it over to only hardcode the register offset values and allow compile-testing. Signed-off-by: Arnd Bergmann --- drivers/gpio/Kconfig | 8 +++++ drivers/gpio/Makefile | 2 +- drivers/gpio/gpio-lpc32xx.c | 63 ++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 23 deletions(-) -- 2.20.0 diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index bb13c266c329..ae86ee963eae 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -311,6 +311,14 @@ config GPIO_LPC18XX Select this option to enable GPIO driver for NXP LPC18XX/43XX devices. +config GPIO_LPC32XX + tristate "NXP LPC32XX GPIO support" + default ARCH_LPC32XX + depends on OF_GPIO && (ARCH_LPC32XX || COMPILE_TEST) + help + Select this option to enable GPIO driver for + NXP LPC32XX devices. + config GPIO_LYNXPOINT tristate "Intel Lynxpoint GPIO support" depends on ACPI && X86 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index a4e91175c708..87d659ae95eb 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -74,7 +74,7 @@ obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o -obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o +obj-$(CONFIG_GPIO_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c index 24885b3db3d5..548f7cb69386 100644 --- a/drivers/gpio/gpio-lpc32xx.c +++ b/drivers/gpio/gpio-lpc32xx.c @@ -16,8 +16,7 @@ #include #include -#include -#include +#define _GPREG(x) (x) #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004) @@ -72,12 +71,12 @@ #define LPC32XX_GPO_P3_GRP (LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX) struct gpio_regs { - void __iomem *inp_state; - void __iomem *outp_state; - void __iomem *outp_set; - void __iomem *outp_clr; - void __iomem *dir_set; - void __iomem *dir_clr; + unsigned long inp_state; + unsigned long outp_state; + unsigned long outp_set; + unsigned long outp_clr; + unsigned long dir_set; + unsigned long dir_clr; }; /* @@ -167,14 +166,26 @@ struct lpc32xx_gpio_chip { struct gpio_regs *gpio_grp; }; +void __iomem *gpio_reg_base; + +static inline u32 gpreg_read(unsigned long offset) +{ + return __raw_readl(gpio_reg_base + offset); +} + +static inline void gpreg_write(u32 val, unsigned long offset) +{ + __raw_writel(val, gpio_reg_base + offset); +} + static void __set_gpio_dir_p012(struct lpc32xx_gpio_chip *group, unsigned pin, int input) { if (input) - __raw_writel(GPIO012_PIN_TO_BIT(pin), + gpreg_write(GPIO012_PIN_TO_BIT(pin), group->gpio_grp->dir_clr); else - __raw_writel(GPIO012_PIN_TO_BIT(pin), + gpreg_write(GPIO012_PIN_TO_BIT(pin), group->gpio_grp->dir_set); } @@ -184,19 +195,19 @@ static void __set_gpio_dir_p3(struct lpc32xx_gpio_chip *group, u32 u = GPIO3_PIN_TO_BIT(pin); if (input) - __raw_writel(u, group->gpio_grp->dir_clr); + gpreg_write(u, group->gpio_grp->dir_clr); else - __raw_writel(u, group->gpio_grp->dir_set); + gpreg_write(u, group->gpio_grp->dir_set); } static void __set_gpio_level_p012(struct lpc32xx_gpio_chip *group, unsigned pin, int high) { if (high) - __raw_writel(GPIO012_PIN_TO_BIT(pin), + gpreg_write(GPIO012_PIN_TO_BIT(pin), group->gpio_grp->outp_set); else - __raw_writel(GPIO012_PIN_TO_BIT(pin), + gpreg_write(GPIO012_PIN_TO_BIT(pin), group->gpio_grp->outp_clr); } @@ -206,31 +217,31 @@ static void __set_gpio_level_p3(struct lpc32xx_gpio_chip *group, u32 u = GPIO3_PIN_TO_BIT(pin); if (high) - __raw_writel(u, group->gpio_grp->outp_set); + gpreg_write(u, group->gpio_grp->outp_set); else - __raw_writel(u, group->gpio_grp->outp_clr); + gpreg_write(u, group->gpio_grp->outp_clr); } static void __set_gpo_level_p3(struct lpc32xx_gpio_chip *group, unsigned pin, int high) { if (high) - __raw_writel(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_set); + gpreg_write(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_set); else - __raw_writel(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_clr); + gpreg_write(GPO3_PIN_TO_BIT(pin), group->gpio_grp->outp_clr); } static int __get_gpio_state_p012(struct lpc32xx_gpio_chip *group, unsigned pin) { - return GPIO012_PIN_IN_SEL(__raw_readl(group->gpio_grp->inp_state), + return GPIO012_PIN_IN_SEL(gpreg_read(group->gpio_grp->inp_state), pin); } static int __get_gpio_state_p3(struct lpc32xx_gpio_chip *group, unsigned pin) { - int state = __raw_readl(group->gpio_grp->inp_state); + int state = gpreg_read(group->gpio_grp->inp_state); /* * P3 GPIO pin input mapping is not contiguous, GPIOP3-0..4 is mapped @@ -242,13 +253,13 @@ static int __get_gpio_state_p3(struct lpc32xx_gpio_chip *group, static int __get_gpi_state_p3(struct lpc32xx_gpio_chip *group, unsigned pin) { - return GPI3_PIN_IN_SEL(__raw_readl(group->gpio_grp->inp_state), pin); + return GPI3_PIN_IN_SEL(gpreg_read(group->gpio_grp->inp_state), pin); } static int __get_gpo_state_p3(struct lpc32xx_gpio_chip *group, unsigned pin) { - return GPO3_PIN_IN_SEL(__raw_readl(group->gpio_grp->outp_state), pin); + return GPO3_PIN_IN_SEL(gpreg_read(group->gpio_grp->outp_state), pin); } /* @@ -498,6 +509,10 @@ static int lpc32xx_gpio_probe(struct platform_device *pdev) { int i; + gpio_reg_base = devm_platform_ioremap_resource(pdev, 0); + if (gpio_reg_base) + return -ENXIO; + for (i = 0; i < ARRAY_SIZE(lpc32xx_gpiochip); i++) { if (pdev->dev.of_node) { lpc32xx_gpiochip[i].chip.of_xlate = lpc32xx_of_xlate; @@ -527,3 +542,7 @@ static struct platform_driver lpc32xx_gpio_driver = { }; module_platform_driver(lpc32xx_gpio_driver); + +MODULE_AUTHOR("Kevin Wells "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("GPIO driver for LPC32xx SoC"); From patchwork Wed Jul 31 19:56:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170219 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4438589ile; Wed, 31 Jul 2019 13:03:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwW3FqU7N/dxeYPQI36iY88i2G8QHem5JHPchsSr6GmoYt6jQUQ2c1wH03WSHxGQ5JuEteX X-Received: by 2002:a17:902:b70c:: with SMTP id d12mr117216651pls.314.1564603427140; Wed, 31 Jul 2019 13:03:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603427; cv=none; d=google.com; s=arc-20160816; b=G0CfUfyKeA5/st/5CufNE95qKLXsn7gWgTQ6RWLgxgxv70pP0VR+lHj6KXDhrvlWAi lToMOD9xFWR50HXd/k3pogMuIK0iL2mTfWzSnvEF3Teb+3qmUA/Kx80rEwPbjYWjaNGI 0btZi0Waj+aTtqRoejx28Cyv7jRXwpRDD5EFm9d6WOPV3HI4lu+Jklw3oIYZ0xyLibWa snbgQKcNJaW8gQz72Kfxtf9188eY2ynPUe8Xl/dLDobyoVJncJN1pMlEMZQqar9ptyvq Ln4QbhLxS5fc5bf/ZGzJxRxifVzaRWN2UWweyqmN7gB5hd7yDbxXBMFui3HdLaj+CA1l Y5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0roY5jHNiendS4HVDKkHP+N8cME7V55us0X4aIU6Wu4=; b=R0r5UIH/jfzaBTMdUjX02fp7p1acRtzw8ep0UfAJY99M6zqLiNQgJxJlwzDL5SfB2f MupU6Mxjyan8xqaaMGKi5RNTec9oyq4PeTFZO+cNRXxAXJJ7cPqhue/GtEi8PTuZN+lJ vcNTOzUKZkOV3JVxYQqcseJjevifTtShL1KI+0ZfhprE+QZcF7cQjC+TxgPD6eX7XKOt eFM9Sm7U5dwau9MROyUz13F3IdtZRHuUPpTLdKUy2G/LkwxDDxQF+MqhR5xdS/ErT16Y v75i/ND0KVOFryluRM62WIxqtbRo7F0xWR+Azob0dmdsQHERNn5f8DDxv1wnHr5lWyws kJ6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cj12si30949635plb.237.2019.07.31.13.03.46; Wed, 31 Jul 2019 13:03:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726712AbfGaUDq (ORCPT + 1 other); Wed, 31 Jul 2019 16:03:46 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52173 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726594AbfGaUDq (ORCPT ); Wed, 31 Jul 2019 16:03:46 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1Movrq-1iiz0R3bLi-00qWDH; Wed, 31 Jul 2019 22:02:57 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Greg Kroah-Hartman , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 10/14] ARM: lpc32xx: clean up header files Date: Wed, 31 Jul 2019 21:56:52 +0200 Message-Id: <20190731195713.3150463-11-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:/LhIgzDOVG5Q+X9XFfAhbZFk3l12JGjC84UmS1anNS/jA7+748N Y9tWamhprDvlrPz56AFbX3QzdSJ+M+7noEtpgxuax8FHc2708BPrBKKezAw1psuugfdsrRh MQhFtQ6ZWKDowzyFxjiE0TsIp+VEIviu7/lI3Y6zb1FiElIS3W9RHAsYr035BupH1spFCaS DpfdGbEgRDrjcHHtDS+vA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:PJ0dxqaWcWg=:eeSvLeu1RyA7KZHoSWuHN3 iBhmJHidpvs265m8g/hMFm8qKWd6XEFB1nyNfzGO5Qj1k6ScExPk8MjJGdGzD6YL2mryZE4F0 OXXwa0FUlRrhvw7ESd4BtUxy8+re7W/mqpEGhczf+oj3uQDOVmA5E4ymlpUlBOiiVKLF88Yv4 p2pwVfG7N43qybeqtBNqeunSt89HTYditI9hORMkEYPnsbwtOLUBrTb7oRpZZlhVZMSJ2CMHg qYpc3KICHU0dZk8DEtwXL8xgzkVtZ5P3nZ5YpE3U0j8UM1QQE/fgNC0IL6M3zIapw+kYrOVfh jzcZ4dX/wXiCwCcktb8ZaBJIbr8pWgQFeXlKlUS1xwjRnGeIpXCavYbgNtGLSUpQC0BbF18ji xHL004ivie5brPONQsEKo8c1cJ04pYQUWWz+g5zqXa0rrzQ5j6iCwBgC6LwPORVcEq6PrGgGR XRXkz5A35HNDPDFQrR5Pj7OchzTc7rBMTWgHVa5R9vxVgqG8HAbnUOHOuVeA4YmPJZXS0FKyb fEPPF7J3XCEyaaJpx6Yu4YOnT2ksxx34lUJ+pXjsUqlo/AQXNeDg7KRvBdp+uhfmkqRChr7J6 5Ge1OwuuBYggQtkv3fXqElSPJRrBmxmAY2UTEKUM+h8geaG7yPl2t5BR/tf4WjDpR91b7w7p8 2dyVGzqUe5LSGPv4S8y9GTUQFtEioqrjduZhwjsR5mr0GYMg1LIG44UM+JuWeXR1Jwxep7hi8 HQaPWuoy8C7lbeIEkj9K43J/ShhIeqTwCT91Mg== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org All device drivers have stopped relying on mach/*.h headers, so move the remaining headers into arch/arm/mach-lpc32xx/lpc32xx.h to prepare for multiplatform builds. The mach/entry-macro.S file has been unused for a long time now and can simply get removed. Signed-off-by: Arnd Bergmann --- arch/arm/mach-lpc32xx/common.c | 3 +- .../mach-lpc32xx/include/mach/entry-macro.S | 28 ------------------- arch/arm/mach-lpc32xx/include/mach/hardware.h | 25 ----------------- .../mach-lpc32xx/include/mach/uncompress.h | 4 +-- .../{include/mach/platform.h => lpc32xx.h} | 18 ++++++++++-- arch/arm/mach-lpc32xx/pm.c | 3 +- arch/arm/mach-lpc32xx/serial.c | 3 +- arch/arm/mach-lpc32xx/suspend.S | 3 +- 8 files changed, 21 insertions(+), 66 deletions(-) delete mode 100644 arch/arm/mach-lpc32xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-lpc32xx/include/mach/hardware.h rename arch/arm/mach-lpc32xx/{include/mach/platform.h => lpc32xx.h} (98%) -- 2.20.0 Acked-by: Sylvain Lemieux diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index a475339333c1..304ea61a0716 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -13,8 +13,7 @@ #include #include -#include -#include +#include "lpc32xx.h" #include "common.h" /* diff --git a/arch/arm/mach-lpc32xx/include/mach/entry-macro.S b/arch/arm/mach-lpc32xx/include/mach/entry-macro.S deleted file mode 100644 index eec0f5f7e722..000000000000 --- a/arch/arm/mach-lpc32xx/include/mach/entry-macro.S +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * arch/arm/mach-lpc32xx/include/mach/entry-macro.S - * - * Author: Kevin Wells - * - * Copyright (C) 2010 NXP Semiconductors - */ - -#include -#include - -#define LPC32XX_INTC_MASKED_STATUS_OFS 0x8 - - .macro get_irqnr_preamble, base, tmp - ldr \base, =IO_ADDRESS(LPC32XX_MIC_BASE) - .endm - -/* - * Return IRQ number in irqnr. Also return processor Z flag status in CPSR - * as set if an interrupt is pending. - */ - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \irqstat, [\base, #LPC32XX_INTC_MASKED_STATUS_OFS] - clz \irqnr, \irqstat - rsb \irqnr, \irqnr, #31 - teq \irqstat, #0 - .endm diff --git a/arch/arm/mach-lpc32xx/include/mach/hardware.h b/arch/arm/mach-lpc32xx/include/mach/hardware.h deleted file mode 100644 index 4866f096ffce..000000000000 --- a/arch/arm/mach-lpc32xx/include/mach/hardware.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * arch/arm/mach-lpc32xx/include/mach/hardware.h - * - * Copyright (c) 2005 MontaVista Software, Inc. - */ - -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H - -/* - * Start of virtual addresses for IO devices - */ -#define IO_BASE 0xF0000000 - -/* - * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 - */ -#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ - IO_BASE) - -#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x)) -#define io_v2p(x) ((((x) & 0x0ff00000) << 4) | ((x) & 0x000fffff)) - -#endif diff --git a/arch/arm/mach-lpc32xx/include/mach/uncompress.h b/arch/arm/mach-lpc32xx/include/mach/uncompress.h index a568812a0b91..74b7aa0da0e4 100644 --- a/arch/arm/mach-lpc32xx/include/mach/uncompress.h +++ b/arch/arm/mach-lpc32xx/include/mach/uncompress.h @@ -12,15 +12,13 @@ #include -#include -#include - /* * Uncompress output is hardcoded to standard UART 5 */ #define UART_FIFO_CTL_TX_RESET (1 << 2) #define UART_STATUS_TX_MT (1 << 6) +#define LPC32XX_UART5_BASE 0x40090000 #define _UARTREG(x) (void __iomem *)(LPC32XX_UART5_BASE + (x)) diff --git a/arch/arm/mach-lpc32xx/include/mach/platform.h b/arch/arm/mach-lpc32xx/lpc32xx.h similarity index 98% rename from arch/arm/mach-lpc32xx/include/mach/platform.h rename to arch/arm/mach-lpc32xx/lpc32xx.h index 1c53790444fc..5eeb884a1993 100644 --- a/arch/arm/mach-lpc32xx/include/mach/platform.h +++ b/arch/arm/mach-lpc32xx/lpc32xx.h @@ -7,8 +7,8 @@ * Copyright (C) 2010 NXP Semiconductors */ -#ifndef __ASM_ARCH_PLATFORM_H -#define __ASM_ARCH_PLATFORM_H +#ifndef __ARM_LPC32XX_H +#define __ARM_LPC32XX_H #define _SBF(f, v) ((v) << (f)) #define _BIT(n) _SBF(n, 1) @@ -700,4 +700,18 @@ #define LPC32XX_USB_OTG_DEV_CLOCK_ON _BIT(1) #define LPC32XX_USB_OTG_HOST_CLOCK_ON _BIT(0) +/* + * Start of virtual addresses for IO devices + */ +#define IO_BASE 0xF0000000 + +/* + * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 + */ +#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ + IO_BASE) + +#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x)) +#define io_v2p(x) ((((x) & 0x0ff00000) << 4) | ((x) & 0x000fffff)) + #endif diff --git a/arch/arm/mach-lpc32xx/pm.c b/arch/arm/mach-lpc32xx/pm.c index 32bca351a73b..b27fa1b9f56c 100644 --- a/arch/arm/mach-lpc32xx/pm.c +++ b/arch/arm/mach-lpc32xx/pm.c @@ -70,8 +70,7 @@ #include -#include -#include +#include "lpc32xx.h" #include "common.h" #define TEMP_IRAM_AREA IO_ADDRESS(LPC32XX_IRAM_BASE) diff --git a/arch/arm/mach-lpc32xx/serial.c b/arch/arm/mach-lpc32xx/serial.c index cfb35e5691cd..3e765c4bf986 100644 --- a/arch/arm/mach-lpc32xx/serial.c +++ b/arch/arm/mach-lpc32xx/serial.c @@ -16,8 +16,7 @@ #include #include -#include -#include +#include "lpc32xx.h" #include "common.h" #define LPC32XX_SUART_FIFO_SIZE 64 diff --git a/arch/arm/mach-lpc32xx/suspend.S b/arch/arm/mach-lpc32xx/suspend.S index 374f9f07fe48..3f0a8282ef6f 100644 --- a/arch/arm/mach-lpc32xx/suspend.S +++ b/arch/arm/mach-lpc32xx/suspend.S @@ -11,8 +11,7 @@ */ #include #include -#include -#include +#include "lpc32xx.h" /* Using named register defines makes the code easier to follow */ #define WORK1_REG r0 From patchwork Wed Jul 31 19:56:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170220 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4439581ile; Wed, 31 Jul 2019 13:04:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzeHRLsw5T1Cqj6miIxOrSm+3I4tsQNnkLbW7EI1zMJ5/URA6v+qrJq+Wr+2mb6piD2ncfv X-Received: by 2002:a17:90a:970a:: with SMTP id x10mr4690533pjo.12.1564603474528; Wed, 31 Jul 2019 13:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603474; cv=none; d=google.com; s=arc-20160816; b=ygWYCOyWpSNh+P4T2lSJ3q1ZGehfj4MXHWRgevmLi2U58toe0wOCmnwuShxoY6vdFo G0YqcErQwVbN/JtUSjB+fPEX+CieyLG9vqJ4ch7rJagLiA6zMDgN5ELcw1k/Ud15poO8 OweJ5XrhHexgwe4ObG4e4fjSKxJ5yMq7LeKoZmNsYPJ4hEVSRnDte5xZ6cf6SV25hncR C3RREJwrGWeprrxQZTTXXWlTtrtmjR2pZvq86KvxrjKe7arA7viAS/zXgq3pxbdlEt35 YIp6de2OfR3EUbRaJB+vXcaf97FjnXFNkYLoq+n+e/oTf7gWOmhRCR7+nxy2/Udi8Z2G 1Sxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xxk+0FTW8AOw+kJHz6X0HF9sjwM1llwYYUY86nK+tOY=; b=pGh7ZVJpXKntO5X/LJeyuxB2qUs7pTIII0Y/NsRXtSPDYtQugZvLo4BKyfKfo7/S30 U7CgDaT0vOfv3SBfI+b2wu9MnfH+TmVEUOlrI9SjvtewTc7LqIw519a+2xvDaXh6Fn2l aT2dc6SH9ou1dVmd1xR8sMSuh8uXEgJcgSLy/LKQiMnbZGkNRscw4XaissNT3E5s59mD /ZsZrpoEqLYmAKEBFDSDFnMVv64q0Fgvs3pzwroVxKwbI27Dgr42ShCJ66h1Y0hBxV3Q 97udL/pcyqsSIbxBBQ8m/Uitj8sbcG2toSkmvAxsnGKlM1u1qRF8JQ87tNkV9oYTmKpS Qqnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q32si32774983pgm.544.2019.07.31.13.04.34; Wed, 31 Jul 2019 13:04:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727614AbfGaUEd (ORCPT + 1 other); Wed, 31 Jul 2019 16:04:33 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51389 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726908AbfGaUEb (ORCPT ); Wed, 31 Jul 2019 16:04:31 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MG90u-1i9MpD1XiO-00GdEL; Wed, 31 Jul 2019 22:03:55 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , "David S. Miller" , Greg Kroah-Hartman , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 11/14] ARM: lpc32xx: allow multiplatform build Date: Wed, 31 Jul 2019 21:56:53 +0200 Message-Id: <20190731195713.3150463-12-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:gID4RNpoX8Zy0tyRqB2A6yiPGJfcnxOOAaqeCpDCy5//AbU5fC+ Aq2RaOrGEVpMj/GW50xVSsjfcw1hj8Jqyy4sqmlL5C6GhIiSItYASN6wS4s0tJsnDSxDQGU 4cCKMnrp63iGJZf5+t0aWd3WlnBJDiiqakf3ozIiK3SnkTBYlqu6XZBcE3yOVYjdk8f1wxt jiefSp6XmrWvYU+WhrFqw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:eM8z4Th1230=:8gdVoiZjbL4WjyeaVcDmZr cpT0mCOoqZv4Cg0/dVlx28ZgDrevnB1uhSfamTVZMiViwm8GrOEJOg+bFuHgn0vUrAk64Eqzz dVnc+ygDk1KuMm0rOh3zEW2GPfr6AOumDW4SvzirTizwdiFGhBBf7jlqUYHzUVWsghQXkzC/6 X7rra8A4a09pZwHwUgQlDzt0cCEklYGimCBI4EsB9yaE0KENJj6skQJ5A2DCvdgcsb91AUkaf YP6QPfGJVColH35OSiBK+ZJXoNrj4ZvouhJc6jwgVvT5I47YZMoKIasuvvx6PmMa0D6DwxK17 3EsEOsRjZ3J+1pibA4uOuRZc7BKfB1zT75NkQSZF8qF7Ds7mY17jzHB0Ip4fk2ozwRBi4gIMB 9wCwQ7CvKSk/fe6RwLXPEw0QyWUCAE8FRGGmyzDKLWvG1qdoGTaMrxi2LNNrEhnNm0sIcU2Sr 4XP4mPbBJSpLb9J64YnV6PGs2fSYsA2aemNk7Wir4NJng1/wG/yqnA8G5sznbsj3sxiVnV1I1 rgq0vyKXldZvGlemusABzGEHSy3Mmd/E/e2+/BoKCioKYR1/lbn1nUDc6+h1BMBxGi8UkK/xm oQKxXdz/IguWloG6WLtpRPhsKUYhMexLuxanjICeC0MeBV1UYH0iJqH1NqfIwRxiCYVGbEzJL yEv38bGmbbOzDxt69iUvf+vr58AmBAm2WH67COjQgbWNFuTIn1dy9+05xd/GlTOFNMrlhMFmP rmRjILq3mssWIPxPDOxj/xJzsX0Dnu+IBGzyww== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org All preparation work is done, so the platform can finally be moved into ARCH_MULTIPLATFORM. This requires a small change to the defconfig file to enable the platform. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 17 +------ arch/arm/configs/lpc32xx_defconfig | 1 + arch/arm/mach-lpc32xx/Kconfig | 11 +++++ .../mach-lpc32xx/include/mach/uncompress.h | 48 ------------------- 4 files changed, 14 insertions(+), 63 deletions(-) create mode 100644 arch/arm/mach-lpc32xx/Kconfig delete mode 100644 arch/arm/mach-lpc32xx/include/mach/uncompress.h -- 2.20.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 33b00579beff..65808e17cb3b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -478,21 +478,6 @@ config ARCH_W90X900 -config ARCH_LPC32XX - bool "NXP LPC32XX" - select ARM_AMBA - select CLKDEV_LOOKUP - select CLKSRC_LPC32XX - select COMMON_CLK - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select GENERIC_IRQ_MULTI_HANDLER - select GPIOLIB - select SPARSE_IRQ - select USE_OF - help - Support for the NXP LPC32XX family of processors - config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU @@ -746,6 +731,8 @@ source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-ks8695/Kconfig" +source "arch/arm/mach-lpc32xx/Kconfig" + source "arch/arm/mach-mediatek/Kconfig" source "arch/arm/mach-meson/Kconfig" diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig index 0cdc6c7974b3..2d75bd8dbaf0 100644 --- a/arch/arm/configs/lpc32xx_defconfig +++ b/arch/arm/configs/lpc32xx_defconfig @@ -12,6 +12,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_SLAB=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_LPC32XX=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/arch/arm/mach-lpc32xx/Kconfig b/arch/arm/mach-lpc32xx/Kconfig new file mode 100644 index 000000000000..ec87c65f4536 --- /dev/null +++ b/arch/arm/mach-lpc32xx/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config ARCH_LPC32XX + bool "NXP LPC32XX" + depends on ARCH_MULTI_V5 + select ARM_AMBA + select CLKSRC_LPC32XX + select CPU_ARM926T + select GPIOLIB + help + Support for the NXP LPC32XX family of processors diff --git a/arch/arm/mach-lpc32xx/include/mach/uncompress.h b/arch/arm/mach-lpc32xx/include/mach/uncompress.h deleted file mode 100644 index 74b7aa0da0e4..000000000000 --- a/arch/arm/mach-lpc32xx/include/mach/uncompress.h +++ /dev/null @@ -1,48 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * arch/arm/mach-lpc32xx/include/mach/uncompress.h - * - * Author: Kevin Wells - * - * Copyright (C) 2010 NXP Semiconductors - */ - -#ifndef __ASM_ARM_ARCH_UNCOMPRESS_H -#define __ASM_ARM_ARCH_UNCOMPRESS_H - -#include - -/* - * Uncompress output is hardcoded to standard UART 5 - */ - -#define UART_FIFO_CTL_TX_RESET (1 << 2) -#define UART_STATUS_TX_MT (1 << 6) -#define LPC32XX_UART5_BASE 0x40090000 - -#define _UARTREG(x) (void __iomem *)(LPC32XX_UART5_BASE + (x)) - -#define LPC32XX_UART_DLLFIFO_O 0x00 -#define LPC32XX_UART_IIRFCR_O 0x08 -#define LPC32XX_UART_LSR_O 0x14 - -static inline void putc(int ch) -{ - /* Wait for transmit FIFO to empty */ - while ((__raw_readl(_UARTREG(LPC32XX_UART_LSR_O)) & - UART_STATUS_TX_MT) == 0) - ; - - __raw_writel((u32) ch, _UARTREG(LPC32XX_UART_DLLFIFO_O)); -} - -static inline void flush(void) -{ - __raw_writel(__raw_readl(_UARTREG(LPC32XX_UART_IIRFCR_O)) | - UART_FIFO_CTL_TX_RESET, _UARTREG(LPC32XX_UART_IIRFCR_O)); -} - -/* NULL functions; we don't presently need them */ -#define arch_decomp_setup() - -#endif From patchwork Wed Jul 31 19:56:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170223 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4442260ile; Wed, 31 Jul 2019 13:06:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrd8wFdmOVzwATca+WJ+CvBeySD7yKx5nYFMR3JfwqHEZskdaCvZCgQ7E8qN8e10+MVGrt X-Received: by 2002:a17:902:9896:: with SMTP id s22mr116605461plp.4.1564603614431; Wed, 31 Jul 2019 13:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564603614; cv=none; d=google.com; s=arc-20160816; b=X6SKcVEg0YuDF7HRc2cfLN8PhXotidzqgDc0j2KAx29CuZyxja3t0Em2Zoz/1fEaaQ EkAKJvm4Z8ZSs2V1GLcAfkgd+eHakyblzzbcyL/zKQQXGL/ffhGdxlsKRUgFBrGPqJ8U +PE2OMAcoM5TebmPpv8nSRbcTn8Lhrl8Q02SD3H7A+7EjijFnR3I6S2XR0y/45QlO+Xq AvbdFRGZDGu9BkaTLm3HrnoZB6Gyr4G0UBtP0g53dhptXRLUtRuum+Yb3FQWsHRM9MNe 1ZgJYqlTUxG2Z3b4rczdaBQpvWw3EmTYVSeZPIodbAmriAwaeJgcoAl5gvdEgtyThtGY Vd5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0dTF9twuF8t+k1FjDhzyHQT8RuzjxGQu+qBsr2c3YsA=; b=nrRoJVdv0yDuLEd1/Z5Sx6F2pU0KLKDXOBCYezIu0e0zw7XvORhDZ40d2BEbv0Esx3 1cff/uYCgYMhirBDr0ZZF4Zz+yYoBUQBTZ+Pqo7wW2xLidgOw/2SoEkR9uhPrKTp202y M+HxzXQclo36oz9W7j/FnocTY9hGuiOtu/xxOuyBM0ACz0ScWDiTUAjaW11nYb/b4Tbd GA0UdxTEpTGxsybAox0UnKZvanII+j8Mv8L0h0596XXFtsfxfoO6GtdS4Lt+vareDwkX 3aT0Lzxraff9bjV61J5Rr69EZytkX/uZzi+eqR3kcx8KbG0JtKSIGy6km3U0tOy1MtMg ZaJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r17si32633247pgg.155.2019.07.31.13.06.54; Wed, 31 Jul 2019 13:06:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728475AbfGaUGx (ORCPT + 1 other); Wed, 31 Jul 2019 16:06:53 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:37725 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726079AbfGaUGx (ORCPT ); Wed, 31 Jul 2019 16:06:53 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M2xjg-1hwDiO0mU8-003Ngr; Wed, 31 Jul 2019 22:06:16 +0200 From: Arnd Bergmann To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy , Sylvain Lemieux , Russell King , Gregory Clement , Linus Walleij , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth Cc: "David S. Miller" , Greg Kroah-Hartman , Alan Stern , Guenter Roeck , linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-watchdog@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 14/14] ARM: dove: multiplatform support Date: Wed, 31 Jul 2019 21:56:56 +0200 Message-Id: <20190731195713.3150463-15-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190731195713.3150463-1-arnd@arndb.de> References: <20190731195713.3150463-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:85eWple6ACFlHQs06NQni6QWzJNxZWtwqV4c+ZTQxKwOfP+LnNf Lo+nP8CqmtyadmCr5iK1lbOIRMLVN71eEsKpshA+Ky2uivTEFWNNmUBZ0INsQeQSIulmCDj 6Yw/3jn/RXHZcg+SF0zv3g5krRPaHxNxLdRENv5pFB41mAMzH2YeVJxvloQsLzerDfNow2K /PmOUgDhr30s+fjeYcS2Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ImgMlleMZiY=:/760y3qKqIc1sQDa49JSUQ YKUdYsdG5yy5b3Ks+fhV9CDyqe1+FeYnfRJOJCA8xzADRU41LnuYp5OLWw1QrW30GCNprqgOS iJUd9/YYnbqcQfbI/BJ2cFBlP7ZCDiT/kHH/Jk96dOFeZ8mU8sosbwAvD2Grv7h4RbH6nRvv5 zqF9ux+VB38DYe66bu03i4EbqSf+oHfEnmwrDZzW5ronWfCcrRqoKWHyVHCvicWLMby/Vomv6 bkbpADKbxwZbAIGelenCTzqa25zwrVbencKpdNspNCufWZwrqeb8DZL70FbFE2q62PfFIM1VT 9/EVKbWXtXRvSjgRKhOm2rYPdZV9pijB3THCtFNGD9pwnhx2czwCRx6Ax6N7ClYt8AZRedXfn g00DAep7mEOlLZPNvJy+kvT2YQueVFyehTpFFNKTcPe0Kdni+mW/3ZuyjKPiqCe0xnGqb4LtI TmFAql3hv/jl7XKDP7t1Pyi0rp0hEp9cCoiphO2BvLWDTsHclXJQ7FY99rO/N3FIK60HPc/px DMtgxO35opTCU8esYbZ3O10lRTFI/Sw7z7m0IqTJvtJabEbMyMrc5k6k2/3HZTjSvqzRRXYWB gkDBDcjpjwnEKJaWy/wff/vXeCH04pN3ae+x4Q05tFUjT6jR0X05IdnySaSbEuV0QAsTAHPJA En0+5mU1BLy5/YfBR3Rkiqyr9sYY7qrkXhE/6SejhNwAq5rCdVGTaZi4ZJfBbqA+ylskRGiT+ KVOq3DVl3VZjk34f09HAvxDEAQepsGpAqIlSkQ== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The dove platform is now ready to be enabled for multiplatform support, this patch does the switch over by modifying the Kconfig file, the defconfig and removing the last mach/*.h header that becomes obsolete with this. This work was originally done in 2015 as all the ARMv7 machiens gove moved over to multiplatform builds, but at the time it conflicted with some patches that Russell was trying to upstream, so we left it at that. I hope that there is no longer a need to keep dove separate from the rest, so we can either add it to the other ARMv7 platforms, or just replace it with the DT based platform code for the same hardware in mach-mvebu and remove mach-dove entirely. Acked-by: Andrew Lunn Cc: Russell King Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 16 --------- arch/arm/configs/dove_defconfig | 2 ++ arch/arm/mach-dove/Kconfig | 16 ++++++--- arch/arm/mach-dove/Makefile | 2 ++ arch/arm/mach-dove/include/mach/uncompress.h | 34 -------------------- 5 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h -- 2.20.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 65808e17cb3b..67f98f1ab399 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -435,22 +435,6 @@ config ARCH_IXP4XX help Support for Intel's IXP4XX (XScale) family of processors. -config ARCH_DOVE - bool "Marvell Dove" - select CPU_PJ4 - select GENERIC_CLOCKEVENTS - select GENERIC_IRQ_MULTI_HANDLER - select GPIOLIB - select HAVE_PCI - select MVEBU_MBUS - select PINCTRL - select PINCTRL_DOVE - select PLAT_ORION_LEGACY - select SPARSE_IRQ - select PM_GENERIC_DOMAINS if PM - help - Support for the Marvell Dove SoC 88AP510 - config ARCH_KS8695 bool "Micrel/Kendin KS8695" select CLKSRC_MMIO diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index e70c997d5f4c..1ced32deac75 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -8,6 +8,8 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_DOVE=y CONFIG_MACH_DOVE_DB=y CONFIG_MACH_CM_A510=y diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 7747fe64420a..c30c69c664ea 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -1,7 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 -if ARCH_DOVE +menuconfig ARCH_DOVE + bool "Marvell Dove" if ARCH_MULTI_V7 + select CPU_PJ4 + select GPIOLIB + select MVEBU_MBUS + select PINCTRL + select PINCTRL_DOVE + select PLAT_ORION_LEGACY + select PM_GENERIC_DOMAINS if PM + help + Support for the Marvell Dove SoC 88AP510 -menu "Marvell Dove Implementations" +if ARCH_DOVE config DOVE_LEGACY bool @@ -21,6 +31,4 @@ config MACH_CM_A510 Say 'Y' here if you want your kernel to support the CompuLab CM-A510 Board. -endmenu - endif diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index cdf163cab738..e83f6492834d 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include + obj-y += common.o obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o diff --git a/arch/arm/mach-dove/include/mach/uncompress.h b/arch/arm/mach-dove/include/mach/uncompress.h deleted file mode 100644 index 7a4bd8838036..000000000000 --- a/arch/arm/mach-dove/include/mach/uncompress.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#define UART0_PHYS_BASE (0xf1000000 + 0x12000) - -#define UART_THR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x0)) -#define UART_LSR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x14)) - -#define LSR_THRE 0x20 - -static void putc(const char c) -{ - int i; - - for (i = 0; i < 0x1000; i++) { - /* Transmit fifo not full? */ - if (*UART_LSR & LSR_THRE) - break; - } - - *UART_THR = c; -} - -static void flush(void) -{ -} - -/* - * nothing to do - */ -#define arch_decomp_setup()