fixup! ev3dev: cumulative ev3dev changes to arm arch code

Author: dlech

arch/arm/boot/dts/da850-lego-ev3-adafruit18.dts renamed to arch/arm/boot/dts/ti/davinci/da850-lego-ev3-adafruit18.dts

@@ -780,7 +780,7 @@
 		#size-cells = <1>;
 
 		/* Hardware ID + Bluetooth MAC address */
-		hw_id: hw-id@0x3F00 {
+		hw_id: hw-id@3F00 {
 			reg = <0x3F00 12>;
 		};
 

arch/arm/boot/dts/da850-lego-ev3-color.dts renamed to arch/arm/boot/dts/ti/davinci/da850-lego-ev3-color.dts

@@ -2,46 +2,37 @@ CONFIG_LOCALVERSION="-ev3"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CGROUPS=y
-CONFIG_NAMESPACES=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_EMBEDDED=y
+# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_DAVINCI=y
 CONFIG_ARCH_DAVINCI_DA850=y
-# CONFIG_MACH_DAVINCI_DA850_EVM is not set
 CONFIG_MACH_DAVINCI_LEGOEV3=y
 CONFIG_LEGOEV3_FIQ=y
 CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_IDLE=y
 # CONFIG_SUSPEND is not set
 CONFIG_PM=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-# CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ZSMALLOC=y
-CONFIG_PGTABLE_MAPPING=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -75,26 +66,23 @@ CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUG_MENU=y
 CONFIG_RFKILL=y
-# CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_EXTRA_FIRMWARE="PRU_SUART.bin ev3-pru1.fw"
 CONFIG_EXTRA_FIRMWARE_DIR="drivers/lego/ev3/firmware"
 CONFIG_LEGO_DRIVERS=y
 CONFIG_LEGOEV3_I2C=y
+# CONFIG_LEGOEV3_PRU is not set
 CONFIG_LEGOEV3_SOUND=y
 CONFIG_NXT_ANALOG_SENSORS=m
 CONFIG_EV3_ANALOG_SENSORS=m
 CONFIG_NXT_I2C_SENSORS=m
 CONFIG_EV3_UART_SENSORS=m
 CONFIG_LEGO_SERVO_MOTORS=m
-CONFIG_LMS2012_COMPAT=m
+# CONFIG_LMS2012_COMPAT is not set
 CONFIG_WEDO=m
-CONFIG_BRICKPI=m
 CONFIG_BOARD_INFO=y
-CONFIG_SERIAL_SUART_OMAPL_PRU=y
-CONFIG_TI_PRU_RPROC_EV3DEV=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
@@ -107,6 +95,7 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=m
 CONFIG_CHR_DEV_SG=y
+# CONFIG_BLK_DEV_BSG is not set
 CONFIG_NETDEVICES=y
 CONFIG_TUN=m
 # CONFIG_ETHERNET is not set
@@ -122,13 +111,6 @@ CONFIG_PPP_SYNC_TTY=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-# CONFIG_USB_NET_NET1080 is not set
-CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_IPHETH=m
 CONFIG_ATH9K_HTC=m
 CONFIG_AR5523=m
@@ -143,11 +125,8 @@ CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RTL8187=m
 # CONFIG_RTL_CARDS is not set
-CONFIG_RTL8192CU=m
 CONFIG_RTL8XXXU=m
-CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
-CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_GPIO_POLLED=y
@@ -167,17 +146,13 @@ CONFIG_SERIAL_8250_NR_UARTS=3
 CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_DEV_BUS=y
-CONFIG_TTY_PRINTK=y
 CONFIG_HW_RANDOM=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DAVINCI=y
 CONFIG_SPI=y
 CONFIG_SPI_DAVINCI=y
 CONFIG_PINCTRL_DA850_PUPD=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCF857X=m
+CONFIG_GPIOLIB=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_BATTERY_LEGO_EV3=y
@@ -186,8 +161,6 @@ CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_WATCHDOG=y
 CONFIG_DAVINCI_WATCHDOG=y
-CONFIG_SSB=m
-CONFIG_TPS6507X=m
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
@@ -196,15 +169,11 @@ CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_DRM=y
-CONFIG_DRM_TINYDRM=y
 CONFIG_TINYDRM_ST7586=y
 CONFIG_TINYDRM_ST7735R=y
+CONFIG_FB=y
 CONFIG_BACKLIGHT_GPIO=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -271,7 +240,6 @@ CONFIG_USB_MIDI_GADGET=m
 CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_MMC=y
 CONFIG_MMC_DAVINCI=y
-CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_TIMER=y
@@ -282,17 +250,17 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_DMADEVICES=y
-CONFIG_STAGING=y
-CONFIG_R8712U=y
-CONFIG_FB_TFT=y
-CONFIG_FB_TFT_ST7735R=y
 CONFIG_COMMON_CLK_PWM=y
+CONFIG_REMOTEPROC=y
 CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_VIRTIO=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER_CB=y
 CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=y
 CONFIG_TI_ADS7950=y
 CONFIG_TCS3472=m
+CONFIG_IIO_HRTIMER_TRIGGER=y
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_PWM=y
@@ -305,7 +273,6 @@ CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS=m
 CONFIG_FANOTIFY=y
-CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
@@ -323,12 +290,11 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_LZ4=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_CCITT=y
@@ -340,7 +306,4 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_6x11=y
 CONFIG_FONT_MINI_4x6=y
 CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
+CONFIG_UNWINDER_FRAME_POINTER=y

arch/arm/boot/dts/da850-lego-ev3-lms2012.dts renamed to arch/arm/boot/dts/ti/davinci/da850-lego-ev3-lms2012.dts

@@ -15,15 +15,32 @@
 #include "da8xx.h"
 
 #include "legoev3-fiq.h"
-#include "board-legoev3.h"
-#include "cp_intc.h"
+#include "irqs.h"
 
 #define LEGOEV3_DT 1
 #include <../../../drivers/lego/ev3/legoev3_i2c.h>
 
 
 #define DA8XX_EHRPWM0_BASE	0x01F00000
 
+/* Convert GPIO signal to GPIO pin number */
+#define GPIO_TO_PIN(bank, gpio)	(16 * (bank) + (gpio))
+
+/*
+ * Used by FIQ handler routine to notify the OS when status has changed. See
+ * arch/arm/mach-davinci/legoev3-fiq.c. This pin is TP4 in the lms2012 source
+ * code, so it should be safe to use.
+ */
+#define EV3_FIQ_STAT_PIN	GPIO_TO_PIN(2, 7)
+#define EV3_IN1_PIN6_PIN	GPIO_TO_PIN(0, 15)
+#define EV3_IN1_I2C_CLK_PIN	GPIO_TO_PIN(1, 0)
+#define EV3_IN2_PIN6_PIN	GPIO_TO_PIN(0, 13)
+#define EV3_IN2_I2C_CLK_PIN	GPIO_TO_PIN(8, 3)
+#define EV3_IN3_PIN6_PIN	GPIO_TO_PIN(1, 14)
+#define EV3_IN3_I2C_CLK_PIN	GPIO_TO_PIN(1, 12)
+#define EV3_IN4_PIN6_PIN	GPIO_TO_PIN(1, 15)
+#define EV3_IN4_I2C_CLK_PIN	GPIO_TO_PIN(1, 11)
+
 static struct legoev3_fiq_platform_data legoev3_in_port_i2c_platform_data = {
 	.intc_mem_base		= DA8XX_CP_INTC_BASE,
 	.intc_mem_size		= 0x608,

arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts

@@ -27,9 +27,8 @@
 
 #include <asm/io.h>
 #include <asm/fiq.h>
-#include <mach/legoev3-fiq.h>
 
-#include "cp_intc.h"
+#include "legoev3-fiq.h"
 
 enum transfer_states {
 	TRANSFER_IDLE,
@@ -284,14 +283,14 @@ legoev3_fiq_timer_callback(struct legoev3_fiq_port_i2c_data *data)
 		if (msg->flags & I2C_M_RD)
 			data->data_byte |= 1;
 		data->buf_offset = 0;
-		/* no break */
+		fallthrough;
 
 	case TRANSFER_WRITE:
 		if (data->transfer_state == TRANSFER_WRITE)
 			data->data_byte = msg->buf[data->buf_offset++];
 		data->transfer_state = TRANSFER_WBIT;
 		data->bit_mask  = 0x80;
-		/* no break */
+		fallthrough;
 
 	case TRANSFER_WBIT:
 		if (!data->clock_state) {
@@ -310,7 +309,7 @@ legoev3_fiq_timer_callback(struct legoev3_fiq_port_i2c_data *data)
 		data->transfer_state = TRANSFER_RBIT;
 		data->bit_mask  = 0x80;
 		data->data_byte = 0;
-		/* no break */
+		fallthrough;
 
 	case TRANSFER_RBIT:
 		if (data->clock_state) {
@@ -421,7 +420,7 @@ legoev3_fiq_timer_callback(struct legoev3_fiq_port_i2c_data *data)
 		 */
 		fiq_gpio_dir_in(&data->gpio[FIQ_I2C_PIN_SDA]);
 		data->transfer_state = TRANSFER_COMPLETE;
-		/* no break */
+		fallthrough;
 
 	case TRANSFER_COMPLETE:
 		/*
@@ -480,7 +479,7 @@ static void legoev3_fiq_ehrpwm_callback(struct legoev3_fiq_ehrpwm_data *data)
 			!fiq_gpio_get_value(&legoev3_fiq_data->status_gpio));
 }
 
-void legoev3_fiq_handler(void)
+static void legoev3_fiq_handler(void)
 {
 	int irq = legoev3_fiq_get_irq();
 

arch/arm/configs/ev3dev_defconfig

@@ -66,4 +66,7 @@ extern int legoev3_fiq_ehrpwm_int_enable(void);
 extern int legoev3_fiq_ehrpwm_int_disable(void);
 extern bool legoev3_fiq_ehrpwm_int_is_enabled(void);
 
+void cp_intc_fiq_enable(void);
+void cp_intc_fiq_disble(void);
+
 #endif /* __MACH_LEGOEV3_FIQ_H */