Commit f39cf0b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: enable m41t80 driver in s6105_defconfig
  xtensa: add m41t62 rtc to s6105 platform
  xtensa: enable s6gmac in s6105_defconfig
  xtensa: s6105 specific configuration for s6gmac
  s6gmac: xtensa s6000 on-chip ethernet driver
  xtensa: support s6000 gpio irqs and alternate function selection
  xtensa: s6000 dma engine support
  xtensa: allow variant to initialize own irq chips
  xtensa: cache inquiry and unaligned cache handling functions
parents 59ef7a83 aafd1255

arch/xtensa/configs/s6105_defconfig

+101 −4
Original line number Diff line number Diff line
@@ -263,7 +263,54 @@ CONFIG_HAVE_IDE=y 
# CONFIG_SCSI_NETLINK is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

# CONFIG_NETDEVICES is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

CONFIG_SMSC_PHY=y

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

# CONFIG_NET_ETHERNET is not set

CONFIG_NETDEV_1000=y

CONFIG_S6GMAC=y

# CONFIG_NETDEV_10000 is not set



#

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set
@@ -304,8 +351,6 @@ CONFIG_UNIX98_PTYS=y 
# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set
@@ -387,7 +432,59 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_RTC_CLASS is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set



#

# RTC interfaces

#

# CONFIG_RTC_INTF_SYSFS is not set

# CONFIG_RTC_INTF_PROC is not set

# CONFIG_RTC_INTF_DEV is not set

# CONFIG_RTC_DRV_TEST is not set



#

# I2C RTC drivers

#

# CONFIG_RTC_DRV_DS1307 is not set

# CONFIG_RTC_DRV_DS1374 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_MAX6900 is not set

# CONFIG_RTC_DRV_RS5C372 is not set

# CONFIG_RTC_DRV_ISL1208 is not set

# CONFIG_RTC_DRV_X1205 is not set

# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

CONFIG_RTC_DRV_M41T80=y

# CONFIG_RTC_DRV_M41T80_WDT is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set



#

# SPI RTC drivers

#



#

# Platform RTC drivers

#

# CONFIG_RTC_DRV_DS1286 is not set

# CONFIG_RTC_DRV_DS1511 is not set

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_STK17TA8 is not set

# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_V3020 is not set



#

# on-CPU RTC drivers

#

# CONFIG_DMADEVICES is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

arch/xtensa/include/asm/cacheflush.h

