Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec88b60 authored by Kelvin Cheung's avatar Kelvin Cheung Committed by Ralf Baechle
Browse files

MIPS: Loongson1B: Some updates/fixes for LS1B 



- Add DMA device
- Add NAND device
- Add GPIO device
- Add LED device
- Update the defconfig and rename it to loongson1b_defconfig
- Fix ioremap size
- Other minor fixes

Signed-off-by: default avatarKelvin Cheung <keguang.zhang@gmail.com>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-clk@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: dmaengine@vger.kernel.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-mtd@lists.infradead.org
Patchwork: https://patchwork.linux-mips.org/patch/13033/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0d61ed17

arch/mips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,8 @@ config CPU_LOONGSON1B 
	bool "Loongson 1B"

	depends on SYS_HAS_CPU_LOONGSON1B

	select CPU_LOONGSON1

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select LEDS_GPIO_REGISTER

	help

	  The Loongson 1B is a 32-bit SoC, which implements the MIPS32

	  release 2 instruction set.

arch/mips/configs/ls1b_defconfig→arch/mips/configs/loongson1b_defconfig

+25 −10
Original line number Diff line number Diff line 
CONFIG_MACH_LOONGSON32=y

CONFIG_PREEMPT=y

# CONFIG_SECCOMP is not set

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set
@@ -41,6 +39,12 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_LOONGSON1=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=m

# CONFIG_SCSI_PROC_FS is not set
@@ -48,7 +52,6 @@ CONFIG_BLK_DEV_SD=m 
# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set
@@ -56,7 +59,6 @@ CONFIG_NETDEVICES=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

CONFIG_STMMAC_ETH=y

CONFIG_STMMAC_DA=y

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y
@@ -69,18 +71,25 @@ CONFIG_LEGACY_PTY_COUNT=8 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_LOONGSON1=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_USB_HID=m

CONFIG_HID_GENERIC=m

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=m

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_PL2303=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_LOONGSON1=y

# CONFIG_IOMMU_SUPPORT is not set
@@ -96,15 +105,21 @@ CONFIG_VFAT_FS=y 
CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_UBIFS_ATIME_SUPPORT=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

CONFIG_DYNAMIC_DEBUG=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_FTRACE is not set

# CONFIG_EARLY_PRINTK is not set

# CONFIG_CRYPTO_ECHAINIV is not set

# CONFIG_CRYPTO_HW is not set

arch/mips/include/asm/mach-loongson32/cpufreq.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * option) any later version.

 */





#ifndef __ASM_MACH_LOONGSON32_CPUFREQ_H

#define __ASM_MACH_LOONGSON32_CPUFREQ_H

arch/mips/include/asm/mach-loongson32/dma.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015 Zhang, Keguang <keguang.zhang@gmail.com>

 *

 * Loongson 1 NAND platform support.

 *

 * This program is free software; you can redistribute	it and/or modify it

 * under  the terms of	the GNU General	 Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#ifndef __ASM_MACH_LOONGSON32_DMA_H

#define __ASM_MACH_LOONGSON32_DMA_H



#define LS1X_DMA_CHANNEL0	0

#define LS1X_DMA_CHANNEL1	1

#define LS1X_DMA_CHANNEL2	2



struct plat_ls1x_dma {

	int nr_channels;

};



extern struct plat_ls1x_dma ls1b_dma_pdata;



#endif /* __ASM_MACH_LOONGSON32_DMA_H */

arch/mips/include/asm/mach-loongson32/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * option) any later version.

 */





#ifndef __ASM_MACH_LOONGSON32_IRQ_H

#define __ASM_MACH_LOONGSON32_IRQ_H