Commit accdab6d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-soc-5.10' of... 

Merge tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC update for 5.10:

- A series from Fabio Estevam to remove legacy non-DT i.MX platforms
  support and related board files. This is a natural move, as the
  platforms had been converted to DT for years, and we have not seen
  any users around these legacy non-DT support for a while.
- Enable cpufreq support for i.MX7ULP platform.

* tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (26 commits)
  clk: imx: imx35: Remove mx35_clocks_init()
  clk: imx: imx31: Remove mx31_clocks_init()
  clk: imx: imx27: Remove mx27_clocks_init()
  ARM: imx: Remove unused definitions
  ARM: imx35: Retrieve the IIM base address from devicetree
  ARM: imx3: Retrieve the AVIC base address from devicetree
  ARM: imx3: Retrieve the CCM base address from devicetree
  ARM: imx31: Retrieve the IIM base address from devicetree
  ARM: imx27: Retrieve the CCM base address from devicetree
  ARM: imx27: Retrieve the SYSCTRL base address from devicetree
  ARM: imx: Remove remnant board file support pieces
  ARM: imx: Remove imx device directory
  ARM: imx: Remove iomux-v3 board code
  ARM: imx3: Remove imx3 soc_init()
  ARM: imx31: Remove remaining i.MX31 board code
  ARM: imx27: Retrieve AVIC base address from devicetree
  ARM: imx27: Get rid of mm-imx27.c
  ARM: imx27: Remove iomux-v1 board code
  ARM: imx27: Remove imx27_soc_init()
  ARM: imx7ulp: enable cpufreq
  ...

Link: https://lore.kernel.org/r/20200923073009.23678-2-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a4f07008 fb956b3e

arch/arm/configs/imx_v4_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y 
CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX1=y

CONFIG_SOC_IMX25=y

CONFIG_SOC_IMX27=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/configs/imx_v6_v7_defconfig

+2 −14
Original line number Diff line number Diff line
@@ -15,20 +15,8 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y

CONFIG_MACH_PCM037_EET=y

CONFIG_MACH_MX31_3DS=y

CONFIG_MACH_MX31MOBOARD=y

CONFIG_MACH_QONG=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_IMX31_DT=y

CONFIG_MACH_IMX35_DT=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_VPR200=y

CONFIG_SOC_IMX31=y

CONFIG_SOC_IMX35=y

CONFIG_SOC_IMX50=y

CONFIG_SOC_IMX51=y

CONFIG_SOC_IMX53=y

arch/arm/configs/multi_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ CONFIG_MACH_MX27ADS=y 
CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX25=y

CONFIG_SOC_IMX27=y

CONFIG_ARCH_MVEBU=y

CONFIG_MACH_KIRKWOOD=y

CONFIG_ARCH_ORION5X=y

arch/arm/mach-imx/3ds_debugboard.c

deleted100644 → 0
+0 −207
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.

 * Copyright (C) 2010 Jason Wang <jason77.wang@gmail.com>

 */



#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/io.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/module.h>

#include <linux/smsc911x.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>

#include "3ds_debugboard.h"

#include "hardware.h"



/* LAN9217 ethernet base address */

#define LAN9217_BASE_ADDR(n)	(n + 0x0)

/* External UART */

#define UARTA_BASE_ADDR(n)	(n + 0x8000)

#define UARTB_BASE_ADDR(n)	(n + 0x10000)



#define BOARD_IO_ADDR(n)	(n + 0x20000)

/* LED switchs */

#define LED_SWITCH_REG		0x00

/* buttons */

#define SWITCH_BUTTONS_REG	0x08

/* status, interrupt */

#define INTR_STATUS_REG	0x10

#define INTR_MASK_REG		0x38

#define INTR_RESET_REG		0x20

/* magic word for debug CPLD */

#define MAGIC_NUMBER1_REG	0x40

#define MAGIC_NUMBER2_REG	0x48

/* CPLD code version */

#define CPLD_CODE_VER_REG	0x50

/* magic word for debug CPLD */

#define MAGIC_NUMBER3_REG	0x58

/* module reset register*/

#define MODULE_RESET_REG	0x60

/* CPU ID and Personality ID */

#define MCU_BOARD_ID_REG	0x68



#define MXC_MAX_EXP_IO_LINES	16



/* interrupts like external uart , external ethernet etc*/

#define EXPIO_INT_ENET		0

#define EXPIO_INT_XUART_A	1

#define EXPIO_INT_XUART_B	2

#define EXPIO_INT_BUTTON_A	3

#define EXPIO_INT_BUTTON_B	4



static void __iomem *brd_io;

static struct irq_domain *domain;



static struct resource smsc911x_resources[] = {

	{

		.flags = IORESOURCE_MEM,

	} , {

		.flags = IORESOURCE_IRQ,

	},

};



static struct smsc911x_platform_config smsc911x_config = {

	.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.flags = SMSC911X_USE_32BIT | SMSC911X_FORCE_INTERNAL_PHY,

};



static struct platform_device smsc_lan9217_device = {

	.name = "smsc911x",

	.id = -1,

	.dev = {

		.platform_data = &smsc911x_config,

	},

	.num_resources = ARRAY_SIZE(smsc911x_resources),

	.resource = smsc911x_resources,

};



static void mxc_expio_irq_handler(struct irq_desc *desc)

{

	u32 imr_val;

	u32 int_valid;

	u32 expio_irq;



	/* irq = gpio irq number */

	desc->irq_data.chip->irq_mask(&desc->irq_data);



	imr_val = imx_readw(brd_io + INTR_MASK_REG);

	int_valid = imx_readw(brd_io + INTR_STATUS_REG) & ~imr_val;



	expio_irq = 0;

	for (; int_valid != 0; int_valid >>= 1, expio_irq++) {

		if ((int_valid & 1) == 0)

			continue;

		generic_handle_irq(irq_find_mapping(domain, expio_irq));

	}



	desc->irq_data.chip->irq_ack(&desc->irq_data);

	desc->irq_data.chip->irq_unmask(&desc->irq_data);

}



/*

 * Disable an expio pin's interrupt by setting the bit in the imr.

 * Irq is an expio virtual irq number

 */

static void expio_mask_irq(struct irq_data *d)

{

	u16 reg;

	u32 expio = d->hwirq;



	reg = imx_readw(brd_io + INTR_MASK_REG);

	reg |= (1 << expio);

	imx_writew(reg, brd_io + INTR_MASK_REG);

}



static void expio_ack_irq(struct irq_data *d)

{

	u32 expio = d->hwirq;



	imx_writew(1 << expio, brd_io + INTR_RESET_REG);

	imx_writew(0, brd_io + INTR_RESET_REG);

	expio_mask_irq(d);

}



static void expio_unmask_irq(struct irq_data *d)

{

	u16 reg;

	u32 expio = d->hwirq;



	reg = imx_readw(brd_io + INTR_MASK_REG);

	reg &= ~(1 << expio);

	imx_writew(reg, brd_io + INTR_MASK_REG);

}



static struct irq_chip expio_irq_chip = {

	.irq_ack = expio_ack_irq,

	.irq_mask = expio_mask_irq,

	.irq_unmask = expio_unmask_irq,

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

};



int __init mxc_expio_init(u32 base, u32 intr_gpio)

{

	u32 p_irq = gpio_to_irq(intr_gpio);

	int irq_base;

	int i;



	brd_io = ioremap(BOARD_IO_ADDR(base), SZ_4K);

	if (brd_io == NULL)

		return -ENOMEM;



	if ((imx_readw(brd_io + MAGIC_NUMBER1_REG) != 0xAAAA) ||

	    (imx_readw(brd_io + MAGIC_NUMBER2_REG) != 0x5555) ||

	    (imx_readw(brd_io + MAGIC_NUMBER3_REG) != 0xCAFE)) {

		pr_info("3-Stack Debug board not detected\n");

		iounmap(brd_io);

		brd_io = NULL;

		return -ENODEV;

	}



	pr_info("3-Stack Debug board detected, rev = 0x%04X\n",

		readw(brd_io + CPLD_CODE_VER_REG));



	/*

	 * Configure INT line as GPIO input

	 */

	gpio_request(intr_gpio, "expio_pirq");

	gpio_direction_input(intr_gpio);



	/* disable the interrupt and clear the status */

	imx_writew(0, brd_io + INTR_MASK_REG);

	imx_writew(0xFFFF, brd_io + INTR_RESET_REG);

	imx_writew(0, brd_io + INTR_RESET_REG);

	imx_writew(0x1F, brd_io + INTR_MASK_REG);



	irq_base = irq_alloc_descs(-1, 0, MXC_MAX_EXP_IO_LINES, numa_node_id());

	WARN_ON(irq_base < 0);



	domain = irq_domain_add_legacy(NULL, MXC_MAX_EXP_IO_LINES, irq_base, 0,

				       &irq_domain_simple_ops, NULL);

	WARN_ON(!domain);



	for (i = irq_base; i < irq_base + MXC_MAX_EXP_IO_LINES; i++) {

		irq_set_chip_and_handler(i, &expio_irq_chip, handle_level_irq);

		irq_clear_status_flags(i, IRQ_NOREQUEST);

	}

	irq_set_irq_type(p_irq, IRQF_TRIGGER_LOW);

	irq_set_chained_handler(p_irq, mxc_expio_irq_handler);



	/* Register Lan device on the debugboard */

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	smsc911x_resources[0].start = LAN9217_BASE_ADDR(base);

	smsc911x_resources[0].end = LAN9217_BASE_ADDR(base) + 0x100 - 1;

	smsc911x_resources[1].start = irq_find_mapping(domain, EXPIO_INT_ENET);

	smsc911x_resources[1].end = irq_find_mapping(domain, EXPIO_INT_ENET);

	platform_device_register(&smsc_lan9217_device);



	return 0;

}

arch/arm/mach-imx/3ds_debugboard.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.

 */



#ifndef __ASM_ARCH_MXC_3DS_DB_H__

#define __ASM_ARCH_MXC_3DS_DB_H__



extern int __init mxc_expio_init(u32 base, u32 intr_gpio);



#endif /* __ASM_ARCH_MXC_3DS_DB_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE