Commit 6a946f1b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: pcmcia: move smemc configuration back to arch 

Rather than poking at the smemc registers directly from the
pcmcia/pxa2xx_base driver, move those bits into machine file
to have a cleaner interface.

Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Link: https://lore.kernel.org/lkml/87d0egjzxk.fsf@belgarion.home/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 85c61199

arch/arm/mach-pxa/generic.c

+29 −0
Original line number Diff line number Diff line
@@ -70,6 +70,35 @@ unsigned int get_clk_frequency_khz(int info) 
}

EXPORT_SYMBOL(get_clk_frequency_khz);



void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio)

{

	__raw_writel(mcmem, MCMEM(sock));

	__raw_writel(mcatt, MCATT(sock));

	__raw_writel(mcio, MCIO(sock));

}

EXPORT_SYMBOL_GPL(pxa_smemc_set_pcmcia_timing);



void pxa_smemc_set_pcmcia_socket(int nr)

{

	switch (nr) {

	case 0:

		__raw_writel(0, MECR);

		break;

	case 1:

		/*

		 * We have at least one socket, so set MECR:CIT

		 * (Card Is There)

		 */

		__raw_writel(MECR_CIT, MECR);

		break;

	case 2:

		/* Set CIT and MECR:NOS (Number Of Sockets) */

		__raw_writel(MECR_CIT | MECR_NOS, MECR);

		break;

	}

}

EXPORT_SYMBOL_GPL(pxa_smemc_set_pcmcia_socket);



/*

 * Intel PXA2xx internal register mapping.

 *

drivers/pcmcia/pxa2xx_base.c

+16 −30
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 
#include <linux/spinlock.h>

#include <linux/platform_device.h>

#include <linux/soc/pxa/cpu.h>

#include <linux/soc/pxa/smemc.h>



#include <mach/smemc.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <mach/pxa2xx-regs.h>

#include <asm/mach-types.h>



#include <pcmcia/ss.h>
@@ -113,7 +112,7 @@ static inline u_int pxa2xx_pcmcia_cmd_time(u_int mem_clk_10khz, 
	return (300000 * (pcmcia_mcxx_asst + 1) / mem_clk_10khz);

}



static int pxa2xx_pcmcia_set_mcmem( int sock, int speed, int clock )

static uint32_t pxa2xx_pcmcia_mcmem(int sock, int speed, int clock)

{

	uint32_t val;
@@ -124,12 +123,10 @@ static int pxa2xx_pcmcia_set_mcmem( int sock, int speed, int clock ) 
		| ((pxa2xx_mcxx_hold(speed, clock)

		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);



	__raw_writel(val, MCMEM(sock));



	return 0;

	return val;

}



static int pxa2xx_pcmcia_set_mcio( int sock, int speed, int clock )

static int pxa2xx_pcmcia_mcio(int sock, int speed, int clock)

{

	uint32_t val;
@@ -140,12 +137,11 @@ static int pxa2xx_pcmcia_set_mcio( int sock, int speed, int clock ) 
		| ((pxa2xx_mcxx_hold(speed, clock)

		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);



	__raw_writel(val, MCIO(sock));



	return 0;

	return val;

}



static int pxa2xx_pcmcia_set_mcatt( int sock, int speed, int clock )

static int pxa2xx_pcmcia_mcatt(int sock, int speed, int clock)

{

	uint32_t val;
@@ -156,31 +152,26 @@ static int pxa2xx_pcmcia_set_mcatt( int sock, int speed, int clock ) 
		| ((pxa2xx_mcxx_hold(speed, clock)

		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);



	__raw_writel(val, MCATT(sock));



	return 0;

	return val;

}



static int pxa2xx_pcmcia_set_mcxx(struct soc_pcmcia_socket *skt, unsigned int clk)

static int pxa2xx_pcmcia_set_timing(struct soc_pcmcia_socket *skt)

{

	unsigned long clk = clk_get_rate(skt->clk) / 10000;

	struct soc_pcmcia_timing timing;

	int sock = skt->nr;



	soc_common_pcmcia_get_timing(skt, &timing);



	pxa2xx_pcmcia_set_mcmem(sock, timing.mem, clk);

	pxa2xx_pcmcia_set_mcatt(sock, timing.attr, clk);

	pxa2xx_pcmcia_set_mcio(sock, timing.io, clk);

	pxa_smemc_set_pcmcia_timing(sock,

		pxa2xx_pcmcia_mcmem(sock, timing.mem, clk),

		pxa2xx_pcmcia_mcatt(sock, timing.attr, clk),

		pxa2xx_pcmcia_mcio(sock, timing.io, clk));



	return 0;

}



static int pxa2xx_pcmcia_set_timing(struct soc_pcmcia_socket *skt)

{

	unsigned long clk = clk_get_rate(skt->clk);

	return pxa2xx_pcmcia_set_mcxx(skt, clk / 10000);

}



#ifdef CONFIG_CPU_FREQ



static int
@@ -215,18 +206,13 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, 


void pxa2xx_configure_sockets(struct device *dev, struct pcmcia_low_level *ops)

{

	/*

	 * We have at least one socket, so set MECR:CIT

	 * (Card Is There)

	 */

	uint32_t mecr = MECR_CIT;

	int nr = 1;



	/* Set MECR:NOS (Number Of Sockets) */

	if ((ops->first + ops->nr) > 1 ||

	    machine_is_viper() || machine_is_arcom_zeus())

		mecr |= MECR_NOS;

		nr = 2;



	__raw_writel(mecr, MECR);

	pxa_smemc_set_pcmcia_socket(nr);

}

EXPORT_SYMBOL(pxa2xx_configure_sockets);

include/linux/soc/pxa/smemc.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

#ifndef __PXA_REGS_H

#define __PXA_REGS_H



#include <linux/types.h>



void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio);

void pxa_smemc_set_pcmcia_socket(int nr);



#endif