+95 −0
Original line number Diff line number Diff line
@@ -155,5 +155,100 @@ extern void copy_from_user_page(struct vm_area_struct*, struct page*, 


#endif



#define XTENSA_CACHEBLK_LOG2	29

#define XTENSA_CACHEBLK_SIZE	(1 << XTENSA_CACHEBLK_LOG2)

#define XTENSA_CACHEBLK_MASK	(7 << XTENSA_CACHEBLK_LOG2)



#if XCHAL_HAVE_CACHEATTR

static inline u32 xtensa_get_cacheattr(void)

{

	u32 r;

	asm volatile("	rsr %0, CACHEATTR" : "=a"(r));

	return r;

}



static inline u32 xtensa_get_dtlb1(u32 addr)

{

	u32 r = addr & XTENSA_CACHEBLK_MASK;

	return r | ((xtensa_get_cacheattr() >> (r >> (XTENSA_CACHEBLK_LOG2-2)))

			& 0xF);

}

#else

static inline u32 xtensa_get_dtlb1(u32 addr)

{

	u32 r;

	asm volatile("	rdtlb1 %0, %1" : "=a"(r) : "a"(addr));

	asm volatile("	dsync");

	return r;

}



static inline u32 xtensa_get_cacheattr(void)

{

	u32 r = 0;

	u32 a = 0;

	do {

		a -= XTENSA_CACHEBLK_SIZE;

		r = (r << 4) | (xtensa_get_dtlb1(a) & 0xF);

	} while (a);

	return r;

}

#endif



static inline int xtensa_need_flush_dma_source(u32 addr)

{

	return (xtensa_get_dtlb1(addr) & ((1 << XCHAL_CA_BITS) - 1)) >= 4;

}



static inline int xtensa_need_invalidate_dma_destination(u32 addr)

{

	return (xtensa_get_dtlb1(addr) & ((1 << XCHAL_CA_BITS) - 1)) != 2;

}



static inline void flush_dcache_unaligned(u32 addr, u32 size)

{

	u32 cnt;

	if (size) {

		cnt = (size + ((XCHAL_DCACHE_LINESIZE - 1) & addr)

			+ XCHAL_DCACHE_LINESIZE - 1) / XCHAL_DCACHE_LINESIZE;

		while (cnt--) {

			asm volatile("	dhwb %0, 0" : : "a"(addr));

			addr += XCHAL_DCACHE_LINESIZE;

		}

		asm volatile("	dsync");

	}

}



static inline void invalidate_dcache_unaligned(u32 addr, u32 size)

{

	int cnt;

	if (size) {

		asm volatile("	dhwbi %0, 0 ;" : : "a"(addr));

		cnt = (size + ((XCHAL_DCACHE_LINESIZE - 1) & addr)

			- XCHAL_DCACHE_LINESIZE - 1) / XCHAL_DCACHE_LINESIZE;

		while (cnt-- > 0) {

			asm volatile("	dhi %0, %1" : : "a"(addr),

						"n"(XCHAL_DCACHE_LINESIZE));

			addr += XCHAL_DCACHE_LINESIZE;

		}

		asm volatile("	dhwbi %0, %1" : : "a"(addr),

						"n"(XCHAL_DCACHE_LINESIZE));

		asm volatile("	dsync");

	}

}



static inline void flush_invalidate_dcache_unaligned(u32 addr, u32 size)

{

	u32 cnt;

	if (size) {

		cnt = (size + ((XCHAL_DCACHE_LINESIZE - 1) & addr)

			+ XCHAL_DCACHE_LINESIZE - 1) / XCHAL_DCACHE_LINESIZE;

		while (cnt--) {

			asm volatile("	dhwbi %0, 0" : : "a"(addr));

			addr += XCHAL_DCACHE_LINESIZE;

		}

		asm volatile("	dsync");

	}

}



#endif /* __KERNEL__ */

#endif /* _XTENSA_CACHEFLUSH_H */

arch/xtensa/include/asm/gpio.h

+4 −4
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ static inline int gpio_cansleep(unsigned int gpio) 
	return __gpio_cansleep(gpio);

}



/*

 * Not implemented, yet.

 */

static inline int gpio_to_irq(unsigned int gpio)

{

	return -ENOSYS;

	return __gpio_to_irq(gpio);

}



/*

 * Not implemented, yet.

 */

static inline int irq_to_gpio(unsigned int irq)

{

	return -EINVAL;

arch/xtensa/include/asm/irq.h

+11 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef _XTENSA_IRQ_H

#define _XTENSA_IRQ_H



#include <linux/init.h>

#include <platform/hardware.h>

#include <variant/core.h>
@@ -21,11 +22,20 @@ static inline void variant_irq_enable(unsigned int irq) { } 
static inline void variant_irq_disable(unsigned int irq) { }

#endif



#ifndef VARIANT_NR_IRQS

# define VARIANT_NR_IRQS 0

#endif

#ifndef PLATFORM_NR_IRQS

# define PLATFORM_NR_IRQS 0

#endif

#define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS

#define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS)

#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS)



#if VARIANT_NR_IRQS == 0

static inline void variant_init_irq(void) { }

#else

void variant_init_irq(void) __init;

#endif



static __inline__ int irq_canonicalize(int irq)

{

arch/xtensa/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -197,4 +197,6 @@ void __init init_IRQ(void) 
	}



	cached_irq_mask = 0;



	variant_init_irq();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE