Skip to content
Snippets Groups Projects
Commit a20cc76b authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
No related branches found
No related tags found
No related merge requests found
Showing
with 75 additions and 43 deletions
...@@ -31,7 +31,7 @@ i2c0: i2c@fed40000 { ...@@ -31,7 +31,7 @@ i2c0: i2c@fed40000 {
compatible = "st,comms-ssc4-i2c"; compatible = "st,comms-ssc4-i2c";
reg = <0xfed40000 0x110>; reg = <0xfed40000 0x110>;
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&CLK_S_ICN_REG_0>; clocks = <&clk_s_a0_ls CLK_ICN_REG>;
clock-names = "ssc"; clock-names = "ssc";
clock-frequency = <400000>; clock-frequency = <400000>;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM ...@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM
dallas,ds4510 CPU Supervisor with Nonvolatile Memory and Programmable I/O dallas,ds4510 CPU Supervisor with Nonvolatile Memory and Programmable I/O
dallas,ds75 Digital Thermometer and Thermostat dallas,ds75 Digital Thermometer and Thermostat
dlg,da9053 DA9053: flexible system level PMIC with multicore support dlg,da9053 DA9053: flexible system level PMIC with multicore support
dlg,da9063 DA9063: system PMIC for quad-core application processors
epson,rx8025 High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE epson,rx8025 High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE
fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
......
...@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd* ...@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd*
F: drivers/staging/iio/*/ad* F: drivers/staging/iio/*/ad*
F: staging/iio/trigger/iio-trig-bfin-timer.c F: staging/iio/trigger/iio-trig-bfin-timer.c
ANDROID DRIVERS
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
M: Arve Hjønnevåg <arve@android.com>
M: Riley Andrews <riandrews@android.com>
T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
L: devel@driverdev.osuosl.org
S: Supported
F: drivers/android/
F: drivers/staging/android/
AOA (Apple Onboard Audio) ALSA DRIVER AOA (Apple Onboard Audio) ALSA DRIVER
M: Johannes Berg <johannes@sipsolutions.net> M: Johannes Berg <johannes@sipsolutions.net>
L: linuxppc-dev@lists.ozlabs.org L: linuxppc-dev@lists.ozlabs.org
...@@ -10167,6 +10177,7 @@ USERSPACE I/O (UIO) ...@@ -10167,6 +10177,7 @@ USERSPACE I/O (UIO)
M: "Hans J. Koch" <hjk@hansjkoch.de> M: "Hans J. Koch" <hjk@hansjkoch.de>
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
F: Documentation/DocBook/uio-howto.tmpl F: Documentation/DocBook/uio-howto.tmpl
F: drivers/uio/ F: drivers/uio/
F: include/linux/uio*.h F: include/linux/uio*.h
......
VERSION = 3 VERSION = 3
PATCHLEVEL = 19 PATCHLEVEL = 19
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc6 EXTRAVERSION = -rc7
NAME = Diseased Newt NAME = Diseased Newt
# *DOCUMENTATION* # *DOCUMENTATION*
......
...@@ -156,6 +156,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr, ...@@ -156,6 +156,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
if (unlikely(fault & VM_FAULT_ERROR)) { if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM) if (fault & VM_FAULT_OOM)
goto out_of_memory; goto out_of_memory;
else if (fault & VM_FAULT_SIGSEGV)
goto bad_area;
else if (fault & VM_FAULT_SIGBUS) else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus; goto do_sigbus;
BUG(); BUG();
......
...@@ -161,6 +161,8 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) ...@@ -161,6 +161,8 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)
if (fault & VM_FAULT_OOM) if (fault & VM_FAULT_OOM)
goto out_of_memory; goto out_of_memory;
else if (fault & VM_FAULT_SIGSEGV)
goto bad_area;
else if (fault & VM_FAULT_SIGBUS) else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus; goto do_sigbus;
......
...@@ -166,12 +166,12 @@ mdio { ...@@ -166,12 +166,12 @@ mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
ethphy1: ethernet-phy@0 { ethphy1: ethernet-phy@1 {
reg = <0>; reg = <1>;
}; };
ethphy2: ethernet-phy@1 { ethphy2: ethernet-phy@2 {
reg = <1>; reg = <2>;
}; };
}; };
}; };
......
...@@ -17,14 +17,6 @@ / { ...@@ -17,14 +17,6 @@ / {
aliases { aliases {
ethernet0 = &emac; ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &uart6;
serial7 = &uart7;
}; };
chosen { chosen {
...@@ -39,6 +31,14 @@ framebuffer@0 { ...@@ -39,6 +31,14 @@ framebuffer@0 {
<&ahb_gates 44>; <&ahb_gates 44>;
status = "disabled"; status = "disabled";
}; };
framebuffer@1 {
compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
<&ahb_gates 44>, <&ahb_gates 46>;
status = "disabled";
};
}; };
cpus { cpus {
...@@ -438,8 +438,8 @@ usbphy: phy@01c13400 { ...@@ -438,8 +438,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1", "pmu2"; reg-names = "phy_ctrl", "pmu1", "pmu2";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>, <&usb_clk 2>; resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
reset-names = "usb1_reset", "usb2_reset"; reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -55,6 +55,12 @@ / { ...@@ -55,6 +55,12 @@ / {
model = "Olimex A10s-Olinuxino Micro"; model = "Olimex A10s-Olinuxino Micro";
compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s"; compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";
aliases {
serial0 = &uart0;
serial1 = &uart2;
serial2 = &uart3;
};
soc@01c00000 { soc@01c00000 {
emac: ethernet@01c0b000 { emac: ethernet@01c0b000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -18,10 +18,6 @@ / { ...@@ -18,10 +18,6 @@ / {
aliases { aliases {
ethernet0 = &emac; ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
}; };
chosen { chosen {
...@@ -390,8 +386,8 @@ usbphy: phy@01c13400 { ...@@ -390,8 +386,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1"; reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>; resets = <&usb_clk 0>, <&usb_clk 1>;
reset-names = "usb1_reset"; reset-names = "usb0_reset", "usb1_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -53,6 +53,10 @@ / { ...@@ -53,6 +53,10 @@ / {
model = "HSG H702"; model = "HSG H702";
compatible = "hsg,h702", "allwinner,sun5i-a13"; compatible = "hsg,h702", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -54,6 +54,10 @@ / { ...@@ -54,6 +54,10 @@ / {
model = "Olimex A13-Olinuxino Micro"; model = "Olimex A13-Olinuxino Micro";
compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -55,6 +55,10 @@ / { ...@@ -55,6 +55,10 @@ / {
model = "Olimex A13-Olinuxino"; model = "Olimex A13-Olinuxino";
compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uart1;
serial1 = &uart3;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -349,8 +344,8 @@ usbphy: phy@01c13400 { ...@@ -349,8 +344,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1"; reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>; resets = <&usb_clk 0>, <&usb_clk 1>;
reset-names = "usb1_reset"; reset-names = "usb0_reset", "usb1_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -53,12 +53,6 @@ / { ...@@ -53,12 +53,6 @@ / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases { aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
ethernet0 = &gmac; ethernet0 = &gmac;
}; };
......
...@@ -55,6 +55,12 @@ / { ...@@ -55,6 +55,12 @@ / {
model = "LeMaker Banana Pi"; model = "LeMaker Banana Pi";
compatible = "lemaker,bananapi", "allwinner,sun7i-a20"; compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
serial1 = &uart3;
serial2 = &uart7;
};
soc@01c00000 { soc@01c00000 {
spi0: spi@01c05000 { spi0: spi@01c05000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -19,6 +19,14 @@ / { ...@@ -19,6 +19,14 @@ / {
model = "Merrii A20 Hummingbird"; model = "Merrii A20 Hummingbird";
compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20"; compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
serial1 = &uart2;
serial2 = &uart3;
serial3 = &uart4;
serial4 = &uart5;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -20,6 +20,9 @@ / { ...@@ -20,6 +20,9 @@ / {
compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
aliases { aliases {
serial0 = &uart0;
serial1 = &uart6;
serial2 = &uart7;
spi0 = &spi1; spi0 = &spi1;
spi1 = &spi2; spi1 = &spi2;
}; };
......
...@@ -54,14 +54,6 @@ / { ...@@ -54,14 +54,6 @@ / {
aliases { aliases {
ethernet0 = &gmac; ethernet0 = &gmac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &uart6;
serial7 = &uart7;
}; };
chosen { chosen {
......
...@@ -55,6 +55,10 @@ / { ...@@ -55,6 +55,10 @@ / {
model = "Ippo Q8H Dual Core Tablet (v5)"; model = "Ippo Q8H Dual Core Tablet (v5)";
compatible = "ippo,q8h-v5", "allwinner,sun8i-a23"; compatible = "ippo,q8h-v5", "allwinner,sun8i-a23";
aliases {
serial0 = &r_uart;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; bootargs = "earlyprintk console=ttyS0,115200";
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment