[mvebu]: add initial 3.18 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43366 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
cfa0c5b27f
commit
8b42d10e42
|
@ -0,0 +1,305 @@
|
|||
CONFIG_ALIGNMENT_TRAP=y
|
||||
# CONFIG_AHCI_MVEBU is not set
|
||||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
|
||||
# CONFIG_CACHE_FEROCEON_L2 is not set
|
||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
||||
CONFIG_ARCH_HAS_TICK_BROADCAST=y
|
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
|
||||
CONFIG_ARCH_MULTIPLATFORM=y
|
||||
# CONFIG_ARCH_MULTI_CPU_AUTO is not set
|
||||
CONFIG_ARCH_MULTI_V6_V7=y
|
||||
CONFIG_ARCH_MULTI_V7=y
|
||||
CONFIG_ARCH_MVEBU=y
|
||||
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
|
||||
CONFIG_ARCH_NR_GPIO=0
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
||||
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
|
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARMADA_370_CLK=y
|
||||
CONFIG_ARMADA_370_XP_TIMER=y
|
||||
CONFIG_ARMADA_XP_CLK=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
|
||||
# CONFIG_ARM_CPU_SUSPEND is not set
|
||||
CONFIG_ARM_L1_CACHE_SHIFT=6
|
||||
CONFIG_ARM_L1_CACHE_SHIFT_6=y
|
||||
# CONFIG_ARM_LPAE is not set
|
||||
CONFIG_ARM_NR_BANKS=8
|
||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
|
||||
CONFIG_ARM_THUMB=y
|
||||
# CONFIG_ARM_THUMBEE is not set
|
||||
CONFIG_ARM_VIRT_EXT=y
|
||||
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_AUTO_ZRELADDR=y
|
||||
CONFIG_BOUNCE=y
|
||||
CONFIG_CACHE_L2X0=y
|
||||
CONFIG_CACHE_PL310=y
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
CONFIG_CLKSRC_MMIO=y
|
||||
CONFIG_CLKSRC_OF=y
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
CONFIG_CPU_32v6K=y
|
||||
CONFIG_CPU_32v7=y
|
||||
CONFIG_CPU_ABRT_EV7=y
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
CONFIG_CPU_CACHE_V7=y
|
||||
CONFIG_CPU_CACHE_VIPT=y
|
||||
CONFIG_CPU_COPY_V6=y
|
||||
CONFIG_CPU_CP15=y
|
||||
CONFIG_CPU_CP15_MMU=y
|
||||
CONFIG_CPU_HAS_ASID=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
CONFIG_CPU_PABRT_V7=y
|
||||
CONFIG_CPU_PJ4B=y
|
||||
CONFIG_CPU_RMAP=y
|
||||
CONFIG_CPU_TLB_V7=y
|
||||
CONFIG_CPU_V7=y
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_XZ=y
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
CONFIG_DEBUG_LL=y
|
||||
CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
|
||||
# CONFIG_DEBUG_LL_UART_8250 is not set
|
||||
# CONFIG_DEBUG_LL_UART_PL01X is not set
|
||||
CONFIG_DEBUG_MVEBU_UART=y
|
||||
# CONFIG_DEBUG_MVEBU_UART_ALTERNATE is not set
|
||||
CONFIG_DEBUG_UART_8250=y
|
||||
# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
|
||||
CONFIG_DEBUG_UART_8250_SHIFT=2
|
||||
# CONFIG_DEBUG_UART_8250_WORD is not set
|
||||
CONFIG_DEBUG_UART_PHYS=0xd0012000
|
||||
# CONFIG_DEBUG_UART_PL01X is not set
|
||||
CONFIG_DEBUG_UART_VIRT=0xfec12000
|
||||
CONFIG_DEBUG_UNCOMPRESS=y
|
||||
CONFIG_DEBUG_USER=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_DMA_ENGINE=y
|
||||
CONFIG_DMA_ENGINE_RAID=y
|
||||
CONFIG_DMA_OF=y
|
||||
CONFIG_DTC=y
|
||||
# CONFIG_DW_DMAC_CORE is not set
|
||||
# CONFIG_DW_DMAC_PCI is not set
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_FRAME_POINTER=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y
|
||||
CONFIG_GENERIC_IO=y
|
||||
CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_GENERIC_NET_UTILS=y
|
||||
CONFIG_GENERIC_PCI_IOMAP=y
|
||||
CONFIG_GENERIC_SCHED_CLOCK=y
|
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y
|
||||
CONFIG_GENERIC_STRNLEN_USER=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
CONFIG_GPIO_GENERIC=y
|
||||
CONFIG_GPIO_MVEBU=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_HAVE_BPF_JIT=y
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
CONFIG_HAVE_CLK=y
|
||||
CONFIG_HAVE_CLK_PREPARE=y
|
||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
||||
CONFIG_HAVE_C_RECORDMCOUNT=y
|
||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
||||
CONFIG_HAVE_DMA_API_DEBUG=y
|
||||
CONFIG_HAVE_DMA_ATTRS=y
|
||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_HAVE_KERNEL_GZIP=y
|
||||
CONFIG_HAVE_KERNEL_LZ4=y
|
||||
CONFIG_HAVE_KERNEL_LZMA=y
|
||||
CONFIG_HAVE_KERNEL_LZO=y
|
||||
CONFIG_HAVE_KERNEL_XZ=y
|
||||
CONFIG_HAVE_MEMBLOCK=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
CONFIG_HAVE_PERF_REGS=y
|
||||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_PROC_CPU=y
|
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
||||
CONFIG_HAVE_SMP=y
|
||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
|
||||
CONFIG_HAVE_UID16=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HIGHMEM=y
|
||||
# CONFIG_HIGHPTE is not set
|
||||
CONFIG_HZ_FIXED=0
|
||||
CONFIG_HZ_PERIODIC=y
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_IOMMU_HELPER=y
|
||||
CONFIG_IRQCHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
# CONFIG_IWMMXT is not set
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_LZO_COMPRESS=y
|
||||
CONFIG_LZO_DECOMPRESS=y
|
||||
CONFIG_MACH_ARMADA_370=y
|
||||
CONFIG_MACH_ARMADA_370_XP=y
|
||||
# CONFIG_MACH_ARMADA_375 is not set
|
||||
# CONFIG_MACH_ARMADA_38X is not set
|
||||
CONFIG_MACH_ARMADA_XP=y
|
||||
# CONFIG_MACH_DOVE is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MARVELL_PHY=y
|
||||
CONFIG_MDIO_BOARDINFO=y
|
||||
CONFIG_MEMORY=y
|
||||
CONFIG_MIGHT_HAVE_PCI=y
|
||||
# CONFIG_MLX5_CORE is not set
|
||||
CONFIG_MODULES_USE_ELF_REL=y
|
||||
CONFIG_MTD_CFI_STAA=y
|
||||
CONFIG_MTD_M25P80=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_ECC=y
|
||||
CONFIG_MTD_NAND_PXA3xx=y
|
||||
# CONFIG_MTD_SM_COMMON is not set
|
||||
CONFIG_MTD_SPI_NOR=y
|
||||
CONFIG_MTD_UBI=y
|
||||
CONFIG_MTD_UBI_BEB_LIMIT=20
|
||||
CONFIG_MTD_UBI_BLOCK=y
|
||||
# CONFIG_MTD_UBI_FASTMAP is not set
|
||||
# CONFIG_MTD_UBI_GLUEBI is not set
|
||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
||||
CONFIG_MULTI_IRQ_HANDLER=y
|
||||
CONFIG_MUTEX_SPIN_ON_OWNER=y
|
||||
CONFIG_MVEBU_CLK_COMMON=y
|
||||
CONFIG_MVEBU_CLK_COREDIV=y
|
||||
CONFIG_MVEBU_CLK_CPU=y
|
||||
CONFIG_MVEBU_DEVBUS=y
|
||||
CONFIG_MVEBU_MBUS=y
|
||||
CONFIG_MVMDIO=y
|
||||
CONFIG_MVNETA=y
|
||||
CONFIG_MV_XOR=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
# CONFIG_NEON is not set
|
||||
CONFIG_NET_FLOW_LIMIT=y
|
||||
CONFIG_NET_RX_BUSY_POLL=y
|
||||
CONFIG_NO_BOOTMEM=y
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
CONFIG_OF_FLATTREE=y
|
||||
CONFIG_OF_GPIO=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_OF_MTD=y
|
||||
CONFIG_OF_NET=y
|
||||
CONFIG_OF_PCI=y
|
||||
CONFIG_OF_PCI_IRQ=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_OUTER_CACHE=y
|
||||
CONFIG_OUTER_CACHE_SYNC=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MVEBU=y
|
||||
CONFIG_PERF_USE_VMALLOC=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_ARMADA_370=y
|
||||
CONFIG_PINCTRL_ARMADA_XP=y
|
||||
CONFIG_PINCTRL_MVEBU=y
|
||||
# CONFIG_PINCTRL_SINGLE is not set
|
||||
CONFIG_PJ4B_ERRATA_4742=y
|
||||
# CONFIG_PL310_ERRATA_588369 is not set
|
||||
# CONFIG_PL310_ERRATA_727915 is not set
|
||||
# CONFIG_PL310_ERRATA_753970 is not set
|
||||
# CONFIG_PL310_ERRATA_769419 is not set
|
||||
CONFIG_PLAT_ORION=y
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
CONFIG_PROC_DEVICETREE=y
|
||||
CONFIG_RCU_STALL_COMMON=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
# CONFIG_RTC_DRV_MV is not set
|
||||
CONFIG_SCHED_HRTICK=y
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SMP_ON_UP=y
|
||||
CONFIG_SPARSE_IRQ=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_MASTER=y
|
||||
CONFIG_SPI_ORION=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_SWIOTLB=y
|
||||
# CONFIG_SWP_EMULATE is not set
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
||||
CONFIG_TIMER_STATS=y
|
||||
CONFIG_TREE_RCU=y
|
||||
CONFIG_UBIFS_FS=y
|
||||
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
|
||||
CONFIG_UBIFS_FS_LZO=y
|
||||
CONFIG_UBIFS_FS_XZ=y
|
||||
CONFIG_UBIFS_FS_ZLIB=y
|
||||
CONFIG_UID16=y
|
||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
|
||||
CONFIG_USB_SUPPORT=y
|
||||
# CONFIG_USB_XHCI_MVEBU is not set
|
||||
CONFIG_USE_OF=y
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_VFP=y
|
||||
CONFIG_VFPv3=y
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XPS=y
|
||||
CONFIG_XZ_DEC_ARM=y
|
||||
CONFIG_XZ_DEC_BCJ=y
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
# CONFIG_ZBUD is not set
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
|
@ -0,0 +1,10 @@
|
|||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -506,6 +506,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
|
||||
armada-xp-db.dtb \
|
||||
armada-xp-gp.dtb \
|
||||
armada-xp-lenovo-ix4-300d.dtb \
|
||||
+ armada-xp-mamba.dtb \
|
||||
armada-xp-matrix.dtb \
|
||||
armada-xp-netgear-rn2120.dtb \
|
||||
armada-xp-openblocks-ax3-4.dtb
|
|
@ -0,0 +1,15 @@
|
|||
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
||||
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
||||
@@ -43,12 +43,10 @@
|
||||
};
|
||||
|
||||
i2c0: i2c@11000 {
|
||||
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
|
||||
reg = <0x11000 0x100>;
|
||||
};
|
||||
|
||||
i2c1: i2c@11100 {
|
||||
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
|
||||
reg = <0x11100 0x100>;
|
||||
};
|
||||
|
|
@ -0,0 +1,529 @@
|
|||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -505,6 +505,15 @@ config LEDS_VERSATILE
|
||||
This option enabled support for the LEDs on the ARM Versatile
|
||||
and RealView boards. Say Y to enabled these.
|
||||
|
||||
+config LEDS_TLC59116
|
||||
+ tristate "LED driver for TLC59116F dimmer"
|
||||
+ depends on LEDS_CLASS
|
||||
+ depends on I2C
|
||||
+ help
|
||||
+ This option enables support for Texas Instruments TLC59116F
|
||||
+ LED controller. It is generally only useful
|
||||
+ as a platform driver
|
||||
+
|
||||
comment "LED Triggers"
|
||||
source "drivers/leds/trigger/Kconfig"
|
||||
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -56,6 +56,7 @@ obj-$(CONFIG_LEDS_BLINKM) += leds-blink
|
||||
obj-$(CONFIG_LEDS_SYSCON) += leds-syscon.o
|
||||
obj-$(CONFIG_LEDS_VERSATILE) += leds-versatile.o
|
||||
obj-$(CONFIG_LEDS_MENF21BMC) += leds-menf21bmc.o
|
||||
+obj-$(CONFIG_LEDS_TLC59116) += leds-tlc59116.o
|
||||
|
||||
# LED SPI Drivers
|
||||
obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/leds-tlc59116.c
|
||||
@@ -0,0 +1,498 @@
|
||||
+/*
|
||||
+ * Copyright 2014 Belkin Inc.
|
||||
+ *
|
||||
+ * Author: Belkin Inc.
|
||||
+ *
|
||||
+ * This file is subject to the terms and conditions of version 2 of
|
||||
+ * the GNU General Public License. See the file COPYING in the main
|
||||
+ * directory of this archive for more details.
|
||||
+ *
|
||||
+ * LED driver for various TLC59116 I2C LED drivers
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/delay.h>
|
||||
+#include <linux/string.h>
|
||||
+#include <linux/ctype.h>
|
||||
+#include <linux/leds.h>
|
||||
+#include <linux/err.h>
|
||||
+#include <linux/i2c.h>
|
||||
+#include <linux/workqueue.h>
|
||||
+
|
||||
+/* LED select registers determine the source that drives LED outputs */
|
||||
+#define TLC59116_LED_OFF 0x0 /* Output LOW */
|
||||
+#define TLC59116_LED_ON 0x1 /* Output HI-Z */
|
||||
+#define TLC59116_DIM 0x2 /* Dimming */
|
||||
+#define TLC59116_BLINK 0x3 /* Blinking */
|
||||
+
|
||||
+#define TLC59116_PINS 16
|
||||
+#define TLC59116_REG_MODE1 0x00 /* Mode register 0 */
|
||||
+#define MODE1_RESPON_ADDR_MASK 0xF0
|
||||
+#define MODE1_NORMAL_MODE (0 << 4)
|
||||
+#define MODE1_SPEED_MODE (1 << 4)
|
||||
+
|
||||
+#define TLC59116_REG_MODE2 0x01 /* Mode register 1 */
|
||||
+#define MODE2_DIM (0 << 5)
|
||||
+#define MODE2_BLINK (1 << 5)
|
||||
+#define MODE2_OCH_STOP (0 << 3)
|
||||
+#define MODE2_OCH_ACK (1 << 3)
|
||||
+
|
||||
+#define TLC59116_REG_PWM0 0x02
|
||||
+#define TLC59116_REG_PWM1 0x03
|
||||
+#define TLC59116_REG_PWM2 0x04
|
||||
+#define TLC59116_REG_PWM3 0x05
|
||||
+#define TLC59116_REG_PWM4 0x06
|
||||
+#define TLC59116_REG_PWM5 0x07
|
||||
+#define TLC59116_REG_PWM6 0x08
|
||||
+#define TLC59116_REG_PWM7 0x09
|
||||
+#define TLC59116_REG_PWM8 0x0a
|
||||
+#define TLC59116_REG_PWM9 0x0b
|
||||
+#define TLC59116_REG_PWM10 0x0c
|
||||
+#define TLC59116_REG_PWM11 0x0d
|
||||
+#define TLC59116_REG_PWM12 0x0e
|
||||
+#define TLC59116_REG_PWM13 0x0f
|
||||
+#define TLC59116_REG_PWM14 0x10
|
||||
+#define TLC59116_REG_PWM15 0x01
|
||||
+
|
||||
+#define TLC59116_REG_GRPPWM 0x12
|
||||
+#define TLC59116_REG_GRPFREQ 0x13
|
||||
+
|
||||
+#define TLC59116_PERIOD_MIN 41 /* 41ms */
|
||||
+#define TLC59116_PERIOD_MAX 10730 /* 10.73s */
|
||||
+
|
||||
+#define TLC59116_REG_LEDOUT0 0x14 /* LED [3:0] driver output state registers */
|
||||
+#define TLC59116_REG_LEDOUT1 0x15 /* LED [7:4] driver output state registers */
|
||||
+#define TLC59116_REG_LEDOUT2 0x16 /* LED [11:8] driver output state registers */
|
||||
+#define TLC59116_REG_LEDOUT3 0x17 /* LED [15:12] driver output state registers */
|
||||
+
|
||||
+#define GPIO0_MASK 0x3
|
||||
+
|
||||
+#define DEBUG 0
|
||||
+
|
||||
+#if DEBUG > 1
|
||||
+#define led_dbg(fmt, arg...) printk(KERN_DEBUG "tlc59116:%s " fmt "\n", __func__ , ## arg)
|
||||
+#else
|
||||
+#define led_dbg(fmt, arg...)
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+#if DEBUG > 0
|
||||
+#define led_info(fmt, arg...) printk("tlc59116:%s " fmt "\n", __func__ , ## arg)
|
||||
+#else
|
||||
+#define led_info(fmt, arg...)
|
||||
+#endif
|
||||
+
|
||||
+enum tlc59116_type {
|
||||
+ tlc59116,
|
||||
+};
|
||||
+
|
||||
+struct tlc59116_chipdef {
|
||||
+ int bits;
|
||||
+ u8 slv_addr; /* 7-bit slave address mask */
|
||||
+ int slv_addr_shift; /* Number of bits to ignore */
|
||||
+};
|
||||
+
|
||||
+static struct tlc59116_chipdef tlc59116_chipdefs[] = {
|
||||
+ [tlc59116] = {
|
||||
+ .bits = 16,
|
||||
+ .slv_addr = /* 1100xxx */ 0x68,
|
||||
+ .slv_addr_shift = 3,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static const struct i2c_device_id tlc59116_id[] = {
|
||||
+ { "tlc59116", tlc59116 },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(i2c, tlc59116_id);
|
||||
+
|
||||
+struct tlc59116_led {
|
||||
+ struct tlc59116_chipdef *chipdef;
|
||||
+ struct i2c_client *client;
|
||||
+ struct work_struct work;
|
||||
+ spinlock_t lock;
|
||||
+ enum led_brightness brightness;
|
||||
+ struct led_classdev led_cdev;
|
||||
+ int led_num; /* 0 .. 8 potentially */
|
||||
+ char name[32];
|
||||
+};
|
||||
+
|
||||
+//#define DUMP_REGS
|
||||
+
|
||||
+#ifdef DUMP_REGS
|
||||
+void dump_regs(struct i2c_client *client)
|
||||
+{
|
||||
+ int i, j = 0;
|
||||
+ u8 data;
|
||||
+ printk ("\n-------------------------------------\n");
|
||||
+ for (i = 0; i< 0x20; i++)
|
||||
+ {
|
||||
+ data = i2c_smbus_read_byte_data(client, i);
|
||||
+ printk ("[0x%x] = 0x%x ",i, data);
|
||||
+ j++;
|
||||
+ if (j == 5)
|
||||
+ {
|
||||
+ printk ("\n");
|
||||
+ j = 0;
|
||||
+ }
|
||||
+ }
|
||||
+ printk ("\n");
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+static int tlc59116_set_mode(struct i2c_client *client, uint8_t mode)
|
||||
+{
|
||||
+ uint8_t val = 0;
|
||||
+
|
||||
+ if ((mode != MODE2_DIM) && (mode != MODE2_BLINK))
|
||||
+ mode = MODE2_DIM;
|
||||
+
|
||||
+ /* Configure MODE1 register */
|
||||
+ val &= 0x0;
|
||||
+ val &= MODE1_RESPON_ADDR_MASK;
|
||||
+ val |= MODE1_NORMAL_MODE;
|
||||
+ i2c_smbus_write_byte_data(client, TLC59116_REG_MODE1, val);
|
||||
+
|
||||
+ /* Configure MODE2 Reg */
|
||||
+ val &= 0x00;
|
||||
+ val |= MODE2_OCH_STOP;
|
||||
+
|
||||
+ val |= mode;
|
||||
+
|
||||
+ i2c_smbus_write_byte_data(client, TLC59116_REG_MODE2, val);
|
||||
+ mdelay(100);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int tlc59116_set_gpio_act(struct i2c_client *client, u8 gpio_no, u8 act_mode)
|
||||
+{
|
||||
+ char data, addr = 0, i;
|
||||
+
|
||||
+ if ((gpio_no >= 0) && (gpio_no < 4))
|
||||
+ addr = TLC59116_REG_LEDOUT0;
|
||||
+ else if ((gpio_no >= 4) && (gpio_no < 8))
|
||||
+ addr = TLC59116_REG_LEDOUT1;
|
||||
+ else if ((gpio_no >= 8) && (gpio_no < 12))
|
||||
+ addr = TLC59116_REG_LEDOUT2;
|
||||
+ else if ((gpio_no >=12 ) && (gpio_no < 16))
|
||||
+ addr = TLC59116_REG_LEDOUT3;
|
||||
+
|
||||
+ data = i2c_smbus_read_byte_data(client, addr);
|
||||
+
|
||||
+ i = (gpio_no % 4) * 2;
|
||||
+
|
||||
+ data &= ~(GPIO0_MASK << i);
|
||||
+ act_mode = act_mode << i;
|
||||
+ data |= act_mode;
|
||||
+
|
||||
+ if(i2c_smbus_write_byte_data(client, addr, data) != 0) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int tlc59116_set_gpio(struct i2c_client *client, uint8_t gpio_no, uint8_t val)
|
||||
+{
|
||||
+ val &= 0x03;
|
||||
+ tlc59116_set_gpio_act(client, gpio_no, val);
|
||||
+#ifdef DUMP_REGS
|
||||
+ dump_regs(client);
|
||||
+#endif
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int tlc59116_get_gpio(struct i2c_client *client, uint8_t gpio_no)
|
||||
+{
|
||||
+ uint8_t val, reg, data;
|
||||
+
|
||||
+ led_dbg("gpio = %d\n", gpio_no);
|
||||
+ reg = TLC59116_REG_LEDOUT0;
|
||||
+
|
||||
+ if ((gpio_no >= 0) && (gpio_no < 4))
|
||||
+ reg = TLC59116_REG_LEDOUT0;
|
||||
+ else if ((gpio_no >= 4) && (gpio_no < 8)) {
|
||||
+ reg = TLC59116_REG_LEDOUT1;
|
||||
+ gpio_no = gpio_no - 4;
|
||||
+ }
|
||||
+ else if ((gpio_no >= 8) && (gpio_no < 12)) {
|
||||
+ reg = TLC59116_REG_LEDOUT2;
|
||||
+ gpio_no = gpio_no - 8;
|
||||
+ }
|
||||
+ else if ((gpio_no >=12 ) && (gpio_no < 16)) {
|
||||
+ reg = TLC59116_REG_LEDOUT3;
|
||||
+ gpio_no = gpio_no - 12;
|
||||
+ }
|
||||
+
|
||||
+ val = i2c_smbus_read_byte_data(client, reg);
|
||||
+
|
||||
+ data = (val >> (gpio_no * 2)) & 0x03;
|
||||
+ return data;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * gpio_no [0..7]
|
||||
+ * duty_cycle [0..99]%
|
||||
+ *
|
||||
+ * */
|
||||
+static int tlc59116_individual_brighness_control(struct i2c_client *client, uint8_t gpio_no, uint8_t brightness)
|
||||
+{
|
||||
+ uint8_t pwm;
|
||||
+
|
||||
+ pwm = gpio_no + TLC59116_REG_PWM0;
|
||||
+ i2c_smbus_write_byte_data(client, pwm, brightness);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void tlc59116_led_work(struct work_struct *work)
|
||||
+{
|
||||
+ struct tlc59116_led *tlc59116;
|
||||
+
|
||||
+ tlc59116 = container_of(work, struct tlc59116_led, work);
|
||||
+
|
||||
+ led_dbg("\nbrighness = %d \n", tlc59116->brightness);
|
||||
+ switch (tlc59116->brightness) {
|
||||
+ case LED_OFF:
|
||||
+ led_info("\nLed off\n");
|
||||
+ tlc59116_set_gpio(tlc59116->client, tlc59116->led_num, TLC59116_LED_OFF);
|
||||
+ break;
|
||||
+
|
||||
+ case LED_FULL:
|
||||
+ led_info("\nLed on\n");
|
||||
+ tlc59116_set_gpio(tlc59116->client, tlc59116->led_num, TLC59116_LED_ON);
|
||||
+ break;
|
||||
+ default:
|
||||
+ led_info("\nBrightness is %d\n", tlc59116->brightness);
|
||||
+ if (TLC59116_BLINK != tlc59116_get_gpio(tlc59116->client, tlc59116->led_num))
|
||||
+ tlc59116_set_gpio(tlc59116->client, tlc59116->led_num, TLC59116_DIM);
|
||||
+
|
||||
+ tlc59116_individual_brighness_control(tlc59116->client, tlc59116->led_num, tlc59116->brightness);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
+
|
||||
+static void tlc59116_led_set(struct led_classdev *led_cdev, enum led_brightness value)
|
||||
+{
|
||||
+ struct tlc59116_led *tlc59116;
|
||||
+
|
||||
+ tlc59116 = container_of(led_cdev, struct tlc59116_led, led_cdev);
|
||||
+
|
||||
+ spin_lock(&tlc59116->lock);
|
||||
+ tlc59116->brightness = value;
|
||||
+
|
||||
+ /*
|
||||
+ * Must use workqueue for the actual I/O since I2C operations
|
||||
+ * can sleep.
|
||||
+ */
|
||||
+ schedule_work(&tlc59116->work);
|
||||
+
|
||||
+ spin_unlock(&tlc59116->lock);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * delay_on, delay_off: units are in ms
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+static int tlc59116_set_blink(struct led_classdev *led_cdev,
|
||||
+ unsigned long *delay_on,
|
||||
+ unsigned long *delay_off)
|
||||
+{
|
||||
+ struct tlc59116_led *tlc59116;
|
||||
+ uint16_t period;
|
||||
+ uint16_t duty_cycle;
|
||||
+ uint8_t gdc;
|
||||
+ uint8_t gfrq;
|
||||
+
|
||||
+ tlc59116 = container_of(led_cdev, struct tlc59116_led, led_cdev);
|
||||
+ led_info ("Blinking: delay_on = %ldms, delay_off = %ldms, brightness = %d\n",
|
||||
+ *delay_on, *delay_off, tlc59116->brightness);
|
||||
+
|
||||
+ // Hardware blinking only for tricolor leds . The rest will have software blinking
|
||||
+ if (tlc59116->led_num > 2)
|
||||
+ return 1;
|
||||
+
|
||||
+ if ((*delay_on == 0) && (*delay_off ==0)) {
|
||||
+ spin_lock(&tlc59116->lock);
|
||||
+
|
||||
+ /* MODE2[DMBLNK] = 1 */
|
||||
+ tlc59116_set_mode(tlc59116->client, MODE2_BLINK);
|
||||
+
|
||||
+ /* Set LDRx = 11 */
|
||||
+ tlc59116_set_gpio(tlc59116->client, tlc59116->led_num, TLC59116_BLINK);
|
||||
+
|
||||
+ tlc59116_individual_brighness_control(tlc59116->client, tlc59116->led_num, tlc59116->brightness);
|
||||
+ spin_unlock(&tlc59116->lock);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ if ((*delay_on + *delay_off) > TLC59116_PERIOD_MAX)
|
||||
+ {
|
||||
+ led_dbg ("Max period is %dms\n", TLC59116_PERIOD_MAX);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if ((*delay_on + *delay_off) < TLC59116_PERIOD_MIN)
|
||||
+ {
|
||||
+ *delay_on = TLC59116_PERIOD_MIN/2 + 1;
|
||||
+ *delay_off = TLC59116_PERIOD_MIN/2 + 1;
|
||||
+ }
|
||||
+ period = (*delay_on) + (*delay_off);
|
||||
+
|
||||
+ duty_cycle = (100 * (*delay_on)) / period;
|
||||
+
|
||||
+ spin_lock(&tlc59116->lock);
|
||||
+
|
||||
+ /* MODE2[DMBLNK] = 1 */
|
||||
+ tlc59116_set_mode(tlc59116->client, MODE2_BLINK);
|
||||
+
|
||||
+ /* Set LDRx = 11 */
|
||||
+ tlc59116_set_gpio(tlc59116->client, tlc59116->led_num, TLC59116_BLINK);
|
||||
+
|
||||
+ tlc59116_individual_brighness_control(tlc59116->client, tlc59116->led_num, tlc59116->brightness);
|
||||
+
|
||||
+ gdc = (duty_cycle * 256)/100;
|
||||
+ i2c_smbus_write_byte_data(tlc59116->client, TLC59116_REG_GRPPWM, gdc);
|
||||
+
|
||||
+ gfrq = (24 * period)/1000 - 1; /* unit is in second (convert from ms to second) */
|
||||
+ i2c_smbus_write_byte_data(tlc59116->client, TLC59116_REG_GRPFREQ, gfrq);
|
||||
+
|
||||
+
|
||||
+#ifdef DUMP_REGS
|
||||
+ dump_regs(tlc59116->client);
|
||||
+#endif
|
||||
+
|
||||
+ spin_unlock(&tlc59116->lock);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int tlc59116_probe(struct i2c_client *client,
|
||||
+ const struct i2c_device_id *id)
|
||||
+{
|
||||
+ struct tlc59116_led *tlc59116;
|
||||
+ struct tlc59116_chipdef *chip;
|
||||
+ struct i2c_adapter *adapter;
|
||||
+ struct led_platform_data *pdata;
|
||||
+ int i, err;
|
||||
+
|
||||
+ chip = &tlc59116_chipdefs[id->driver_data];
|
||||
+ adapter = to_i2c_adapter(client->dev.parent);
|
||||
+ pdata = client->dev.platform_data;
|
||||
+
|
||||
+ /* Make sure the slave address / chip type combo given is possible */
|
||||
+ if ((client->addr & ~((1 << chip->slv_addr_shift) - 1)) !=
|
||||
+ chip->slv_addr) {
|
||||
+ dev_err(&client->dev, "invalid slave address %02x\n",
|
||||
+ client->addr);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ printk(KERN_INFO "leds-tlc59116: Using %s %d-bit LED driver at "
|
||||
+ "slave address 0x%02x\n",
|
||||
+ id->name, chip->bits, client->addr);
|
||||
+
|
||||
+ if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
|
||||
+ return -EIO;
|
||||
+
|
||||
+ if (pdata) {
|
||||
+ if (pdata->num_leds != chip->bits) {
|
||||
+ dev_err(&client->dev, "board info claims %d LEDs"
|
||||
+ " on a %d-bit chip\n",
|
||||
+ pdata->num_leds, chip->bits);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ tlc59116 = devm_kzalloc(&client->dev, sizeof(*tlc59116) * chip->bits, GFP_KERNEL);
|
||||
+ if (!tlc59116)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ i2c_set_clientdata(client, tlc59116);
|
||||
+
|
||||
+ for (i = 0; i < chip->bits; i++) {
|
||||
+ tlc59116[i].chipdef = chip;
|
||||
+ tlc59116[i].client = client;
|
||||
+ tlc59116[i].led_num = i;
|
||||
+
|
||||
+ /* Platform data can specify LED names and default triggers */
|
||||
+ if (pdata) {
|
||||
+ if (pdata->leds[i].name)
|
||||
+ snprintf(tlc59116[i].name,
|
||||
+ sizeof(tlc59116[i].name), "tlc59116:%s",
|
||||
+ pdata->leds[i].name);
|
||||
+ if (pdata->leds[i].default_trigger)
|
||||
+ tlc59116[i].led_cdev.default_trigger =
|
||||
+ pdata->leds[i].default_trigger;
|
||||
+ } else {
|
||||
+ snprintf(tlc59116[i].name, sizeof(tlc59116[i].name),
|
||||
+ "tlc59116:%d", i);
|
||||
+ }
|
||||
+
|
||||
+ spin_lock_init(&tlc59116[i].lock);
|
||||
+
|
||||
+ tlc59116[i].led_cdev.name = tlc59116[i].name;
|
||||
+ tlc59116[i].led_cdev.brightness_set = tlc59116_led_set;
|
||||
+ tlc59116[i].led_cdev.blink_set = tlc59116_set_blink;
|
||||
+ tlc59116[i].led_cdev.brightness = 0;
|
||||
+
|
||||
+ INIT_WORK(&tlc59116[i].work, tlc59116_led_work);
|
||||
+
|
||||
+ err = led_classdev_register(&client->dev, &tlc59116[i].led_cdev);
|
||||
+ if (err < 0)
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ tlc59116_set_mode(client, MODE2_DIM);
|
||||
+
|
||||
+ /* Turn off LEDs */
|
||||
+ for (i = 0; i < chip->bits; i++)
|
||||
+ tlc59116_set_gpio(client, i, TLC59116_LED_OFF);
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+exit:
|
||||
+ while (i--) {
|
||||
+ led_classdev_unregister(&tlc59116[i].led_cdev);
|
||||
+ cancel_work_sync(&tlc59116[i].work);
|
||||
+ }
|
||||
+
|
||||
+ devm_kfree(&client->dev, tlc59116);
|
||||
+ i2c_set_clientdata(client, NULL);
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+static int tlc59116_remove(struct i2c_client *client)
|
||||
+{
|
||||
+ struct tlc59116_led *tlc59116 = i2c_get_clientdata(client);
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < tlc59116->chipdef->bits; i++) {
|
||||
+ led_classdev_unregister(&tlc59116[i].led_cdev);
|
||||
+ cancel_work_sync(&tlc59116[i].work);
|
||||
+ }
|
||||
+
|
||||
+ devm_kfree(&client->dev, tlc59116);
|
||||
+ i2c_set_clientdata(client, NULL);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static struct i2c_driver tlc59116_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "leds-tlc59116",
|
||||
+ .owner = THIS_MODULE,
|
||||
+ },
|
||||
+ .probe = tlc59116_probe,
|
||||
+ .remove = tlc59116_remove,
|
||||
+ .id_table = tlc59116_id,
|
||||
+};
|
||||
+
|
||||
+module_i2c_driver(tlc59116_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Belkin Inc.");
|
||||
+MODULE_DESCRIPTION("TLC59116 LED driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
|
@ -0,0 +1,153 @@
|
|||
The WRT1900AC among other Linksys routers uses a dual-firmware layout.
|
||||
The bootloader passes the active rootfs in bootargs and also sets the
|
||||
rootfstype to jffs2 - which is clearly something we don't want.
|
||||
|
||||
Rename both root= and rootfstype= variables to avoid issues and also
|
||||
use the former to dynamically rename the active partition to "ubi".
|
||||
|
||||
|
||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
|
||||
--- a/arch/arm/boot/compressed/atags_to_fdt.c
|
||||
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
|
||||
@@ -66,6 +66,18 @@ static uint32_t get_cell_size(const void
|
||||
return cell_size;
|
||||
}
|
||||
|
||||
+static void mangle_bootargs(void *fdt, const char *fdt_cmdline)
|
||||
+{
|
||||
+ char *rootdev;
|
||||
+ char *rootfs;
|
||||
+
|
||||
+ rootdev = strstr(fdt_cmdline, "root=/dev/mtdblock");
|
||||
+ strncpy(rootdev, "uboot_active_root=", 18);
|
||||
+
|
||||
+ rootfs = strstr(fdt_cmdline, "rootfstype");
|
||||
+ strncpy(rootfs, "origfstype", 10);
|
||||
+}
|
||||
+
|
||||
static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
|
||||
{
|
||||
char cmdline[COMMAND_LINE_SIZE];
|
||||
@@ -135,6 +147,9 @@ int atags_to_fdt(void *atag_list, void *
|
||||
|
||||
for_each_tag(atag, atag_list) {
|
||||
if (atag->hdr.tag == ATAG_CMDLINE) {
|
||||
+ /* Rename the original root= and rootfstype= options */
|
||||
+ mangle_bootargs(fdt,
|
||||
+ atag->u.cmdline.cmdline);
|
||||
/* Append the ATAGS command line to the device tree
|
||||
* command line.
|
||||
* NB: This means that if the same parameter is set in
|
||||
--- a/arch/arm/boot/compressed/string.c
|
||||
+++ b/arch/arm/boot/compressed/string.c
|
||||
@@ -111,6 +111,53 @@ char *strchr(const char *s, int c)
|
||||
return (char *)s;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * strncpy - Copy a length-limited, %NUL-terminated string
|
||||
+ * @dest: Where to copy the string to
|
||||
+ * @src: Where to copy the string from
|
||||
+ * @count: The maximum number of bytes to copy
|
||||
+ *
|
||||
+ * The result is not %NUL-terminated if the source exceeds
|
||||
+ * @count bytes.
|
||||
+ *
|
||||
+ * In the case where the length of @src is less than that of
|
||||
+ * count, the remainder of @dest will be padded with %NUL.
|
||||
+ *
|
||||
+ */
|
||||
+char *strncpy(char *dest, const char *src, size_t count)
|
||||
+{
|
||||
+ char *tmp = dest;
|
||||
+
|
||||
+ while (count) {
|
||||
+ if ((*tmp = *src) != 0)
|
||||
+ src++;
|
||||
+ tmp++;
|
||||
+ count--;
|
||||
+ }
|
||||
+ return dest;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * strstr - Find the first substring in a %NUL terminated string
|
||||
+ * @s1: The string to be searched
|
||||
+ * @s2: The string to search for
|
||||
+ */
|
||||
+char *strstr(const char *s1, const char *s2)
|
||||
+{
|
||||
+ size_t l1, l2;
|
||||
+
|
||||
+ l2 = strlen(s2);
|
||||
+ if (!l2)
|
||||
+ return (char *)s1;
|
||||
+ l1 = strlen(s1);
|
||||
+ while (l1 >= l2) {
|
||||
+ l1--;
|
||||
+ if (!memcmp(s1, s2, l2))
|
||||
+ return (char *)s1;
|
||||
+ s1++;
|
||||
+ }
|
||||
+ return NULL;
|
||||
+}
|
||||
#undef memset
|
||||
|
||||
void *memset(void *s, int c, size_t count)
|
||||
--- a/drivers/mtd/ofpart.c
|
||||
+++ b/drivers/mtd/ofpart.c
|
||||
@@ -25,12 +25,15 @@ static bool node_has_compatible(struct d
|
||||
return of_get_property(pp, "compatible", NULL);
|
||||
}
|
||||
|
||||
+static int uboot_active_root;
|
||||
+
|
||||
static int parse_ofpart_partitions(struct mtd_info *master,
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
struct device_node *node;
|
||||
const char *partname;
|
||||
+ const char *owrtpart = "ubi";
|
||||
struct device_node *pp;
|
||||
int nr_parts, i;
|
||||
|
||||
@@ -78,9 +81,15 @@ static int parse_ofpart_partitions(struc
|
||||
(*pparts)[i].offset = of_read_number(reg, a_cells);
|
||||
(*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
|
||||
|
||||
- partname = of_get_property(pp, "label", &len);
|
||||
- if (!partname)
|
||||
- partname = of_get_property(pp, "name", &len);
|
||||
+ if (uboot_active_root && (i == uboot_active_root)) {
|
||||
+ partname = owrtpart;
|
||||
+ } else {
|
||||
+ partname = of_get_property(pp, "label", &len);
|
||||
+
|
||||
+ if (!partname)
|
||||
+ partname = of_get_property(pp, "name", &len);
|
||||
+ }
|
||||
+
|
||||
(*pparts)[i].name = partname;
|
||||
|
||||
if (of_get_property(pp, "read-only", &len))
|
||||
@@ -178,6 +187,18 @@ static int __init ofpart_parser_init(voi
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int __init active_root(char *str)
|
||||
+{
|
||||
+ get_option(&str, &uboot_active_root);
|
||||
+
|
||||
+ if (!uboot_active_root)
|
||||
+ return 1;
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+__setup("uboot_active_root=", active_root);
|
||||
+
|
||||
static void __exit ofpart_parser_exit(void)
|
||||
{
|
||||
deregister_mtd_parser(&ofpart_parser);
|
Loading…
Reference in New Issue