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

Commit 926f041b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 6df1ece2 on remote branch 

Change-Id: Ia6cfb55bb1ebb1540a28cf2289a4220483b214e5
parents 0cf3f5a3 6df1ece2

Documentation/devicetree/bindings/eeprom/eeprom.txt

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties: 


	"atmel,24c00", "atmel,24c01", "atmel,24c02", "atmel,24c04",

	"atmel,24c08", "atmel,24c16", "atmel,24c32", "atmel,24c64",

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024"

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024",

	"atmel,24c2048"



	"catalyst,24c32"
@@ -17,7 +18,7 @@ Required properties: 
	 If there is no specific driver for <manufacturer>, a generic

	 driver based on <type> is selected. Possible types are:

	 "24c00", "24c01", "24c02", "24c04", "24c08", "24c16", "24c32", "24c64",

	 "24c128", "24c256", "24c512", "24c1024", "spd"

	 "24c128", "24c256", "24c512", "24c1024", "24c2048", "spd"



  - reg : the I2C address of the EEPROM

Documentation/devicetree/bindings/input/sensors/smi130.txt

0 → 100644
+56 −0
Original line number Diff line number Diff line 
The SMI130 is a highly integrated, low power inertial measurement unit (IMU)

that provides precise acceleration and angular rate (gyroscopic) measurement.



To enable driver probing, add the smi130_gyro and smi130_acc node to the platform

device tree as described below.



Required properties:



- compatible: "smi130_gyro", "smi130_acc"

- reg: the I2C address or SPI chip select the device will respond to

- interrupt-parent: phandle to the parent interrupt controller as documented in [interrupts][4]

- interrupts: interrupt mapping for IRQ as documented in [interrupts][4]



Recommended properties for SPI bus usage:

- spi-max-frequency: maximum SPI bus frequency as documented in [SPI][3]



Optional properties:

- smi130_gyro,gpio_irq: MEMS sensor interrupt line to use (default 1)



I2C example (based on Raspberry PI 3):



        &i2c0 {

                status = "ok";

                #address-cells = <0x1>;

                #size-cells = <0x0>;

                smi130_gyro@68 {

                        compatible = "smi130_gyro";

                        reg = <0x68>;

                        interrupt-parent = <&gpio>;

                        interrupts = <26 IRQ_TYPE_EDGE_RISING>;

                };

                smi130_acc@18 {

                        compatible = "smi130_acc";

                        reg = <0x18>;

                        interrupt-parent = <&gpio>;

                        interrupts = <25 IRQ_TYPE_EDGE_RISING>;

                };



SPI example (based on Raspberry PI 3):



        &spi0 {

                status = "ok";

                #address-cells = <0x1>;

                #size-cells = <0x0>;

                smi130_gyro@68 {

                        compatible = "smi130_gyro";

                        reg = <0x68>;

                        interrupt-parent = <&gpio>;

                        interrupts = <26 IRQ_TYPE_EDGE_RISING>;

                };

                smi130_acc@18 {

                        compatible = "smi130_acc";

                        reg = <0x18>;

                        interrupt-parent = <&gpio>;

                        interrupts = <25 IRQ_TYPE_EDGE_RISING>;

                };

Makefile

+4 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 155

SUBLEVEL = 160

EXTRAVERSION =

NAME = Roaring Lionus
@@ -536,6 +536,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) 
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

KBUILD_CFLAGS += -Wno-undefined-optimized

KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare



# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,