Skip to content

Commit

Permalink
Merge 4.14.155 into kernel.lnx.4.14.r1
Browse files Browse the repository at this point in the history 
Changes in 4.14.155: (239 commits)
        kvm: mmu: Don't read PDPTEs when paging is not enabled
        KVM: x86: introduce is_pae_paging
        MIPS: BCM63XX: fix switch core reset on BCM6368
        scsi: core: Handle drivers which set sg_tablesize to zero
        Revert "Input: synaptics-rmi4 - avoid processing unknown IRQs"
        powerpc/perf: Fix IMC_MAX_PMU macro
        powerpc/perf: Fix kfree memory allocated for nest pmus
        ax88172a: fix information leak on short answers
        net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules
        slip: Fix memory leak in slip_open error path
        ALSA: usb-audio: Fix missing error check at mixer resolution test
        ALSA: usb-audio: not submit urb for stopped endpoint
        Input: ff-memless - kill timer in destroy()
        Input: synaptics-rmi4 - fix video buffer size
        Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver
        Input: synaptics-rmi4 - do not consume more data than we have (F11, F12)
        Input: synaptics-rmi4 - clear IRQ enables for F54
        Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
        IB/hfi1: Ensure full Gen3 speed in a Gen4 system
        i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present
        ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
        ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either
        iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros
        mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm()
        mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup()
        mmc: sdhci-of-at91: fix quirk2 overwrite
        iio: adc: max9611: explicitly cast gain_selectors
        tee: optee: take DT status property into account
        ath10k: fix kernel panic by moving pci flush after napi_disable
        iio: dac: mcp4922: fix error handling in mcp4922_write_raw
        arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage
        arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage
        ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
        arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
        ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
        rtc: rv8803: fix the rv8803 id in the OF table
        remoteproc/davinci: Use %zx for formating size_t
        extcon: cht-wc: Return from default case to avoid warnings
        cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
        ALSA: seq: Do error checks at creating system ports
        ath9k: fix tx99 with monitor mode interface
        ath10k: limit available channels via DT ieee80211-freq-limit
        gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated
        ASoC: dpcm: Properly initialise hw->rate_max
        pinctrl: ingenic: Probe driver at subsys_initcall
        MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
        ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
        liquidio: fix race condition in instruction completion processing
        ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
        i40e: use correct length for strncpy
        i40e: hold the rtnl lock on clearing interrupt scheme
        i40e: Prevent deleting MAC address from VF when set by PF
        IB/rxe: fixes for rdma read retry
        iwlwifi: don't WARN on trying to dump dead firmware
        iwlwifi: mvm: avoid sending too many BARs
        ARM: dts: pxa: fix the rtc controller
        ARM: dts: pxa: fix power i2c base address
        rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument
        soc: imx: gpc: fix PDN delay
        ASoC: rsnd: ssi: Fix issue in dma data address assignment
        net: phy: mscc: read 'vsc8531,vddmac' as an u32
        net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32
        ARM: dts: meson8: fix the clock controller register size
        ARM: dts: meson8b: fix the clock controller register size
        net: lan78xx: Bail out if lan78xx_get_endpoints fails
        ASoC: sgtl5000: avoid division by zero if lo_vag is zero
        ARM: dts: exynos: Disable pull control for S5M8767 PMIC
        ath10k: wmi: disable softirq's while calling ieee80211_rx
        IB/ipoib: Ensure that MTU isn't less than minimum permitted
        RDMA/core: Rate limit MAD error messages
        RDMA/core: Follow correct unregister order between sysfs and cgroup
        mips: txx9: fix iounmap related issue
        ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
        of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
        ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
        ARM: dts: omap3-gta04: fixes for tvout / venc
        ARM: dts: omap3-gta04: tvout: enable as display1 alias
        ARM: dts: omap3-gta04: fix touchscreen tsc2007
        ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
        ARM: dts: omap3-gta04: keep vpll2 always on
        sched/debug: Use symbolic names for task state constants
        arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire
        dmaengine: dma-jz4780: Don't depend on MACH_JZ4780
        dmaengine: dma-jz4780: Further residue status fix
        EDAC, sb_edac: Return early on ADDRV bit and address type test
        rtc: mt6397: fix possible race condition
        rtc: pl030: fix possible race condition
        ath9k: add back support for using active monitor interfaces for tx99
        IB/hfi1: Missing return value in error path for user sdma
        signal: Always ignore SIGKILL and SIGSTOP sent to the global init
        signal: Properly deliver SIGILL from uprobes
        signal: Properly deliver SIGSEGV from x86 uprobes
        f2fs: fix memory leak of percpu counter in fill_super()
        scsi: qla2xxx: Fix iIDMA error
        scsi: qla2xxx: Defer chip reset until target mode is enabled
        scsi: qla2xxx: Fix dropped srb resource.
        scsi: lpfc: Fix errors in log messages.
        scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
        ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
        scsi: pm80xx: Corrected dma_unmap_sg() parameter
        scsi: pm80xx: Fixed system hang issue during kexec boot
        kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
        Drivers: hv: vmbus: Fix synic per-cpu context initialization
        nvmem: core: return error code instead of NULL from nvmem_device_get
        media: dt-bindings: adv748x: Fix decimal unit addresses
        media: fix: media: pci: meye: validate offset to avoid arbitrary access
        media: dvb: fix compat ioctl translation
        arm64: dts: meson: libretech: update board model
        ALSA: intel8x0m: Register irq handler after register initializations
        pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
        llc: avoid blocking in llc_sap_close()
        ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value
        soc: qcom: wcnss_ctrl: Avoid string overflow
        powerpc/vdso: Correct call frame information
        ARM: dts: socfpga: Fix I2C bus unit-address error
        pinctrl: at91: don't use the same irqchip with multiple gpiochips
        cxgb4: Fix endianness issue in t4_fwcache()
        blok, bfq: do not plug I/O if all queues are weight-raised
        arm64: dts: meson: Fix erroneous SPI bus warnings
        power: supply: ab8500_fg: silence uninitialized variable warnings
        power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
        power: supply: max8998-charger: Fix platform data retrieval
        component: fix loop condition to call unbind() if bind() fails
        kernfs: Fix range checks in kernfs_get_target_path
        ip_gre: fix parsing gre header in ipgre_err
        ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
        ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask
        ath9k: Fix a locking bug in ath9k_add_interface()
        s390/qeth: invoke softirqs after napi_schedule()
        PCI/ACPI: Correct error message for ASPM disabling
        serial: uartps: Fix suspend functionality
        serial: samsung: Enable baud clock for UART reset procedure in resume
        serial: mxs-auart: Fix potential infinite loop
        samples/bpf: fix a compilation failure
        spi: mediatek: Don't modify spi_transfer when transfer.
        ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address
        net: hns3: fix return type of ndo_start_xmit function
        powerpc/iommu: Avoid derefence before pointer check
        powerpc/64s/hash: Fix stab_rr off by one initialization
        powerpc/pseries: Disable CPU hotplug across migrations
        powerpc: Fix duplicate const clang warning in user access code
        RDMA/i40iw: Fix incorrect iterator type
        OPP: Protect dev_list with opp_table lock
        libfdt: Ensure INT_MAX is defined in libfdt_env.h
        power: supply: twl4030_charger: fix charging current out-of-bounds
        power: supply: twl4030_charger: disable eoc interrupt on linear charge
        net: toshiba: fix return type of ndo_start_xmit function
        net: xilinx: fix return type of ndo_start_xmit function
        net: broadcom: fix return type of ndo_start_xmit function
        net: amd: fix return type of ndo_start_xmit function
        net: sun: fix return type of ndo_start_xmit function
        net: hns3: Fix for setting speed for phy failed problem
        net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg()
        nfp: provide a better warning when ring allocation fails
        usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
        usb: chipidea: Fix otg event handler
        mlxsw: spectrum: Init shaper for TCs 8..15
        ARM: dts: am335x-evm: fix number of cpsw
        f2fs: fix to recover inode's uid/gid during POR
        ARM: dts: ux500: Correct SCU unit address
        ARM: dts: ux500: Fix LCDA clock line muxing
        ARM: dts: ste: Fix SPI controller node names
        spi: pic32: Use proper enum in dmaengine_prep_slave_rg
        cpufeature: avoid warning when compiling with clang
        crypto: arm/crc32 - avoid warning when compiling with Clang
        ARM: dts: marvell: Fix SPI and I2C bus warnings
        x86/mce-inject: Reset injection struct after injection
        ARM: dts: clearfog: fix sdhci supply property name
        bnx2x: Ignore bandwidth attention in single function mode
        samples/bpf: fix compilation failure
        net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider
        net: micrel: fix return type of ndo_start_xmit function
        net: freescale: fix return type of ndo_start_xmit function
        x86/CPU: Use correct macros for Cyrix calls
        x86/CPU: Change query logic so CPUID is enabled before testing
        MIPS: kexec: Relax memory restriction
        arm64: dts: rockchip: Fix microSD in rk3399 sapphire board
        media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init()
        media: au0828: Fix incorrect error messages
        media: davinci: Fix implicit enum conversion warning
        ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock
        usb: gadget: uvc: configfs: Drop leaked references to config items
        usb: gadget: uvc: configfs: Prevent format changes after linking header
        i2c: aspeed: fix invalid clock parameters for very large divisors
        phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs
        phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs
        phy: phy-twl4030-usb: fix denied runtime access
        usb: gadget: uvc: Factor out video USB request queueing
        usb: gadget: uvc: Only halt video streaming endpoint in bulk mode
        coresight: Fix handling of sinks
        coresight: perf: Fix per cpu path management
        coresight: perf: Disable trace path upon source error
        coresight: etm4x: Configure EL2 exception level when kernel is running in HYP
        coresight: tmc: Fix byte-address alignment for RRP
        misc: kgdbts: Fix restrict error
        misc: genwqe: should return proper error value.
        vfio/pci: Fix potential memory leak in vfio_msi_cap_len
        vfio/pci: Mask buggy SR-IOV VF INTx support
        scsi: libsas: always unregister the old device if going to discover new
        phy: lantiq: Fix compile warning
        ARM: dts: tegra30: fix xcvr-setup-use-fuses
        ARM: tegra: apalis_t30: fix mmc1 cmd pull-up
        ARM: dts: paz00: fix wakeup gpio keycode
        net: smsc: fix return type of ndo_start_xmit function
        net: faraday: fix return type of ndo_start_xmit function
        f2fs: fix to recover inode's project id during POR
        f2fs: mark inode dirty explicitly in recover_inode()
        EDAC: Raise the maximum number of memory controllers
        ARM: dts: realview: Fix SPI controller node names
        firmware: dell_rbu: Make payload memory uncachable
        Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races
        Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS
        x86/hyperv: Suppress "PCI: Fatal: No config space access function found"
        crypto: s5p-sss: Fix Fix argument list alignment
        crypto: fix a memory leak in rsa-kcs1pad's encryption mode
        iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump
        iwlwifi: api: annotate compressed BA notif array sizes
        iwlwifi: mvm: Allow TKIP for AP mode
        scsi: NCR5380: Clear all unissued commands on host reset
        scsi: NCR5380: Have NCR5380_select() return a bool
        scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE
        scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data
        scsi: NCR5380: Check for invalid reselection target
        scsi: NCR5380: Don't clear busy flag when abort fails
        scsi: NCR5380: Don't call dsprintk() following reselection interrupt
        scsi: NCR5380: Handle BUS FREE during reselection
        scsi: NCR5380: Check for bus reset
        arm64: dts: amd: Fix SPI bus warnings
        arm64: dts: lg: Fix SPI controller node names
        ARM: dts: lpc32xx: Fix SPI controller node names
        rtc: armada38x: fix possible race condition
        netfilter: masquerade: don't flush all conntracks if only one address deleted on device
        usb: xhci-mtk: fix ISOC error when interval is zero
        fuse: use READ_ONCE on congestion_threshold and max_background
        IB/iser: Fix possible NULL deref at iser_inv_desc()
        net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused
        memfd: Use radix_tree_deref_slot_protected to avoid the warning.
        slcan: Fix memory leak in error path
        Linux 4.14.155

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	drivers/hwtracing/coresight/coresight-etm-perf.c
	fs/f2fs/recovery.c
	include/linux/libfdt_env.h
  • Loading branch information
@nathanchance
nathanchance committed Nov 20, 2019
2 parents f56c864 + f56f3d0 commit 556ff5d
Show file tree
Hide file tree
Showing 273 changed files with 1,715 additions and 750 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/media/i2c/adv748x.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Example:
};
};

port@10 {
port@a {
reg = <10>;

adv7482_txa: endpoint {
Expand All @@ -83,7 +83,7 @@ Example:
};
};

port@11 {
port@b {
reg = <11>;

adv7482_txb: endpoint {
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ Optional properties:
- interrupt-names: must be "mdio_done_error" when there is a share interrupt fed
to this hardware block, or must be "mdio_done" for the first interrupt and
"mdio_error" for the second when there are separate interrupts
- clocks: A reference to the clock supplying the MDIO bus controller
- clock-frequency: the MDIO bus clock that must be output by the MDIO bus
hardware, if absent, the default hardware values are used

Child nodes of this MDIO bus controller node are standard Ethernet PHY device
nodes as described in Documentation/devicetree/bindings/net/phy.txt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 154
SUBLEVEL = 155
EXTRAVERSION =
NAME = Petit Gorille

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/compressed/libfdt_env.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <linux/string.h>
#include <asm/byteorder.h>

#define INT_MAX ((int)(~0U>>1))

typedef __be16 fdt16_t;
typedef __be32 fdt32_t;
typedef __be64 fdt64_t;
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/boot/dts/am335x-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,22 +724,22 @@
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
slaves = <1>;
};

&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
};

&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "rgmii-txid";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};

&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/arm-realview-eb.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
clock-names = "uartclk", "apb_pclk";
};

