Skip to content
Snippets Groups Projects
Commit 5a6cc821 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v4.1-rc3' of...

Merge tag 'asoc-fix-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.1

A few more fixes for v4.1, some driver fixes plus one core fix which
fixes registration of DAI links when adding prefixes to CODECs to
deuplicate in multi-CODEC systems.
parents 09ea9976 7730c0b5
Branches
Tags
No related merge requests found
Showing
with 129 additions and 51 deletions
...@@ -3709,6 +3709,13 @@ N: Dirk Verworner ...@@ -3709,6 +3709,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung'' D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group D: Co-founder of Berlin Linux User Group
N: Andrew Victor
E: linux@maxim.org.za
W: http://maxim.org.za/at91_26.html
D: First maintainer of Atmel ARM-based SoC, aka AT91
D: Introduced support for at91rm9200, the first chip of AT91 family
S: South Africa
N: Riku Voipio N: Riku Voipio
E: riku.voipio@iki.fi E: riku.voipio@iki.fi
D: Author of PCA9532 LED and Fintek f75375s hwmon driver D: Author of PCA9532 LED and Fintek f75375s hwmon driver
......
...@@ -505,7 +505,10 @@ at module load time (for a module) with: ...@@ -505,7 +505,10 @@ at module load time (for a module) with:
The addresses are normal I2C addresses. The adapter is the string The addresses are normal I2C addresses. The adapter is the string
name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name. name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name.
It is *NOT* i2c-<n> itself. It is *NOT* i2c-<n> itself. Also, the comparison is done ignoring
spaces, so if the name is "This is an I2C chip" you can say
adapter_name=ThisisanI2cchip. This is because it's hard to pass in
spaces in kernel parameters.
The debug flags are bit flags for each BMC found, they are: The debug flags are bit flags for each BMC found, they are:
IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8 IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8
......
...@@ -253,7 +253,7 @@ input driver: ...@@ -253,7 +253,7 @@ input driver:
GPIO support GPIO support
~~~~~~~~~~~~ ~~~~~~~~~~~~
ACPI 5 introduced two new resources to describe GPIO connections: GpioIo ACPI 5 introduced two new resources to describe GPIO connections: GpioIo
and GpioInt. These resources are used be used to pass GPIO numbers used by and GpioInt. These resources can be used to pass GPIO numbers used by
the device to the driver. ACPI 5.1 extended this with _DSD (Device the device to the driver. ACPI 5.1 extended this with _DSD (Device
Specific Data) which made it possible to name the GPIOs among other things. Specific Data) which made it possible to name the GPIOs among other things.
......
_DSD Device Properties Related to GPIO _DSD Device Properties Related to GPIO
-------------------------------------- --------------------------------------
With the release of ACPI 5.1 and the _DSD configuration objecte names With the release of ACPI 5.1, the _DSD configuration object finally
can finally be given to GPIOs (and other things as well) returned by allows names to be given to GPIOs (and other things as well) returned
_CRS. Previously, we were only able to use an integer index to find by _CRS. Previously, we were only able to use an integer index to find
the corresponding GPIO, which is pretty error prone (it depends on the corresponding GPIO, which is pretty error prone (it depends on
the _CRS output ordering, for example). the _CRS output ordering, for example).
......
...@@ -6,6 +6,7 @@ provided by Arteris. ...@@ -6,6 +6,7 @@ provided by Arteris.
Required properties: Required properties:
- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family - compatible : Should be "ti,omap3-l3-smx" for OMAP3 family
Should be "ti,omap4-l3-noc" for OMAP4 family Should be "ti,omap4-l3-noc" for OMAP4 family
Should be "ti,omap5-l3-noc" for OMAP5 family
Should be "ti,dra7-l3-noc" for DRA7 family Should be "ti,dra7-l3-noc" for DRA7 family
Should be "ti,am4372-l3-noc" for AM43 family Should be "ti,am4372-l3-noc" for AM43 family
- reg: Contains L3 register address range for each noc domain. - reg: Contains L3 register address range for each noc domain.
......
...@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { ...@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
80 81 68 69 80 81 68 69
70 71 72 73 70 71 72 73
74 75 76 77>; 74 75 76 77>;
interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty", interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
"saif0", "saif1", "i2c0", "i2c1", "saif0", "saif1", "i2c0", "i2c1",
"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx"; "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
......
Abracon ABX80X I2C ultra low power RTC/Alarm chip
The Abracon ABX80X family consist of the ab0801, ab0803, ab0804, ab0805, ab1801,
ab1803, ab1804 and ab1805. The ab0805 is the superset of ab080x and the ab1805
is the superset of ab180x.
Required properties:
- "compatible": should one of:
"abracon,abx80x"
"abracon,ab0801"
"abracon,ab0803"
"abracon,ab0804"
"abracon,ab0805"
"abracon,ab1801"
"abracon,ab1803"
"abracon,ab1804"
"abracon,ab1805"
Using "abracon,abx80x" will enable chip autodetection.
- "reg": I2C bus address of the device
Optional properties:
The abx804 and abx805 have a trickle charger that is able to charge the
connected battery or supercap. Both the following properties have to be defined
and valid to enable charging:
- "abracon,tc-diode": should be "standard" (0.6V) or "schottky" (0.3V)
- "abracon,tc-resistor": should be <0>, <3>, <6> or <11>. 0 disables the output
resistor, the other values are in ohm.
...@@ -9,7 +9,9 @@ a fast and comprehensive solution for finding use-after-free and out-of-bounds ...@@ -9,7 +9,9 @@ a fast and comprehensive solution for finding use-after-free and out-of-bounds
bugs. bugs.
KASan uses compile-time instrumentation for checking every memory access, KASan uses compile-time instrumentation for checking every memory access,
therefore you will need a certain version of GCC > 4.9.2 therefore you will need a gcc version of 4.9.2 or later. KASan could detect out
of bounds accesses to stack or global variables, but only if gcc 5.0 or later was
used to built the kernel.
Currently KASan is supported only for x86_64 architecture and requires that the Currently KASan is supported only for x86_64 architecture and requires that the
kernel be built with the SLUB allocator. kernel be built with the SLUB allocator.
...@@ -23,8 +25,8 @@ To enable KASAN configure kernel with: ...@@ -23,8 +25,8 @@ To enable KASAN configure kernel with:
and choose between CONFIG_KASAN_OUTLINE and CONFIG_KASAN_INLINE. Outline/inline and choose between CONFIG_KASAN_OUTLINE and CONFIG_KASAN_INLINE. Outline/inline
is compiler instrumentation types. The former produces smaller binary the is compiler instrumentation types. The former produces smaller binary the
latter is 1.1 - 2 times faster. Inline instrumentation requires GCC 5.0 or latter is 1.1 - 2 times faster. Inline instrumentation requires a gcc version
latter. of 5.0 or later.
Currently KASAN works only with the SLUB memory allocator. Currently KASAN works only with the SLUB memory allocator.
For better bug detection and nicer report, enable CONFIG_STACKTRACE and put For better bug detection and nicer report, enable CONFIG_STACKTRACE and put
......
...@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
READ_CAPACITY_16 command); READ_CAPACITY_16 command);
f = NO_REPORT_OPCODES (don't use report opcodes f = NO_REPORT_OPCODES (don't use report opcodes
command, uas only); command, uas only);
g = MAX_SECTORS_240 (don't transfer more than
240 sectors at a time, uas only);
h = CAPACITY_HEURISTICS (decrease the h = CAPACITY_HEURISTICS (decrease the
reported device capacity by one reported device capacity by one
sector if the number is odd); sector if the number is odd);
......
...@@ -119,9 +119,9 @@ Most notably, in the x509.genkey file, the req_distinguished_name section ...@@ -119,9 +119,9 @@ Most notably, in the x509.genkey file, the req_distinguished_name section
should be altered from the default: should be altered from the default:
[ req_distinguished_name ] [ req_distinguished_name ]
O = Magrathea #O = Unspecified company
CN = Glacier signing key CN = Build time autogenerated kernel key
emailAddress = slartibartfast@magrathea.h2g2 #emailAddress = unspecified.user@unspecified.company
The generated RSA key size can also be set with: The generated RSA key size can also be set with:
......
...@@ -18,3 +18,12 @@ platform_labels - INTEGER ...@@ -18,3 +18,12 @@ platform_labels - INTEGER
Possible values: 0 - 1048575 Possible values: 0 - 1048575
Default: 0 Default: 0
conf/<interface>/input - BOOL
Control whether packets can be input on this interface.
If disabled, packets will be discarded without further
processing.
0 - disabled (default)
not 0 - enabled
...@@ -282,7 +282,7 @@ following is true: ...@@ -282,7 +282,7 @@ following is true:
- The current CPU's queue head counter >= the recorded tail counter - The current CPU's queue head counter >= the recorded tail counter
value in rps_dev_flow[i] value in rps_dev_flow[i]
- The current CPU is unset (equal to RPS_NO_CPU) - The current CPU is unset (>= nr_cpu_ids)
- The current CPU is offline - The current CPU is offline
After this check, the packet is sent to the (possibly updated) current After this check, the packet is sent to the (possibly updated) current
......
...@@ -74,23 +74,22 @@ Causes of transaction aborts ...@@ -74,23 +74,22 @@ Causes of transaction aborts
Syscalls Syscalls
======== ========
Syscalls made from within an active transaction will not be performed and the Performing syscalls from within transaction is not recommended, and can lead
transaction will be doomed by the kernel with the failure code TM_CAUSE_SYSCALL to unpredictable results.
| TM_CAUSE_PERSISTENT.
Syscalls made from within a suspended transaction are performed as normal and Syscalls do not by design abort transactions, but beware: The kernel code will
the transaction is not explicitly doomed by the kernel. However, what the not be running in transactional state. The effect of syscalls will always
kernel does to perform the syscall may result in the transaction being doomed remain visible, but depending on the call they may abort your transaction as a
by the hardware. The syscall is performed in suspended mode so any side side-effect, read soon-to-be-aborted transactional data that should not remain
effects will be persistent, independent of transaction success or failure. No invisible, etc. If you constantly retry a transaction that constantly aborts
guarantees are provided by the kernel about which syscalls will affect itself by calling a syscall, you'll have a livelock & make no progress.
transaction success.
Care must be taken when relying on syscalls to abort during active transactions Simple syscalls (e.g. sigprocmask()) "could" be OK. Even things like write()
if the calls are made via a library. Libraries may cache values (which may from, say, printf() should be OK as long as the kernel does not access any
give the appearance of success) or perform operations that cause transaction memory that was accessed transactionally.
failure before entering the kernel (which may produce different failure codes).
Examples are glibc's getpid() and lazy symbol resolution. Consider any syscalls that happen to work as debug-only -- not recommended for
production use. Best to queue them up till after the transaction is over.
Signals Signals
...@@ -177,7 +176,8 @@ kernel aborted a transaction: ...@@ -177,7 +176,8 @@ kernel aborted a transaction:
TM_CAUSE_RESCHED Thread was rescheduled. TM_CAUSE_RESCHED Thread was rescheduled.
TM_CAUSE_TLBI Software TLB invalid. TM_CAUSE_TLBI Software TLB invalid.
TM_CAUSE_FAC_UNAV FP/VEC/VSX unavailable trap. TM_CAUSE_FAC_UNAV FP/VEC/VSX unavailable trap.
TM_CAUSE_SYSCALL Syscall from active transaction. TM_CAUSE_SYSCALL Currently unused; future syscalls that must abort
transactions for consistency will use this.
TM_CAUSE_SIGNAL Signal delivered. TM_CAUSE_SIGNAL Signal delivered.
TM_CAUSE_MISC Currently unused. TM_CAUSE_MISC Currently unused.
TM_CAUSE_ALIGNMENT Alignment fault. TM_CAUSE_ALIGNMENT Alignment fault.
......
...@@ -892,11 +892,10 @@ S: Maintained ...@@ -892,11 +892,10 @@ S: Maintained
F: arch/arm/mach-alpine/ F: arch/arm/mach-alpine/
ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
M: Andrew Victor <linux@maxim.org.za>
M: Nicolas Ferre <nicolas.ferre@atmel.com> M: Nicolas Ferre <nicolas.ferre@atmel.com>
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://maxim.org.za/at91_26.html
W: http://www.linux4sam.org W: http://www.linux4sam.org
S: Supported S: Supported
F: arch/arm/mach-at91/ F: arch/arm/mach-at91/
...@@ -990,6 +989,12 @@ F: drivers/clocksource/timer-prima2.c ...@@ -990,6 +989,12 @@ F: drivers/clocksource/timer-prima2.c
F: drivers/clocksource/timer-atlas7.c F: drivers/clocksource/timer-atlas7.c
N: [^a-z]sirf N: [^a-z]sirf
ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
M: Baruch Siach <baruch@tkos.co.il>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
N: digicolor
ARM/EBSA110 MACHINE SUPPORT ARM/EBSA110 MACHINE SUPPORT
M: Russell King <linux@arm.linux.org.uk> M: Russell King <linux@arm.linux.org.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
...@@ -1439,9 +1444,10 @@ ARM/SOCFPGA ARCHITECTURE ...@@ -1439,9 +1444,10 @@ ARM/SOCFPGA ARCHITECTURE
M: Dinh Nguyen <dinguyen@opensource.altera.com> M: Dinh Nguyen <dinguyen@opensource.altera.com>
S: Maintained S: Maintained
F: arch/arm/mach-socfpga/ F: arch/arm/mach-socfpga/
F: arch/arm/boot/dts/socfpga*
F: arch/arm/configs/socfpga_defconfig
W: http://www.rocketboards.org W: http://www.rocketboards.org
T: git://git.rocketboards.org/linux-socfpga.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
T: git://git.rocketboards.org/linux-socfpga-next.git
ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
M: Dinh Nguyen <dinguyen@opensource.altera.com> M: Dinh Nguyen <dinguyen@opensource.altera.com>
...@@ -2116,8 +2122,9 @@ S: Supported ...@@ -2116,8 +2122,9 @@ S: Supported
F: drivers/net/ethernet/broadcom/bnx2x/ F: drivers/net/ethernet/broadcom/bnx2x/
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
M: Christian Daudt <bcm@fixthebug.org>
M: Florian Fainelli <f.fainelli@gmail.com> M: Florian Fainelli <f.fainelli@gmail.com>
M: Ray Jui <rjui@broadcom.com>
M: Scott Branden <sbranden@broadcom.com>
L: bcm-kernel-feedback-list@broadcom.com L: bcm-kernel-feedback-list@broadcom.com
T: git git://github.com/broadcom/mach-bcm T: git git://github.com/broadcom/mach-bcm
S: Maintained S: Maintained
...@@ -2168,7 +2175,6 @@ S: Maintained ...@@ -2168,7 +2175,6 @@ S: Maintained
F: drivers/usb/gadget/udc/bcm63xx_udc.* F: drivers/usb/gadget/udc/bcm63xx_udc.*
BROADCOM BCM7XXX ARM ARCHITECTURE BROADCOM BCM7XXX ARM ARCHITECTURE
M: Marc Carino <marc.ceeeee@gmail.com>
M: Brian Norris <computersforpeace@gmail.com> M: Brian Norris <computersforpeace@gmail.com>
M: Gregory Fong <gregory.0xf0@gmail.com> M: Gregory Fong <gregory.0xf0@gmail.com>
M: Florian Fainelli <f.fainelli@gmail.com> M: Florian Fainelli <f.fainelli@gmail.com>
...@@ -3413,6 +3419,13 @@ F: drivers/gpu/drm/rcar-du/ ...@@ -3413,6 +3419,13 @@ F: drivers/gpu/drm/rcar-du/
F: drivers/gpu/drm/shmobile/ F: drivers/gpu/drm/shmobile/
F: include/linux/platform_data/shmob_drm.h F: include/linux/platform_data/shmob_drm.h
DRM DRIVERS FOR ROCKCHIP
M: Mark Yao <mark.yao@rock-chips.com>
L: dri-devel@lists.freedesktop.org
S: Maintained
F: drivers/gpu/drm/rockchip/
F: Documentation/devicetree/bindings/video/rockchip*
DSBR100 USB FM RADIO DRIVER DSBR100 USB FM RADIO DRIVER
M: Alexey Klimov <klimov.linux@gmail.com> M: Alexey Klimov <klimov.linux@gmail.com>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
...@@ -5035,17 +5048,19 @@ S: Orphan ...@@ -5035,17 +5048,19 @@ S: Orphan
F: drivers/video/fbdev/imsttfb.c F: drivers/video/fbdev/imsttfb.c
INFINIBAND SUBSYSTEM INFINIBAND SUBSYSTEM
M: Roland Dreier <roland@kernel.org> M: Doug Ledford <dledford@redhat.com>
M: Sean Hefty <sean.hefty@intel.com> M: Sean Hefty <sean.hefty@intel.com>
M: Hal Rosenstock <hal.rosenstock@gmail.com> M: Hal Rosenstock <hal.rosenstock@gmail.com>
L: linux-rdma@vger.kernel.org L: linux-rdma@vger.kernel.org
W: http://www.openfabrics.org/ W: http://www.openfabrics.org/
Q: http://patchwork.kernel.org/project/linux-rdma/list/ Q: http://patchwork.kernel.org/project/linux-rdma/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git T: git git://github.com/dledford/linux.git
S: Supported S: Supported
F: Documentation/infiniband/ F: Documentation/infiniband/
F: drivers/infiniband/ F: drivers/infiniband/
F: include/uapi/linux/if_infiniband.h F: include/uapi/linux/if_infiniband.h
F: include/uapi/rdma/
F: include/rdma/
INOTIFY INOTIFY
M: John McCutchan <john@johnmccutchan.com> M: John McCutchan <john@johnmccutchan.com>
...@@ -5798,6 +5813,7 @@ F: drivers/scsi/53c700* ...@@ -5798,6 +5813,7 @@ F: drivers/scsi/53c700*
LED SUBSYSTEM LED SUBSYSTEM
M: Bryan Wu <cooloney@gmail.com> M: Bryan Wu <cooloney@gmail.com>
M: Richard Purdie <rpurdie@rpsys.net> M: Richard Purdie <rpurdie@rpsys.net>
M: Jacek Anaszewski <j.anaszewski@samsung.com>
L: linux-leds@vger.kernel.org L: linux-leds@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
S: Maintained S: Maintained
...@@ -10523,7 +10539,6 @@ F: include/linux/virtio_console.h ...@@ -10523,7 +10539,6 @@ F: include/linux/virtio_console.h
F: include/uapi/linux/virtio_console.h F: include/uapi/linux/virtio_console.h
VIRTIO CORE, NET AND BLOCK DRIVERS VIRTIO CORE, NET AND BLOCK DRIVERS
M: Rusty Russell <rusty@rustcorp.com.au>
M: "Michael S. Tsirkin" <mst@redhat.com> M: "Michael S. Tsirkin" <mst@redhat.com>
L: virtualization@lists.linux-foundation.org L: virtualization@lists.linux-foundation.org
S: Maintained S: Maintained
...@@ -11031,6 +11046,7 @@ F: drivers/media/pci/zoran/ ...@@ -11031,6 +11046,7 @@ F: drivers/media/pci/zoran/
ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
M: Minchan Kim <minchan@kernel.org> M: Minchan Kim <minchan@kernel.org>
M: Nitin Gupta <ngupta@vflare.org> M: Nitin Gupta <ngupta@vflare.org>
R: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
S: Maintained S: Maintained
F: drivers/block/zram/ F: drivers/block/zram/
......
VERSION = 4 VERSION = 4
PATCHLEVEL = 1 PATCHLEVEL = 1
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc1 EXTRAVERSION = -rc3
NAME = Hurr durr I'ma sheep NAME = Hurr durr I'ma sheep
# *DOCUMENTATION* # *DOCUMENTATION*
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
pinctrl-0 = <&matrix_keypad_pins>; pinctrl-0 = <&matrix_keypad_pins>;
debounce-delay-ms = <5>; debounce-delay-ms = <5>;
col-scan-delay-us = <1500>; col-scan-delay-us = <5>;
row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH /* Bank5, pin5 */ row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH /* Bank5, pin5 */
&gpio5 6 GPIO_ACTIVE_HIGH>; /* Bank5, pin6 */ &gpio5 6 GPIO_ACTIVE_HIGH>; /* Bank5, pin6 */
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <31 0>; interrupts = <31 0>;
wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
touchscreen-size-x = <480>; touchscreen-size-x = <480>;
touchscreen-size-y = <272>; touchscreen-size-y = <272>;
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
aliases { aliases {
rtc0 = &mcp_rtc; rtc0 = &mcp_rtc;
rtc1 = &tps659038_rtc; rtc1 = &tps659038_rtc;
rtc2 = &rtc;
}; };
memory { memory {
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
gpio_fan: gpio_fan { gpio_fan: gpio_fan {
/* Based on 5v 500mA AFB02505HHB */ /* Based on 5v 500mA AFB02505HHB */
compatible = "gpio-fan"; compatible = "gpio-fan";
gpios = <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>; gpios = <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;
gpio-fan,speed-map = <0 0>, gpio-fan,speed-map = <0 0>,
<13000 1>; <13000 1>;
#cooling-cells = <2>; #cooling-cells = <2>;
...@@ -130,8 +131,8 @@ ...@@ -130,8 +131,8 @@
uart3_pins_default: uart3_pins_default { uart3_pins_default: uart3_pins_default {
pinctrl-single,pins = < pinctrl-single,pins = <
0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */ 0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */ 0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
>; >;
}; };
...@@ -455,7 +456,7 @@ ...@@ -455,7 +456,7 @@
mcp_rtc: rtc@6f { mcp_rtc: rtc@6f {
compatible = "microchip,mcp7941x"; compatible = "microchip,mcp7941x";
reg = <0x6f>; reg = <0x6f>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_LOW>; /* IRQ_SYS_1N */ interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>; /* IRQ_SYS_1N */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcp79410_pins_default>; pinctrl-0 = <&mcp79410_pins_default>;
...@@ -478,7 +479,7 @@ ...@@ -478,7 +479,7 @@
&uart3 { &uart3 {
status = "okay"; status = "okay";
interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
<&dra7_pmx_core 0x248>; <&dra7_pmx_core 0x3f8>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_default>; pinctrl-0 = <&uart3_pins_default>;
......
...@@ -105,6 +105,10 @@ ...@@ -105,6 +105,10 @@
}; };
internal-regs { internal-regs {
rtc@10300 {
/* No crystal connected to the internal RTC */
status = "disabled";
};
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
}; };
......
...@@ -911,7 +911,7 @@ ...@@ -911,7 +911,7 @@
ti,clock-cycles = <16>; ti,clock-cycles = <16>;
reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>, reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>,
<0x4ae06014 0x4>, <0x4a003b20 0x8>, <0x4ae06014 0x4>, <0x4a003b20 0xc>,
<0x4ae0c158 0x4>; <0x4ae0c158 0x4>;
reg-names = "setup-address", "control-address", reg-names = "setup-address", "control-address",
"int-address", "efuse-address", "int-address", "efuse-address",
...@@ -944,7 +944,7 @@ ...@@ -944,7 +944,7 @@
ti,clock-cycles = <16>; ti,clock-cycles = <16>;
reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>, reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>,
<0x4ae06010 0x4>, <0x4a0025cc 0x8>, <0x4ae06010 0x4>, <0x4a0025cc 0xc>,
<0x4a002470 0x4>; <0x4a002470 0x4>;
reg-names = "setup-address", "control-address", reg-names = "setup-address", "control-address",
"int-address", "efuse-address", "int-address", "efuse-address",
...@@ -977,7 +977,7 @@ ...@@ -977,7 +977,7 @@
ti,clock-cycles = <16>; ti,clock-cycles = <16>;
reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>, reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>,
<0x4ae06010 0x4>, <0x4a0025e0 0x8>, <0x4ae06010 0x4>, <0x4a0025e0 0xc>,
<0x4a00246c 0x4>; <0x4a00246c 0x4>;
reg-names = "setup-address", "control-address", reg-names = "setup-address", "control-address",
"int-address", "efuse-address", "int-address", "efuse-address",
...@@ -1010,7 +1010,7 @@ ...@@ -1010,7 +1010,7 @@
ti,clock-cycles = <16>; ti,clock-cycles = <16>;
reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>, reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>,
<0x4ae06010 0x4>, <0x4a003b08 0x8>, <0x4ae06010 0x4>, <0x4a003b08 0xc>,
<0x4ae0c154 0x4>; <0x4ae0c154 0x4>;
reg-names = "setup-address", "control-address", reg-names = "setup-address", "control-address",
"int-address", "efuse-address", "int-address", "efuse-address",
...@@ -1203,7 +1203,7 @@ ...@@ -1203,7 +1203,7 @@
status = "disabled"; status = "disabled";
}; };
rtc@48838000 { rtc: rtc@48838000 {
compatible = "ti,am3352-rtc"; compatible = "ti,am3352-rtc";
reg = <0x48838000 0x100>; reg = <0x48838000 0x100>;
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <dt-bindings/sound/samsung-i2s.h> #include <dt-bindings/sound/samsung-i2s.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/clock/maxim,max77686.h>
#include "exynos4412.dtsi" #include "exynos4412.dtsi"
/ { / {
...@@ -105,6 +106,8 @@ ...@@ -105,6 +106,8 @@
rtc@10070000 { rtc@10070000 {
status = "okay"; status = "okay";
clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
clock-names = "rtc", "rtc_src";
}; };
g2d@10800000 { g2d@10800000 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment