linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/4] ARM: ep93xx: various updates
@ 2017-09-03 17:43 Florian Fainelli
  2017-09-03 17:43 ` [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM Florian Fainelli
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Florian Fainelli @ 2017-09-03 17:43 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

This is a rebase of Hartley's original submission:

https://www.spinics.net/lists/arm-kernel/msg564135.html

rebased against v4.13-rc1, I have been using these patches on a TS-7300 board
with 32MB of RAM and everything works fine here as well.

Here is what Hartley wrote in v1:

Here are a couple mach-ep93xx patches that I have been holding on to.
Some of these have been previously posted.

The first patch is needed for 128 MiB version of the TS-7300 board.
That board uses multiple chip selects for the SDRAM and does not boot
with the previous flatmem setup. With the switch, all the other ep93xx
boards I have still work properly.

The second patch has been rebased due to the chip select change in
the spi-ep93xx driver which has been merged.

Patch 3 is just a cosmetic change.

Patch 4 was originally from Florian Fainelli's github ts72xx branch.
It has been updated to the new spi-ep93xx chip select method.

H Hartley Sweeten (4):
  ARM: ep93xx: switch to SPARSEMEM
  ARM: ep93xx: simone: let the mmc_spi driver handle the card detect
  ARM: ep93xx: tidy up TS-72xx Watchdog resources
  ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards

 arch/arm/Kconfig              |  2 +-
 arch/arm/mach-ep93xx/simone.c | 54 +++----------------------------------------
 arch/arm/mach-ep93xx/ts72xx.c | 46 +++++++++++++++++++++++++++---------
 arch/arm/mach-ep93xx/ts72xx.h |  3 ---
 4 files changed, 39 insertions(+), 66 deletions(-)

-- 
2.11.0

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM
  2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
@ 2017-09-03 17:43 ` Florian Fainelli
  2017-09-03 17:58   ` Alexander Sverdlin
  2017-09-03 17:43 ` [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect Florian Fainelli
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2017-09-03 17:43 UTC (permalink / raw)
  To: linux-arm-kernel

From: H Hartley Sweeten <hsweeten@visionengravers.com>

The EP93xx has four chip selects that can be used for the SDRAM memory.
These chip selects are decoded to specify an address domain:

  SDCS3  0x00000000-0x0fffffff with Boot Option ASDO=1
  SDCS0  0xc0000000-0xcfffffff
  SDCS1  0xd0000000-0xdfffffff
  SDCS2  0xe0000000-x0efffffff
  SDCS3  0xf0000000-0xffffffff with Boot Option ASDO=0

Because of the row/column/bank architecture of SDRAM, the mapping of
these memories into the processor's memory space is discontiguous.

Most ep93xx systems only use one of the chip selects. For these systems,
ARCH_HAS_HOLES_MEMORYMODEL has worked fine to handle the discontiguous
memory.

But, some of the TS-72xx boards use multiple chip selects. The TS-7300 in
particular uses SDCS3 (with ASDO=1) and SDCS2. On that system with
ARCH_HAS_HOLES_MEMORYMODEL the SDCS2 memory does not get handled correctly
and results in the system not booting.

Change the EP93xx to ARCH_SPARSEMEM_ENABLE. This handles the discontiguous
memory for all configurations.

This has been tested on the following ep93xx platforms:

EDB9307A with 64 MiB on SDCS0
Vision EP9307 with 64 MiB on SDCS0
TS-7300 with 64 MiB on SDCS3 (with ASDO=1) and 64 MiB on SDCS2
sim.one with 64 MiB on SDCS0

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@armlinux.org.uk>
---
 arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a208bfe367b5..87a6b09067c2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -378,7 +378,7 @@ config ARCH_EBSA110
 
 config ARCH_EP93XX
 	bool "EP93xx-based"
-	select ARCH_HAS_HOLES_MEMORYMODEL
+	select ARCH_SPARSEMEM_ENABLE
 	select ARM_AMBA
 	select ARM_PATCH_PHYS_VIRT
 	select ARM_VIC
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect
  2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
  2017-09-03 17:43 ` [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM Florian Fainelli
@ 2017-09-03 17:43 ` Florian Fainelli
  2017-09-03 17:58   ` Alexander Sverdlin
  2017-09-03 17:43 ` [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources Florian Fainelli
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2017-09-03 17:43 UTC (permalink / raw)
  To: linux-arm-kernel

From: H Hartley Sweeten <hsweeten@visionengravers.com>

This board uses a GPIO for the MMC card detect. Let the mmc_spi
driver handle it instead of the platform code.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-ep93xx/simone.c | 54 +++----------------------------------------
 1 file changed, 3 insertions(+), 51 deletions(-)

diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index c7a40f245892..1c353868f211 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -43,60 +43,12 @@ static struct ep93xxfb_mach_info __initdata simone_fb_info = {
 	.flags		= EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING,
 };
 
-/*
- * GPIO lines used for MMC card detection.
- */
-#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0
-
-/*
- * MMC card detection GPIO setup.
- */
-
-static int simone_mmc_spi_init(struct device *dev,
-	irqreturn_t (*irq_handler)(int, void *), void *mmc)
-{
-	unsigned int gpio = MMC_CARD_DETECT_GPIO;
-	int irq, err;
-
-	err = gpio_request(gpio, dev_name(dev));
-	if (err)
-		return err;
-
-	err = gpio_direction_input(gpio);
-	if (err)
-		goto fail;
-
-	irq = gpio_to_irq(gpio);
-	if (irq < 0)
-		goto fail;
-
-	err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING,
-			  "MMC card detect", mmc);
-	if (err)
-		goto fail;
-
-	printk(KERN_INFO "%s: using irq %d for MMC card detection\n",
-	       dev_name(dev), irq);
-
-	return 0;
-fail:
-	gpio_free(gpio);
-	return err;
-}
-
-static void simone_mmc_spi_exit(struct device *dev, void *mmc)
-{
-	unsigned int gpio = MMC_CARD_DETECT_GPIO;
-
-	free_irq(gpio_to_irq(gpio), mmc);
-	gpio_free(gpio);
-}
-
 static struct mmc_spi_platform_data simone_mmc_spi_data = {
-	.init		= simone_mmc_spi_init,
-	.exit		= simone_mmc_spi_exit,
 	.detect_delay	= 500,
 	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
+	.flags		= MMC_SPI_USE_CD_GPIO,
+	.cd_gpio	= EP93XX_GPIO_LINE_EGPIO0,
+	.cd_debounce	= 1,
 };
 
 static struct spi_board_info simone_spi_devices[] __initdata = {
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources
  2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
  2017-09-03 17:43 ` [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM Florian Fainelli
  2017-09-03 17:43 ` [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect Florian Fainelli
@ 2017-09-03 17:43 ` Florian Fainelli
  2017-09-03 17:58   ` Alexander Sverdlin
  2017-09-03 17:43 ` [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards Florian Fainelli
  2017-09-05  6:50 ` [PATCH v2 0/4] ARM: ep93xx: various updates Linus Walleij
  4 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2017-09-03 17:43 UTC (permalink / raw)
  To: linux-arm-kernel

From: H Hartley Sweeten <hsweeten@visionengravers.com>

The ts-72xx watchdog uses two byte sized registers. Tidy up the resource
declaration so that the proper information is shown in /proc/iomem.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
---
 arch/arm/mach-ep93xx/ts72xx.c | 20 +++++++++-----------
 arch/arm/mach-ep93xx/ts72xx.h |  3 ---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55b186ef863a..55ca3b375952 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -186,24 +186,22 @@ static struct platform_device ts72xx_rtc_device = {
 	.num_resources 	= ARRAY_SIZE(ts72xx_rtc_resources),
 };
 
+/*************************************************************************
+ * Watchdog (in CPLD)
+ *************************************************************************/
+#define TS72XX_WDT_CONTROL_PHYS_BASE	(EP93XX_CS2_PHYS_BASE + 0x03800000)
+#define TS72XX_WDT_FEED_PHYS_BASE	(EP93XX_CS2_PHYS_BASE + 0x03c00000)
+
 static struct resource ts72xx_wdt_resources[] = {
-	{
-		.start	= TS72XX_WDT_CONTROL_PHYS_BASE,
-		.end	= TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= TS72XX_WDT_FEED_PHYS_BASE,
-		.end	= TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
+	DEFINE_RES_MEM(TS72XX_WDT_CONTROL_PHYS_BASE, 0x01),
+	DEFINE_RES_MEM(TS72XX_WDT_FEED_PHYS_BASE, 0x01),
 };
 
 static struct platform_device ts72xx_wdt_device = {
 	.name		= "ts72xx-wdt",
 	.id		= -1,
-	.num_resources 	= ARRAY_SIZE(ts72xx_wdt_resources),
 	.resource	= ts72xx_wdt_resources,
+	.num_resources	= ARRAY_SIZE(ts72xx_wdt_resources),
 };
 
 static struct ep93xx_eth_data __initdata ts72xx_eth_data = {
diff --git a/arch/arm/mach-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/ts72xx.h
index 2255ba29fdd6..4e6519b2a3c4 100644
--- a/arch/arm/mach-ep93xx/ts72xx.h
+++ b/arch/arm/mach-ep93xx/ts72xx.h
@@ -38,9 +38,6 @@
 #define TS72XX_OPTIONS2_TS9420		0x04
 #define TS72XX_OPTIONS2_TS9420_BOOT	0x02
 
-#define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000
-#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000
-
 #ifndef __ASSEMBLY__
 
 static inline int ts72xx_model(void)
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards
  2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
                   ` (2 preceding siblings ...)
  2017-09-03 17:43 ` [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources Florian Fainelli
@ 2017-09-03 17:43 ` Florian Fainelli
  2017-09-03 17:59   ` Alexander Sverdlin
  2017-09-05  6:50 ` [PATCH v2 0/4] ARM: ep93xx: various updates Linus Walleij
  4 siblings, 1 reply; 11+ messages in thread
From: Florian Fainelli @ 2017-09-03 17:43 UTC (permalink / raw)
  To: linux-arm-kernel

From: H Hartley Sweeten <hsweeten@visionengravers.com>

Register the TI TMP122 (lm70) temperature sensor driver for the TS-72xx
boards.

Originaly from Florian Fainelli. Updated to the new spi-ep93xx chip select
method.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/mach-ep93xx/ts72xx.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55ca3b375952..4b8fefbf62dd 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -18,7 +18,10 @@
 #include <linux/io.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/platform_data/spi-ep93xx.h>
 
+#include <mach/gpio-ep93xx.h>
 #include <mach/hardware.h>
 
 #include <asm/mach-types.h>
@@ -230,6 +233,27 @@ static struct platform_device ts73xx_fpga_device = {
 
 #endif
 
+/*************************************************************************
+ * SPI Bus
+ *************************************************************************/
+static struct spi_board_info ts72xx_spi_devices[] __initdata = {
+	{
+		.modalias		= "tmp122",
+		.max_speed_hz		= 2 * 1000 * 1000,
+		.bus_num		= 0,
+		.chip_select		= 0,
+	},
+};
+
+static int ts72xx_spi_chipselects[] __initdata = {
+	EP93XX_GPIO_LINE_F(2),		/* DIO_17 */
+};
+
+static struct ep93xx_spi_info ts72xx_spi_info __initdata = {
+	.chipselect	= ts72xx_spi_chipselects,
+	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_chipselects),
+};
+
 static void __init ts72xx_init_machine(void)
 {
 	ep93xx_init_devices();
@@ -242,6 +266,8 @@ static void __init ts72xx_init_machine(void)
 	if (board_is_ts7300())
 		platform_device_register(&ts73xx_fpga_device);
 #endif
+	ep93xx_register_spi(&ts72xx_spi_info, ts72xx_spi_devices,
+			    ARRAY_SIZE(ts72xx_spi_devices));
 }
 
 MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM
  2017-09-03 17:43 ` [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM Florian Fainelli
@ 2017-09-03 17:58   ` Alexander Sverdlin
  0 siblings, 0 replies; 11+ messages in thread
From: Alexander Sverdlin @ 2017-09-03 17:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hello!

On 03/09/17 19:43, Florian Fainelli wrote:
> From: H Hartley Sweeten <hsweeten@visionengravers.com>
> 
> The EP93xx has four chip selects that can be used for the SDRAM memory.
> These chip selects are decoded to specify an address domain:
> 
>   SDCS3  0x00000000-0x0fffffff with Boot Option ASDO=1
>   SDCS0  0xc0000000-0xcfffffff
>   SDCS1  0xd0000000-0xdfffffff
>   SDCS2  0xe0000000-x0efffffff
>   SDCS3  0xf0000000-0xffffffff with Boot Option ASDO=0
> 
> Because of the row/column/bank architecture of SDRAM, the mapping of
> these memories into the processor's memory space is discontiguous.
> 
> Most ep93xx systems only use one of the chip selects. For these systems,
> ARCH_HAS_HOLES_MEMORYMODEL has worked fine to handle the discontiguous
> memory.
> 
> But, some of the TS-72xx boards use multiple chip selects. The TS-7300 in
> particular uses SDCS3 (with ASDO=1) and SDCS2. On that system with
> ARCH_HAS_HOLES_MEMORYMODEL the SDCS2 memory does not get handled correctly
> and results in the system not booting.
> 
> Change the EP93xx to ARCH_SPARSEMEM_ENABLE. This handles the discontiguous
> memory for all configurations.
> 
> This has been tested on the following ep93xx platforms:
> 
> EDB9307A with 64 MiB on SDCS0
> Vision EP9307 with 64 MiB on SDCS0
> TS-7300 with 64 MiB on SDCS3 (with ASDO=1) and 64 MiB on SDCS2
> sim.one with 64 MiB on SDCS0
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Tested-by: Linus Walleij <linus.walleij@linaro.org>
> Cc: Russell King <linux@armlinux.org.uk>

As I've tested this patch back in 4.12 times,
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> ---
>  arch/arm/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index a208bfe367b5..87a6b09067c2 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -378,7 +378,7 @@ config ARCH_EBSA110
>  
>  config ARCH_EP93XX
>  	bool "EP93xx-based"
> -	select ARCH_HAS_HOLES_MEMORYMODEL
> +	select ARCH_SPARSEMEM_ENABLE
>  	select ARM_AMBA
>  	select ARM_PATCH_PHYS_VIRT
>  	select ARM_VIC

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect
  2017-09-03 17:43 ` [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect Florian Fainelli
@ 2017-09-03 17:58   ` Alexander Sverdlin
  0 siblings, 0 replies; 11+ messages in thread
From: Alexander Sverdlin @ 2017-09-03 17:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hello!

On 03/09/17 19:43, Florian Fainelli wrote:
> From: H Hartley Sweeten <hsweeten@visionengravers.com>
> 
> This board uses a GPIO for the MMC card detect. Let the mmc_spi
> driver handle it instead of the platform code.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Tested-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> ---
>  arch/arm/mach-ep93xx/simone.c | 54 +++----------------------------------------
>  1 file changed, 3 insertions(+), 51 deletions(-)
> 
> diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
> index c7a40f245892..1c353868f211 100644
> --- a/arch/arm/mach-ep93xx/simone.c
> +++ b/arch/arm/mach-ep93xx/simone.c
> @@ -43,60 +43,12 @@ static struct ep93xxfb_mach_info __initdata simone_fb_info = {
>  	.flags		= EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING,
>  };
>  
> -/*
> - * GPIO lines used for MMC card detection.
> - */
> -#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0
> -
> -/*
> - * MMC card detection GPIO setup.
> - */
> -
> -static int simone_mmc_spi_init(struct device *dev,
> -	irqreturn_t (*irq_handler)(int, void *), void *mmc)
> -{
> -	unsigned int gpio = MMC_CARD_DETECT_GPIO;
> -	int irq, err;
> -
> -	err = gpio_request(gpio, dev_name(dev));
> -	if (err)
> -		return err;
> -
> -	err = gpio_direction_input(gpio);
> -	if (err)
> -		goto fail;
> -
> -	irq = gpio_to_irq(gpio);
> -	if (irq < 0)
> -		goto fail;
> -
> -	err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING,
> -			  "MMC card detect", mmc);
> -	if (err)
> -		goto fail;
> -
> -	printk(KERN_INFO "%s: using irq %d for MMC card detection\n",
> -	       dev_name(dev), irq);
> -
> -	return 0;
> -fail:
> -	gpio_free(gpio);
> -	return err;
> -}
> -
> -static void simone_mmc_spi_exit(struct device *dev, void *mmc)
> -{
> -	unsigned int gpio = MMC_CARD_DETECT_GPIO;
> -
> -	free_irq(gpio_to_irq(gpio), mmc);
> -	gpio_free(gpio);
> -}
> -
>  static struct mmc_spi_platform_data simone_mmc_spi_data = {
> -	.init		= simone_mmc_spi_init,
> -	.exit		= simone_mmc_spi_exit,
>  	.detect_delay	= 500,
>  	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
> +	.flags		= MMC_SPI_USE_CD_GPIO,
> +	.cd_gpio	= EP93XX_GPIO_LINE_EGPIO0,
> +	.cd_debounce	= 1,
>  };
>  
>  static struct spi_board_info simone_spi_devices[] __initdata = {

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources
  2017-09-03 17:43 ` [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources Florian Fainelli
@ 2017-09-03 17:58   ` Alexander Sverdlin
  0 siblings, 0 replies; 11+ messages in thread
From: Alexander Sverdlin @ 2017-09-03 17:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hello!

On 03/09/17 19:43, Florian Fainelli wrote:
> From: H Hartley Sweeten <hsweeten@visionengravers.com>
> 
> The ts-72xx watchdog uses two byte sized registers. Tidy up the resource
> declaration so that the proper information is shown in /proc/iomem.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> ---
>  arch/arm/mach-ep93xx/ts72xx.c | 20 +++++++++-----------
>  arch/arm/mach-ep93xx/ts72xx.h |  3 ---
>  2 files changed, 9 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
> index 55b186ef863a..55ca3b375952 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.c
> +++ b/arch/arm/mach-ep93xx/ts72xx.c
> @@ -186,24 +186,22 @@ static struct platform_device ts72xx_rtc_device = {
>  	.num_resources 	= ARRAY_SIZE(ts72xx_rtc_resources),
>  };
>  
> +/*************************************************************************
> + * Watchdog (in CPLD)
> + *************************************************************************/
> +#define TS72XX_WDT_CONTROL_PHYS_BASE	(EP93XX_CS2_PHYS_BASE + 0x03800000)
> +#define TS72XX_WDT_FEED_PHYS_BASE	(EP93XX_CS2_PHYS_BASE + 0x03c00000)
> +
>  static struct resource ts72xx_wdt_resources[] = {
> -	{
> -		.start	= TS72XX_WDT_CONTROL_PHYS_BASE,
> -		.end	= TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,
> -		.flags	= IORESOURCE_MEM,
> -	},
> -	{
> -		.start	= TS72XX_WDT_FEED_PHYS_BASE,
> -		.end	= TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,
> -		.flags	= IORESOURCE_MEM,
> -	},
> +	DEFINE_RES_MEM(TS72XX_WDT_CONTROL_PHYS_BASE, 0x01),
> +	DEFINE_RES_MEM(TS72XX_WDT_FEED_PHYS_BASE, 0x01),
>  };
>  
>  static struct platform_device ts72xx_wdt_device = {
>  	.name		= "ts72xx-wdt",
>  	.id		= -1,
> -	.num_resources 	= ARRAY_SIZE(ts72xx_wdt_resources),
>  	.resource	= ts72xx_wdt_resources,
> +	.num_resources	= ARRAY_SIZE(ts72xx_wdt_resources),
>  };
>  
>  static struct ep93xx_eth_data __initdata ts72xx_eth_data = {
> diff --git a/arch/arm/mach-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/ts72xx.h
> index 2255ba29fdd6..4e6519b2a3c4 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.h
> +++ b/arch/arm/mach-ep93xx/ts72xx.h
> @@ -38,9 +38,6 @@
>  #define TS72XX_OPTIONS2_TS9420		0x04
>  #define TS72XX_OPTIONS2_TS9420_BOOT	0x02
>  
> -#define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000
> -#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000
> -
>  #ifndef __ASSEMBLY__
>  
>  static inline int ts72xx_model(void)

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards
  2017-09-03 17:43 ` [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards Florian Fainelli
@ 2017-09-03 17:59   ` Alexander Sverdlin
  0 siblings, 0 replies; 11+ messages in thread
From: Alexander Sverdlin @ 2017-09-03 17:59 UTC (permalink / raw)
  To: linux-arm-kernel

Hello!

On 03/09/17 19:43, Florian Fainelli wrote:
> From: H Hartley Sweeten <hsweeten@visionengravers.com>
> 
> Register the TI TMP122 (lm70) temperature sensor driver for the TS-72xx
> boards.
> 
> Originaly from Florian Fainelli. Updated to the new spi-ep93xx chip select
> method.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> ---
>  arch/arm/mach-ep93xx/ts72xx.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
> index 55ca3b375952..4b8fefbf62dd 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.c
> +++ b/arch/arm/mach-ep93xx/ts72xx.c
> @@ -18,7 +18,10 @@
>  #include <linux/io.h>
>  #include <linux/mtd/nand.h>
>  #include <linux/mtd/partitions.h>
> +#include <linux/spi/spi.h>
> +#include <linux/platform_data/spi-ep93xx.h>
>  
> +#include <mach/gpio-ep93xx.h>
>  #include <mach/hardware.h>
>  
>  #include <asm/mach-types.h>
> @@ -230,6 +233,27 @@ static struct platform_device ts73xx_fpga_device = {
>  
>  #endif
>  
> +/*************************************************************************
> + * SPI Bus
> + *************************************************************************/
> +static struct spi_board_info ts72xx_spi_devices[] __initdata = {
> +	{
> +		.modalias		= "tmp122",
> +		.max_speed_hz		= 2 * 1000 * 1000,
> +		.bus_num		= 0,
> +		.chip_select		= 0,
> +	},
> +};
> +
> +static int ts72xx_spi_chipselects[] __initdata = {
> +	EP93XX_GPIO_LINE_F(2),		/* DIO_17 */
> +};
> +
> +static struct ep93xx_spi_info ts72xx_spi_info __initdata = {
> +	.chipselect	= ts72xx_spi_chipselects,
> +	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_chipselects),
> +};
> +
>  static void __init ts72xx_init_machine(void)
>  {
>  	ep93xx_init_devices();
> @@ -242,6 +266,8 @@ static void __init ts72xx_init_machine(void)
>  	if (board_is_ts7300())
>  		platform_device_register(&ts73xx_fpga_device);
>  #endif
> +	ep93xx_register_spi(&ts72xx_spi_info, ts72xx_spi_devices,
> +			    ARRAY_SIZE(ts72xx_spi_devices));
>  }
>  
>  MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 0/4] ARM: ep93xx: various updates
  2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
                   ` (3 preceding siblings ...)
  2017-09-03 17:43 ` [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards Florian Fainelli
@ 2017-09-05  6:50 ` Linus Walleij
  2017-09-05 15:54   ` Hartley Sweeten
  4 siblings, 1 reply; 11+ messages in thread
From: Linus Walleij @ 2017-09-05  6:50 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, Sep 3, 2017 at 7:43 PM, Florian Fainelli <f.fainelli@gmail.com> wrote:

> This is a rebase of Hartley's original submission:

Hartley are you sending pull requests to ARM SoC for these
changes?

Else I can stack them up in one of my trees and feed it to
ARM SoC if you need help.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 0/4] ARM: ep93xx: various updates
  2017-09-05  6:50 ` [PATCH v2 0/4] ARM: ep93xx: various updates Linus Walleij
@ 2017-09-05 15:54   ` Hartley Sweeten
  0 siblings, 0 replies; 11+ messages in thread
From: Hartley Sweeten @ 2017-09-05 15:54 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday, September 04, 2017 11:51 PM, Linus Walleij wrote:
> On Sun, Sep 3, 2017 at 7:43 PM, Florian Fainelli <f.fainelli@gmail.com> wrote:
>> This is a rebase of Hartley's original submission:
>
> Hartley are you sending pull requests to ARM SoC for these changes?
>
> Else I can stack them up in one of my trees and feed it to ARM SoC if you need help.

Linus, I don't have my own tree to send a pull request from.
Please put them in one of your trees.

Thanks,
Hartley

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-09-05 15:54 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-03 17:43 [PATCH v2 0/4] ARM: ep93xx: various updates Florian Fainelli
2017-09-03 17:43 ` [PATCH v2 1/4] ARM: ep93xx: switch to SPARSEMEM Florian Fainelli
2017-09-03 17:58   ` Alexander Sverdlin
2017-09-03 17:43 ` [PATCH v2 2/4] ARM: ep93xx: simone: let the mmc_spi driver handle the card detect Florian Fainelli
2017-09-03 17:58   ` Alexander Sverdlin
2017-09-03 17:43 ` [PATCH v2 3/4] ARM: ep93xx: tidy up TS-72xx Watchdog resources Florian Fainelli
2017-09-03 17:58   ` Alexander Sverdlin
2017-09-03 17:43 ` [PATCH v2 4/4] ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards Florian Fainelli
2017-09-03 17:59   ` Alexander Sverdlin
2017-09-05  6:50 ` [PATCH v2 0/4] ARM: ep93xx: various updates Linus Walleij
2017-09-05 15:54   ` Hartley Sweeten

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).