ssp: ssp@1000d000 {
ssp: spi@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
clocks = <&sspclk>, <&pclk>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/arm-realview-pb1176.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
clock-names = "apb_pclk";
};

pb1176_ssp: ssp@1010b000 {
pb1176_ssp: spi@1010b000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1010b000 0x1000>;
interrupt-parent = <&intc_dc1176>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/arm-realview-pb11mp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
clock-names = "uartclk", "apb_pclk";
};

ssp@1000d000 {
spi@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
interrupt-parent = <&intc_pb11mp>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/arm-realview-pbx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
clock-names = "uartclk", "apb_pclk";
};

ssp: ssp@1000d000 {
ssp: spi@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
clocks = <&sspclk>, <&pclk>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-388-clearfog.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
&clearfog_sdhci_cd_pins>;
pinctrl-names = "default";
status = "okay";
vmmc = <&reg_3p3v>;
vmmc-supply = <&reg_3p3v>;
wp-inverted;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9g45.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@
};
};

uart1 {
usart1 {
pinctrl_usart1: usart1-0 {
atmel,pins =
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/dove-cubox.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
status = "okay";
clock-frequency = <100000>;

si5351: clock-generator {
si5351: clock-generator@60 {
compatible = "silabs,si5351a-msop";
reg = <0x60>;
#address-cells = <1>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/dove.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */
0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */

spi0: spi-ctrl@10600 {
spi0: spi@10600 {
compatible = "marvell,orion-spi";
#address-cells = <1>;
#size-cells = <0>;
Expand All @@ -168,7 +168,7 @@
status = "disabled";
};

i2c: i2c-ctrl@11000 {
i2c: i2c@11000 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>;
#address-cells = <1>;
Expand Down Expand Up @@ -218,7 +218,7 @@
status = "disabled";
};

spi1: spi-ctrl@14600 {
spi1: spi@14600 {
compatible = "marvell,orion-spi";
#address-cells = <1>;
#size-cells = <0>;
Expand Down
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/exynos5250-arndale.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@
reg = <0x66>;
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&s5m8767_irq>;

vinb1-supply = <&main_dc_reg>;
vinb2-supply = <&main_dc_reg>;
Expand Down Expand Up @@ -544,6 +546,13 @@
cap-sd-highspeed;
};

&pinctrl_0 {
s5m8767_irq: s5m8767-irq {
samsung,pins = "gpx3-2";
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
};

&rtc {
status = "okay";
};
Expand Down
11 changes: 11 additions & 0 deletions arch/arm/boot/dts/exynos5250-snow-rev5.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@

samsung,model = "Snow-I2S-MAX98090";
samsung,audio-codec = <&max98090>;

cpu {
sound-dai = <&i2s0 0>;
};

codec {
sound-dai = <&max98090 0>, <&hdmi>;
};
};
};

Expand All @@ -34,6 +42,9 @@
interrupt-parent = <&gpx0>;
pinctrl-names = "default";
pinctrl-0 = <&max98090_irq>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <1>;
};
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/exynos5420-peach-pit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@
regulator-name = "vdd_1v35";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand All @@ -322,6 +323,7 @@
regulator-name = "vdd_2v";
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand All @@ -332,6 +334,7 @@
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/exynos5800-peach-pi.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@
regulator-name = "vdd_1v35";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand All @@ -322,6 +323,7 @@
regulator-name = "vdd_2v";
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand All @@ -332,6 +334,7 @@
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-on-in-suspend;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/lpc32xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
* ssp0 and spi1 are shared pins;
* enable one in your board dts, as needed.
*/
ssp0: ssp@20084000 {
ssp0: spi@20084000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x20084000 0x1000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
Expand All @@ -199,7 +199,7 @@
* ssp1 and spi2 are shared pins;
* enable one in your board dts, as needed.
*/
ssp1: ssp@2008c000 {
ssp1: spi@2008c000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x2008c000 0x1000>;
interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/meson8.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
#clock-cells = <1>;
#reset-cells = <1>;
compatible = "amlogic,meson8-clkc";
reg = <0x8000 0x4>, <0x4000 0x460>;
reg = <0x8000 0x4>, <0x4000 0x400>;
};

pwm_ef: pwm@86c0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/meson8b.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
#clock-cells = <1>;
#reset-cells = <1>;
compatible = "amlogic,meson8b-clkc";
reg = <0x8000 0x4>, <0x4000 0x460>;
reg = <0x8000 0x4>, <0x4000 0x400>;
};

reset: reset-controller@4404 {
Expand Down
Loading

0 comments on commit 556ff5d

Please sign in to comment.