Commit c64410f3 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "There is a small backlog of at91 patches here, the most significant is
  the addition of some sama5d2 Xplained nodes that were waiting on an
  MFD include file to get merged through another tree.

  We normally try to sort those out before the merge window opens, but
  the maintainer wasn't aware of that here and I decided to merge the
  changes this time as an exception.

  On OMAP a series of audio changes for dra7 missed the merge window but
  turned out to be necessary to fix a boot time imprecise external abort
  error and to get audio working.

  The other changes are the usual simple changes, here is a list sorted
  by platform:

  at91:
	removal of a useless defconfig option
	removal of some legacy DT pieces
	use of the proper watchdog compatible string
	update of the MAINTAINERS entries for some Atmel drivers

  drivers/scpi:
	hide get_scpi_ops in module from built-in code

  imx:
	add missing .irq_set_type for i.MX GPC irq_chip.
	fix the wrong spi-num-chipselects settings for Vybrid DSPI devices.
	fix a merge error in Vybrid dts regarding to ADC device property

  keystone:
        fix the optional PDSP firmware loading
        fix linking RAM setup for QMs
        fix crash with clk_ignore_unused

  mediatek:
	Enable SCPSYS power domain driver by default

  mvebu:
	fix QNAP TS219 power-off in dts
	fix legacy get_irqnr_and_base for dove and orion5x

  omap:
	fix l4 related boot time errors for dm81xx
	use lockless cldm/pwrdm api in omap4_boot_secondary
	remove t410 abort handler to avoid hiding other critical errors
	mark cpuidle tracepoints as _rcuidle
	fix module alias for omap-ocp2scp

  pxa:
	palm: Fix typos in PWM lookup table code

  renesas:
	missing __initconst annotation for r8a7793_boards_compat_dt

  rockchip:
	disable mmc-tuning on the veyron-minnie board
	adding the init state for the over-temperature-protection

  zx:
	only build power domain code when CONFIG_PM=y"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  ARM: OMAP4+: SMP: use lockless clkdm/pwrdm api in omap4_boot_secondary
  arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data
  ARM: orion5x: Fix legacy get_irqnr_and_base
  ARM: dove: Fix legacy get_irqnr_and_base
  soc: Mediatek: Enable SCPSYS power domain driver by default
  ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects.
  ARM: dts: keystone: k2l: fix kernel crash when clk_ignore_unused is not in bootargs
  soc: ti: knav_qmss_queue: Fix linking RAM setup for queue managers
  soc: ti: use request_firmware_direct() as acc firmware is optional
  ARM: imx: add platform irq type setting in gpc
  ARM: dts: vfxxx: Fix erroneous property in esdhc0 node
  ARM: shmobile: r8a7793: proper constness with __initconst
  scpi: hide get_scpi_ops in module from built-in code
  ARM: zx: only build power domain code when CONFIG_PM=y
  ARM: pxa: palm: Fix typos in PWM lookup table code
  ARM: dts: Kirkwood: Fix QNAP TS219 power-off
  ARM: dts: rockchip: Add OTP gpio pinctrl to rk3288 tsadc node
  ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie
  MAINTAINERS: Atmel drivers: change NAND and ISI entries
  ARM: at91/dt: sama5d2 Xplained: add several devices
  ...
parents a3b11c79 a405fd1b
...@@ -49,24 +49,6 @@ specified through DTS. Following are the DTS used:- ...@@ -49,24 +49,6 @@ specified through DTS. Following are the DTS used:-
The device tree documentation for the keystone machines are located at The device tree documentation for the keystone machines are located at
Documentation/devicetree/bindings/arm/keystone/keystone.txt Documentation/devicetree/bindings/arm/keystone/keystone.txt
Known issues & workaround
-------------------------
Some of the device drivers used on keystone are re-used from that from
DaVinci and other TI SoCs. These device drivers may use clock APIs directly.
Some of the keystone specific drivers such as netcp uses run time power
management API instead to enable clock. As this API has limitations on
keystone, following workaround is needed to boot Linux.
Add 'clk_ignore_unused' to the bootargs env variable in u-boot. Otherwise
clock frameworks will try to disable clocks that are unused and disable
the hardware. This is because netcp related power domain and clock
domains are enabled in u-boot as run time power management API currently
doesn't enable clocks for netcp due to a limitation. This workaround is
expected to be removed in the future when proper API support becomes
available. Until then, this work around is needed.
Document Author Document Author
--------------- ---------------
Murali Karicheri <m-karicheri2@ti.com> Murali Karicheri <m-karicheri2@ti.com>
......
...@@ -1931,7 +1931,7 @@ S: Supported ...@@ -1931,7 +1931,7 @@ S: Supported
F: drivers/i2c/busses/i2c-at91.c F: drivers/i2c/busses/i2c-at91.c
ATMEL ISI DRIVER ATMEL ISI DRIVER
M: Josh Wu <josh.wu@atmel.com> M: Ludovic Desroches <ludovic.desroches@atmel.com>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
S: Supported S: Supported
F: drivers/media/platform/soc_camera/atmel-isi.c F: drivers/media/platform/soc_camera/atmel-isi.c
...@@ -1950,7 +1950,8 @@ S: Supported ...@@ -1950,7 +1950,8 @@ S: Supported
F: drivers/net/ethernet/cadence/ F: drivers/net/ethernet/cadence/
ATMEL NAND DRIVER ATMEL NAND DRIVER
M: Josh Wu <josh.wu@atmel.com> M: Wenyou Yang <wenyou.yang@atmel.com>
M: Josh Wu <rainyfeeling@outlook.com>
L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org
S: Supported S: Supported
F: drivers/mtd/nand/atmel_nand* F: drivers/mtd/nand/atmel_nand*
......
...@@ -155,21 +155,21 @@ keyswitch_in { ...@@ -155,21 +155,21 @@ keyswitch_in {
label = "keyswitch_in"; label = "keyswitch_in";
gpios = <&pioB 1 GPIO_ACTIVE_HIGH>; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
error_in { error_in {
label = "error_in"; label = "error_in";
gpios = <&pioB 2 GPIO_ACTIVE_HIGH>; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>; linux,code = <29>;
gpio-key,wakeup; wakeup-source;
}; };
btn { btn {
label = "btn"; label = "btn";
gpios = <&pioC 23 GPIO_ACTIVE_HIGH>; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>; linux,code = <31>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
...@@ -159,7 +159,7 @@ btn { ...@@ -159,7 +159,7 @@ btn {
label = "Button"; label = "Button";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
...@@ -24,15 +24,6 @@ memory { ...@@ -24,15 +24,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
main_xtal { main_xtal {
clock-frequency = <18432000>; clock-frequency = <18432000>;
}; };
...@@ -94,14 +85,14 @@ reset { ...@@ -94,14 +85,14 @@ reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioB 30 GPIO_ACTIVE_HIGH>; gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
user { user {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioB 31 GPIO_ACTIVE_HIGH>; gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -171,21 +171,21 @@ prog { ...@@ -171,21 +171,21 @@ prog {
label = "PB_PROG"; label = "PB_PROG";
gpios = <&pioE 27 GPIO_ACTIVE_LOW>; gpios = <&pioE 27 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
gpio-key,wakeup; wakeup-source;
}; };
reset { reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>; gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
user { user {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioE 31 GPIO_ACTIVE_HIGH>; gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -98,14 +98,14 @@ prog { ...@@ -98,14 +98,14 @@ prog {
label = "PB_PROG"; label = "PB_PROG";
gpios = <&pioC 17 GPIO_ACTIVE_LOW>; gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
gpio-key,wakeup; wakeup-source;
}; };
reset { reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioC 16 GPIO_ACTIVE_LOW>; gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -183,7 +183,7 @@ user_pb { ...@@ -183,7 +183,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
/dts-v1/; /dts-v1/;
#include "sama5d2.dtsi" #include "sama5d2.dtsi"
#include "sama5d2-pinfunc.h" #include "sama5d2-pinfunc.h"
#include <dt-bindings/mfd/atmel-flexcom.h>
/ { / {
model = "Atmel SAMA5D2 Xplained"; model = "Atmel SAMA5D2 Xplained";
...@@ -59,15 +60,6 @@ memory { ...@@ -59,15 +60,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -91,6 +83,22 @@ usb2: ehci@00500000 { ...@@ -91,6 +83,22 @@ usb2: ehci@00500000 {
status = "okay"; status = "okay";
}; };
sdmmc0: sdio-host@a0000000 {
bus-width = <8>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
non-removable;
mmc-ddr-1_8v;
status = "okay";
};
sdmmc1: sdio-host@b0000000 {
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay"; /* conflict with qspi0 */
};
apb { apb {
spi0: spi@f8000000 { spi0: spi@f8000000 {
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -181,12 +189,49 @@ vdd_sdhc_1v8_reg: LDO_REG4 { ...@@ -181,12 +189,49 @@ vdd_sdhc_1v8_reg: LDO_REG4 {
}; };
}; };
flx0: flexcom@f8034000 {
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
uart5: serial@200 {
compatible = "atmel,at91sam9260-usart";
reg = <0x200 0x200>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&flx0_clk>;
clock-names = "usart";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx0_default>;
atmel,fifo-size = <32>;
status = "okay";
};
};
uart3: serial@fc008000 { uart3: serial@fc008000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3_default>; pinctrl-0 = <&pinctrl_uart3_default>;
status = "okay"; status = "okay";
}; };
flx4: flexcom@fc018000 {
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
status = "okay";
i2c2: i2c@600 {
compatible = "atmel,sama5d2-i2c";
reg = <0x600 0x200>;
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
dmas = <0>, <0>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&flx4_clk>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx4_default>;
atmel,fifo-size = <16>;
status = "okay";
};
};
i2c1: i2c@fc028000 { i2c1: i2c@fc028000 {
dmas = <0>, <0>; dmas = <0>, <0>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -201,6 +246,18 @@ at24@54 { ...@@ -201,6 +246,18 @@ at24@54 {
}; };
pinctrl@fc038000 { pinctrl@fc038000 {
pinctrl_flx0_default: flx0_default {
pinmux = <PIN_PB28__FLEXCOM0_IO0>,
<PIN_PB29__FLEXCOM0_IO1>;
bias-disable;
};
pinctrl_flx4_default: flx4_default {
pinmux = <PIN_PD12__FLEXCOM4_IO0>,
<PIN_PD13__FLEXCOM4_IO1>;
bias-disable;
};
pinctrl_i2c0_default: i2c0_default { pinctrl_i2c0_default: i2c0_default {
pinmux = <PIN_PD21__TWD0>, pinmux = <PIN_PD21__TWD0>,
<PIN_PD22__TWCK0>; <PIN_PD22__TWCK0>;
...@@ -227,6 +284,46 @@ pinctrl_macb0_default: macb0_default { ...@@ -227,6 +284,46 @@ pinctrl_macb0_default: macb0_default {
bias-disable; bias-disable;
}; };
pinctrl_sdmmc0_default: sdmmc0_default {
cmd_data {
pinmux = <PIN_PA1__SDMMC0_CMD>,
<PIN_PA2__SDMMC0_DAT0>,
<PIN_PA3__SDMMC0_DAT1>,
<PIN_PA4__SDMMC0_DAT2>,
<PIN_PA5__SDMMC0_DAT3>,
<PIN_PA6__SDMMC0_DAT4>,
<PIN_PA7__SDMMC0_DAT5>,
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
};
ck_cd_rstn_vddsel {
pinmux = <PIN_PA0__SDMMC0_CK>,
<PIN_PA10__SDMMC0_RSTN>,
<PIN_PA11__SDMMC0_VDDSEL>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
};
};
pinctrl_sdmmc1_default: sdmmc1_default {
cmd_data {
pinmux = <PIN_PA28__SDMMC1_CMD>,
<PIN_PA18__SDMMC1_DAT0>,
<PIN_PA19__SDMMC1_DAT1>,
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
};
conf-ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
};
};
pinctrl_spi0_default: spi0_default { pinctrl_spi0_default: spi0_default {
pinmux = <PIN_PA14__SPI0_SPCK>, pinmux = <PIN_PA14__SPI0_SPCK>,
<PIN_PA15__SPI0_MOSI>, <PIN_PA15__SPI0_MOSI>,
......
...@@ -315,7 +315,7 @@ bp3 { ...@@ -315,7 +315,7 @@ bp3 {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>; gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -50,7 +50,6 @@ / { ...@@ -50,7 +50,6 @@ / {
compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5"; compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5";
chosen { chosen {
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
...@@ -59,15 +58,6 @@ memory { ...@@ -59,15 +58,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -235,7 +225,7 @@ pb_user1 { ...@@ -235,7 +225,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -50,7 +50,6 @@ / { ...@@ -50,7 +50,6 @@ / {
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5"; compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
chosen { chosen {
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
...@@ -59,15 +58,6 @@ memory { ...@@ -59,15 +58,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -304,7 +294,7 @@ pb_user1 { ...@@ -304,7 +294,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>; gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -21,15 +21,6 @@ memory { ...@@ -21,15 +21,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
......
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -149,7 +140,7 @@ tsc2046@0 { ...@@ -149,7 +140,7 @@ tsc2046@0 {
ti,debounce-tol = /bits/ 16 <65535>; ti,debounce-tol = /bits/ 16 <65535>;
ti,debounce-max = /bits/ 16 <1>; ti,debounce-max = /bits/ 16 <1>;
linux,wakeup; wakeup-source;
}; };
}; };
...@@ -193,28 +184,28 @@ button_0 { ...@@ -193,28 +184,28 @@ button_0 {
label = "button_0"; label = "button_0";
gpios = <&pioA 27 GPIO_ACTIVE_LOW>; gpios = <&pioA 27 GPIO_ACTIVE_LOW>;
linux,code = <256>; linux,code = <256>;
gpio-key,wakeup; wakeup-source;
}; };
button_1 { button_1 {
label = "button_1"; label = "button_1";
gpios = <&pioA 26 GPIO_ACTIVE_LOW>; gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
linux,code = <257>; linux,code = <257>;
gpio-key,wakeup; wakeup-source;
}; };
button_2 { button_2 {
label = "button_2"; label = "button_2";
gpios = <&pioA 25 GPIO_ACTIVE_LOW>; gpios = <&pioA 25 GPIO_ACTIVE_LOW>;
linux,code = <258>; linux,code = <258>;
gpio-key,wakeup; wakeup-source;
}; };
button_3 { button_3 {
label = "button_3"; label = "button_3";
gpios = <&pioA 24 GPIO_ACTIVE_LOW>; gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
linux,code = <259>; linux,code = <259>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <16367660>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -213,14 +204,14 @@ left_click { ...@@ -213,14 +204,14 @@ left_click {
label = "left_click"; label = "left_click";
gpios = <&pioC 5 GPIO_ACTIVE_LOW>; gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -19,15 +19,6 @@ memory { ...@@ -19,15 +19,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -206,14 +197,14 @@ btn3 { ...@@ -206,14 +197,14 @@ btn3 {
label = "Button 3"; label = "Button 3";
gpios = <&pioA 30 GPIO_ACTIVE_LOW>; gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; wakeup-source;
}; };
btn4 { btn4 {
label = "Button 4"; label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>; gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -24,15 +24,6 @@ memory { ...@@ -24,15 +24,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -323,14 +314,14 @@ left_click { ...@@ -323,14 +314,14 @@ left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 6 GPIO_ACTIVE_LOW>; gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 7 GPIO_ACTIVE_LOW>; gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
left { left {
......
...@@ -23,15 +23,6 @@ memory { ...@@ -23,15 +23,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <16000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -219,7 +210,7 @@ enter { ...@@ -219,7 +210,7 @@ enter {
label = "Enter"; label = "Enter";
gpios = <&pioB 3 GPIO_ACTIVE_LOW>; gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -225,14 +216,14 @@ right_click { ...@@ -225,14 +216,14 @@ right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 0 GPIO_ACTIVE_LOW>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 1 GPIO_ACTIVE_LOW>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -12,17 +12,6 @@ memory { ...@@ -12,17 +12,6 @@ memory {
reg = <0x20000000 0x8000000>; reg = <0x20000000 0x8000000>;
}; };
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
};
clocks { clocks {
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
......
...@@ -1459,8 +1459,8 @@ mcasp3: mcasp@48468000 { ...@@ -1459,8 +1459,8 @@ mcasp3: mcasp@48468000 {
interrupt-names = "tx", "rx"; interrupt-names = "tx", "rx";
dmas = <&sdma_xbar 133>, <&sdma_xbar 132>; dmas = <&sdma_xbar 133>, <&sdma_xbar 132>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcasp3_ahclkx_mux>; clocks = <&mcasp3_aux_gfclk_mux>, <&mcasp3_ahclkx_mux>;
clock-names = "fck"; clock-names = "fck", "ahclkx";
status = "disabled"; status = "disabled";
}; };
......
...@@ -137,7 +137,7 @@ netcp: netcp@26000000 { ...@@ -137,7 +137,7 @@ netcp: netcp@26000000 {
/* NetCP address range */ /* NetCP address range */
ranges = <0 0x26000000 0x1000000>; ranges = <0 0x26000000 0x1000000>;
clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>; clocks = <&clkosr>, <&papllclk>, <&clkcpgmac>, <&chipclk12>;
dma-coherent; dma-coherent;
ti,navigator-dmas = <&dma_gbe 0>, ti,navigator-dmas = <&dma_gbe 0>,
......
...@@ -40,7 +40,7 @@ serial@12100 { ...@@ -40,7 +40,7 @@ serial@12100 {
}; };
poweroff@12100 { poweroff@12100 {
compatible = "qnap,power-off"; compatible = "qnap,power-off";
reg = <0x12000 0x100>; reg = <0x12100 0x100>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
}; };
spi@10600 { spi@10600 {
......
...@@ -86,6 +86,10 @@ vcc18_lcd: vcc18-lcd { ...@@ -86,6 +86,10 @@ vcc18_lcd: vcc18-lcd {
}; };
}; };
&emmc {
/delete-property/mmc-hs200-1_8v;
};
&gpio_keys { &gpio_keys {
pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>; pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;
......
...@@ -452,8 +452,10 @@ tsadc: tsadc@ff280000 { ...@@ -452,8 +452,10 @@ tsadc: tsadc@ff280000 {
clock-names = "tsadc", "apb_pclk"; clock-names = "tsadc", "apb_pclk";
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
pinctrl-names = "default"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_out>; pinctrl-0 = <&otp_gpio>;
pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
status = "disabled"; status = "disabled";
...@@ -1395,6 +1397,10 @@ uart4_rts: uart4-rts { ...@@ -1395,6 +1397,10 @@ uart4_rts: uart4-rts {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio {
rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
};
otp_out: otp-out { otp_out: otp-out {
rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;
}; };
......
...@@ -49,7 +49,7 @@ pb_user1 { ...@@ -49,7 +49,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
...@@ -1300,7 +1300,7 @@ pit: timer@fc068630 { ...@@ -1300,7 +1300,7 @@ pit: timer@fc068630 {
}; };
watchdog@fc068640 { watchdog@fc068640 {
compatible = "atmel,at91sam9260-wdt"; compatible = "atmel,sama5d4-wdt";
reg = <0xfc068640 0x10>; reg = <0xfc068640 0x10>;
clocks = <&clk32k>; clocks = <&clk32k>;
status = "disabled"; status = "disabled";
......
...@@ -115,7 +115,7 @@ user_pb { ...@@ -115,7 +115,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -143,7 +143,7 @@ user_pb { ...@@ -143,7 +143,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
...@@ -158,7 +158,7 @@ dspi0: dspi0@4002c000 { ...@@ -158,7 +158,7 @@ dspi0: dspi0@4002c000 {
interrupts = <67 IRQ_TYPE_LEVEL_HIGH>; interrupts = <67 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks VF610_CLK_DSPI0>; clocks = <&clks VF610_CLK_DSPI0>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <5>; spi-num-chipselects = <6>;
status = "disabled"; status = "disabled";
}; };
...@@ -170,7 +170,7 @@ dspi1: dspi1@4002d000 { ...@@ -170,7 +170,7 @@ dspi1: dspi1@4002d000 {
interrupts = <68 IRQ_TYPE_LEVEL_HIGH>; interrupts = <68 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks VF610_CLK_DSPI1>; clocks = <&clks VF610_CLK_DSPI1>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <5>; spi-num-chipselects = <4>;
status = "disabled"; status = "disabled";
}; };
...@@ -461,6 +461,8 @@ adc1: adc@400bb000 { ...@@ -461,6 +461,8 @@ adc1: adc@400bb000 {
clock-names = "adc"; clock-names = "adc";
#io-channel-cells = <1>; #io-channel-cells = <1>;
status = "disabled"; status = "disabled";
fsl,adck-max-frequency = <30000000>, <40000000>,
<20000000>;
}; };
esdhc0: esdhc@400b1000 { esdhc0: esdhc@400b1000 {
...@@ -472,8 +474,6 @@ esdhc0: esdhc@400b1000 { ...@@ -472,8 +474,6 @@ esdhc0: esdhc@400b1000 {
<&clks VF610_CLK_ESDHC0>; <&clks VF610_CLK_ESDHC0>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
status = "disabled"; status = "disabled";
fsl,adck-max-frequency = <30000000>, <40000000>,
<20000000>;
}; };
esdhc1: esdhc@400b2000 { esdhc1: esdhc@400b2000 {
......
...@@ -125,7 +125,6 @@ CONFIG_POWER_RESET=y ...@@ -125,7 +125,6 @@ CONFIG_POWER_RESET=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y
CONFIG_SSB=m
CONFIG_MFD_ATMEL_HLCDC=y CONFIG_MFD_ATMEL_HLCDC=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
......
...@@ -129,7 +129,6 @@ CONFIG_GPIO_SYSFS=y ...@@ -129,7 +129,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY=y
CONFIG_POWER_RESET=y CONFIG_POWER_RESET=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_SSB=m
CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_FLEXCOM=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
......
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
@ check low interrupts @ check low interrupts
ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF] ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
ldr \tmp, [\base, #IRQ_MASK_LOW_OFF] ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
mov \irqnr, #31 mov \irqnr, #32
ands \irqstat, \irqstat, \tmp ands \irqstat, \irqstat, \tmp
@ if no low interrupts set, check high interrupts @ if no low interrupts set, check high interrupts
ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF] ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF] ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF]
moveq \irqnr, #63 moveq \irqnr, #64
andeqs \irqstat, \irqstat, \tmp andeqs \irqstat, \irqstat, \tmp
@ find first active interrupt source @ find first active interrupt source
......
...@@ -177,6 +177,7 @@ static struct irq_chip imx_gpc_chip = { ...@@ -177,6 +177,7 @@ static struct irq_chip imx_gpc_chip = {
.irq_unmask = imx_gpc_irq_unmask, .irq_unmask = imx_gpc_irq_unmask,
.irq_retrigger = irq_chip_retrigger_hierarchy, .irq_retrigger = irq_chip_retrigger_hierarchy,
.irq_set_wake = imx_gpc_irq_set_wake, .irq_set_wake = imx_gpc_irq_set_wake,
.irq_set_type = irq_chip_set_type_parent,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.irq_set_affinity = irq_chip_set_affinity_parent, .irq_set_affinity = irq_chip_set_affinity_parent,
#endif #endif
......
...@@ -143,9 +143,9 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -143,9 +143,9 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
* Ensure that CPU power state is set to ON to avoid CPU * Ensure that CPU power state is set to ON to avoid CPU
* powerdomain transition on wfi * powerdomain transition on wfi
*/ */
clkdm_wakeup(cpu1_clkdm); clkdm_wakeup_nolock(cpu1_clkdm);
omap_set_pwrdm_state(cpu1_pwrdm, PWRDM_POWER_ON); pwrdm_set_next_pwrst(cpu1_pwrdm, PWRDM_POWER_ON);
clkdm_allow_idle(cpu1_clkdm); clkdm_allow_idle_nolock(cpu1_clkdm);
if (IS_PM44XX_ERRATUM(PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD)) { if (IS_PM44XX_ERRATUM(PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD)) {
while (gic_dist_disabled()) { while (gic_dist_disabled()) {
......
...@@ -890,6 +890,36 @@ static int _init_opt_clks(struct omap_hwmod *oh) ...@@ -890,6 +890,36 @@ static int _init_opt_clks(struct omap_hwmod *oh)
return ret; return ret;
} }
static void _enable_optional_clocks(struct omap_hwmod *oh)
{
struct omap_hwmod_opt_clk *oc;
int i;
pr_debug("omap_hwmod: %s: enabling optional clocks\n", oh->name);
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
if (oc->_clk) {
pr_debug("omap_hwmod: enable %s:%s\n", oc->role,
__clk_get_name(oc->_clk));
clk_enable(oc->_clk);
}
}
static void _disable_optional_clocks(struct omap_hwmod *oh)
{
struct omap_hwmod_opt_clk *oc;
int i;
pr_debug("omap_hwmod: %s: disabling optional clocks\n", oh->name);
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
if (oc->_clk) {
pr_debug("omap_hwmod: disable %s:%s\n", oc->role,
__clk_get_name(oc->_clk));
clk_disable(oc->_clk);
}
}
/** /**
* _enable_clocks - enable hwmod main clock and interface clocks * _enable_clocks - enable hwmod main clock and interface clocks
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *
...@@ -917,6 +947,9 @@ static int _enable_clocks(struct omap_hwmod *oh) ...@@ -917,6 +947,9 @@ static int _enable_clocks(struct omap_hwmod *oh)
clk_enable(os->_clk); clk_enable(os->_clk);
} }
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
_enable_optional_clocks(oh);
/* The opt clocks are controlled by the device driver. */ /* The opt clocks are controlled by the device driver. */
return 0; return 0;
...@@ -948,41 +981,14 @@ static int _disable_clocks(struct omap_hwmod *oh) ...@@ -948,41 +981,14 @@ static int _disable_clocks(struct omap_hwmod *oh)
clk_disable(os->_clk); clk_disable(os->_clk);
} }
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
_disable_optional_clocks(oh);
/* The opt clocks are controlled by the device driver. */ /* The opt clocks are controlled by the device driver. */
return 0; return 0;
} }
static void _enable_optional_clocks(struct omap_hwmod *oh)
{
struct omap_hwmod_opt_clk *oc;
int i;
pr_debug("omap_hwmod: %s: enabling optional clocks\n", oh->name);
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
if (oc->_clk) {
pr_debug("omap_hwmod: enable %s:%s\n", oc->role,
__clk_get_name(oc->_clk));
clk_enable(oc->_clk);
}
}
static void _disable_optional_clocks(struct omap_hwmod *oh)
{
struct omap_hwmod_opt_clk *oc;
int i;
pr_debug("omap_hwmod: %s: disabling optional clocks\n", oh->name);
for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
if (oc->_clk) {
pr_debug("omap_hwmod: disable %s:%s\n", oc->role,
__clk_get_name(oc->_clk));
clk_disable(oc->_clk);
}
}
/** /**
* _omap4_enable_module - enable CLKCTRL modulemode on OMAP4 * _omap4_enable_module - enable CLKCTRL modulemode on OMAP4
* @oh: struct omap_hwmod * * @oh: struct omap_hwmod *
......
...@@ -523,6 +523,8 @@ struct omap_hwmod_omap4_prcm { ...@@ -523,6 +523,8 @@ struct omap_hwmod_omap4_prcm {
* HWMOD_RECONFIG_IO_CHAIN: omap_hwmod code needs to reconfigure wake-up * HWMOD_RECONFIG_IO_CHAIN: omap_hwmod code needs to reconfigure wake-up
* events by calling _reconfigure_io_chain() when a device is enabled * events by calling _reconfigure_io_chain() when a device is enabled
* or idled. * or idled.
* HWMOD_OPT_CLKS_NEEDED: The optional clocks are needed for the module to
* operate and they need to be handled at the same time as the main_clk.
*/ */
#define HWMOD_SWSUP_SIDLE (1 << 0) #define HWMOD_SWSUP_SIDLE (1 << 0)
#define HWMOD_SWSUP_MSTANDBY (1 << 1) #define HWMOD_SWSUP_MSTANDBY (1 << 1)
...@@ -538,6 +540,7 @@ struct omap_hwmod_omap4_prcm { ...@@ -538,6 +540,7 @@ struct omap_hwmod_omap4_prcm {
#define HWMOD_FORCE_MSTANDBY (1 << 11) #define HWMOD_FORCE_MSTANDBY (1 << 11)
#define HWMOD_SWSUP_SIDLE_ACT (1 << 12) #define HWMOD_SWSUP_SIDLE_ACT (1 << 12)
#define HWMOD_RECONFIG_IO_CHAIN (1 << 13) #define HWMOD_RECONFIG_IO_CHAIN (1 << 13)
#define HWMOD_OPT_CLKS_NEEDED (1 << 14)
/* /*
* omap_hwmod._int_flags definitions * omap_hwmod._int_flags definitions
......
...@@ -1297,6 +1297,44 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = { ...@@ -1297,6 +1297,44 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = {
.dev_attr = &mcspi4_dev_attr, .dev_attr = &mcspi4_dev_attr,
}; };
/*
* 'mcasp' class
*
*/
static struct omap_hwmod_class_sysconfig dra7xx_mcasp_sysc = {
.sysc_offs = 0x0004,
.sysc_flags = SYSC_HAS_SIDLEMODE,
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
.sysc_fields = &omap_hwmod_sysc_type3,
};
static struct omap_hwmod_class dra7xx_mcasp_hwmod_class = {
.name = "mcasp",
.sysc = &dra7xx_mcasp_sysc,
};
/* mcasp3 */
static struct omap_hwmod_opt_clk mcasp3_opt_clks[] = {
{ .role = "ahclkx", .clk = "mcasp3_ahclkx_mux" },
};
static struct omap_hwmod dra7xx_mcasp3_hwmod = {
.name = "mcasp3",
.class = &dra7xx_mcasp_hwmod_class,
.clkdm_name = "l4per2_clkdm",
.main_clk = "mcasp3_aux_gfclk_mux",
.flags = HWMOD_OPT_CLKS_NEEDED,
.prcm = {
.omap4 = {
.clkctrl_offs = DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET,
.context_offs = DRA7XX_RM_L4PER2_MCASP3_CONTEXT_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
},
},
.opt_clks = mcasp3_opt_clks,
.opt_clks_cnt = ARRAY_SIZE(mcasp3_opt_clks),
};
/* /*
* 'mmc' class * 'mmc' class
* *
...@@ -2566,6 +2604,22 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = { ...@@ -2566,6 +2604,22 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = {
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* l4_per2 -> mcasp3 */
static struct omap_hwmod_ocp_if dra7xx_l4_per2__mcasp3 = {
.master = &dra7xx_l4_per2_hwmod,
.slave = &dra7xx_mcasp3_hwmod,
.clk = "l4_root_clk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
/* l3_main_1 -> mcasp3 */
static struct omap_hwmod_ocp_if dra7xx_l3_main_1__mcasp3 = {
.master = &dra7xx_l3_main_1_hwmod,
.slave = &dra7xx_mcasp3_hwmod,
.clk = "l3_iclk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
/* l4_per1 -> elm */ /* l4_per1 -> elm */
static struct omap_hwmod_ocp_if dra7xx_l4_per1__elm = { static struct omap_hwmod_ocp_if dra7xx_l4_per1__elm = {
.master = &dra7xx_l4_per1_hwmod, .master = &dra7xx_l4_per1_hwmod,
...@@ -3308,6 +3362,8 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { ...@@ -3308,6 +3362,8 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
&dra7xx_l4_wkup__dcan1, &dra7xx_l4_wkup__dcan1,
&dra7xx_l4_per2__dcan2, &dra7xx_l4_per2__dcan2,
&dra7xx_l4_per2__cpgmac0, &dra7xx_l4_per2__cpgmac0,
&dra7xx_l4_per2__mcasp3,
&dra7xx_l3_main_1__mcasp3,
&dra7xx_gmac__mdio, &dra7xx_gmac__mdio,
&dra7xx_l4_cfg__dma_system, &dra7xx_l4_cfg__dma_system,
&dra7xx_l3_main_1__dss, &dra7xx_l3_main_1__dss,
......
...@@ -144,6 +144,7 @@ static struct omap_hwmod dm81xx_l4_ls_hwmod = { ...@@ -144,6 +144,7 @@ static struct omap_hwmod dm81xx_l4_ls_hwmod = {
.name = "l4_ls", .name = "l4_ls",
.clkdm_name = "alwon_l3s_clkdm", .clkdm_name = "alwon_l3s_clkdm",
.class = &l4_hwmod_class, .class = &l4_hwmod_class,
.flags = HWMOD_NO_IDLEST,
}; };
/* /*
...@@ -155,6 +156,7 @@ static struct omap_hwmod dm81xx_l4_hs_hwmod = { ...@@ -155,6 +156,7 @@ static struct omap_hwmod dm81xx_l4_hs_hwmod = {
.name = "l4_hs", .name = "l4_hs",
.clkdm_name = "alwon_l3_med_clkdm", .clkdm_name = "alwon_l3_med_clkdm",
.class = &l4_hwmod_class, .class = &l4_hwmod_class,
.flags = HWMOD_NO_IDLEST,
}; };
/* L3 slow -> L4 ls peripheral interface running at 125MHz */ /* L3 slow -> L4 ls peripheral interface running at 125MHz */
...@@ -850,6 +852,7 @@ static struct omap_hwmod dm816x_emac0_hwmod = { ...@@ -850,6 +852,7 @@ static struct omap_hwmod dm816x_emac0_hwmod = {
.name = "emac0", .name = "emac0",
.clkdm_name = "alwon_ethernet_clkdm", .clkdm_name = "alwon_ethernet_clkdm",
.class = &dm816x_emac_hwmod_class, .class = &dm816x_emac_hwmod_class,
.flags = HWMOD_NO_IDLEST,
}; };
static struct omap_hwmod_ocp_if dm81xx_l4_hs__emac0 = { static struct omap_hwmod_ocp_if dm81xx_l4_hs__emac0 = {
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#include <linux/platform_data/iommu-omap.h> #include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/wkup_m3.h> #include <linux/platform_data/wkup_m3.h>
#include <asm/siginfo.h>
#include <asm/signal.h>
#include "common.h" #include "common.h"
#include "common-board-devices.h" #include "common-board-devices.h"
#include "dss-common.h" #include "dss-common.h"
...@@ -385,29 +382,6 @@ static void __init omap3_pandora_legacy_init(void) ...@@ -385,29 +382,6 @@ static void __init omap3_pandora_legacy_init(void)
} }
#endif /* CONFIG_ARCH_OMAP3 */ #endif /* CONFIG_ARCH_OMAP3 */
#ifdef CONFIG_SOC_TI81XX
static int fault_fixed_up;
static int t410_abort_handler(unsigned long addr, unsigned int fsr,
struct pt_regs *regs)
{
if ((fsr == 0x406 || fsr == 0xc06) && !fault_fixed_up) {
pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",
addr, fsr);
fault_fixed_up = 1;
return 0;
}
return 1;
}
static void __init t410_abort_init(void)
{
hook_fault_code(16 + 6, t410_abort_handler, SIGBUS, BUS_OBJERR,
"imprecise external abort");
}
#endif
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
static struct iommu_platform_data omap4_iommu_pdata = { static struct iommu_platform_data omap4_iommu_pdata = {
.reset_name = "mmu_cache", .reset_name = "mmu_cache",
...@@ -536,9 +510,6 @@ static struct pdata_init pdata_quirks[] __initdata = { ...@@ -536,9 +510,6 @@ static struct pdata_init pdata_quirks[] __initdata = {
{ "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, }, { "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, },
{ "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, }, { "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, },
#endif #endif
#ifdef CONFIG_SOC_TI81XX
{ "hp,t410", t410_abort_init, },
#endif
#ifdef CONFIG_SOC_OMAP5 #ifdef CONFIG_SOC_OMAP5
{ "ti,omap5-uevm", omap5_uevm_legacy_init, }, { "ti,omap5-uevm", omap5_uevm_legacy_init, },
#endif #endif
......
...@@ -301,11 +301,11 @@ static void omap3_pm_idle(void) ...@@ -301,11 +301,11 @@ static void omap3_pm_idle(void)
if (omap_irq_pending()) if (omap_irq_pending())
return; return;
trace_cpu_idle(1, smp_processor_id()); trace_cpu_idle_rcuidle(1, smp_processor_id());
omap_sram_idle(); omap_sram_idle();
trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id()); trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
} }
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
......
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
@ find cause bits that are unmasked @ find cause bits that are unmasked
ands \irqstat, \irqstat, \tmp @ clear Z flag if any ands \irqstat, \irqstat, \tmp @ clear Z flag if any
clzne \irqnr, \irqstat @ calc irqnr clzne \irqnr, \irqstat @ calc irqnr
rsbne \irqnr, \irqnr, #31 rsbne \irqnr, \irqnr, #32
.endm .endm
...@@ -344,7 +344,7 @@ void __init palm27x_pwm_init(int bl, int lcd) ...@@ -344,7 +344,7 @@ void __init palm27x_pwm_init(int bl, int lcd)
{ {
palm_bl_power = bl; palm_bl_power = bl;
palm_lcd_power = lcd; palm_lcd_power = lcd;
pwm_add_lookup(palm27x_pwm_lookup, ARRAY_SIZE(palm27x_pwm_lookup)); pwm_add_table(palm27x_pwm_lookup, ARRAY_SIZE(palm27x_pwm_lookup));
platform_device_register(&palm27x_backlight); platform_device_register(&palm27x_backlight);
} }
#endif #endif
......
...@@ -169,7 +169,7 @@ static inline void palmtc_keys_init(void) {} ...@@ -169,7 +169,7 @@ static inline void palmtc_keys_init(void) {}
#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE) #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
static struct pwm_lookup palmtc_pwm_lookup[] = { static struct pwm_lookup palmtc_pwm_lookup[] = {
PWM_LOOKUP("pxa25x-pwm.1", 0, "pwm-backlight.0", NULL, PALMTC_PERIOD_NS, PWM_LOOKUP("pxa25x-pwm.1", 0, "pwm-backlight.0", NULL, PALMTC_PERIOD_NS,
PWM_PERIOD_NORMAL), PWM_POLARITY_NORMAL),
}; };
static struct platform_pwm_backlight_data palmtc_backlight_data = { static struct platform_pwm_backlight_data palmtc_backlight_data = {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "common.h" #include "common.h"
#include "rcar-gen2.h" #include "rcar-gen2.h"
static const char *r8a7793_boards_compat_dt[] __initconst = { static const char * const r8a7793_boards_compat_dt[] __initconst = {
"renesas,r8a7793", "renesas,r8a7793",
NULL, NULL,
}; };
......
...@@ -13,7 +13,7 @@ config SOC_ZX296702 ...@@ -13,7 +13,7 @@ config SOC_ZX296702
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select PM_GENERIC_DOMAINS select PM_GENERIC_DOMAINS if PM
help help
Support for ZTE ZX296702 SoC which is a dual core CortexA9MP Support for ZTE ZX296702 SoC which is a dual core CortexA9MP
endif endif
...@@ -117,7 +117,7 @@ static struct platform_driver omap_ocp2scp_driver = { ...@@ -117,7 +117,7 @@ static struct platform_driver omap_ocp2scp_driver = {
module_platform_driver(omap_ocp2scp_driver); module_platform_driver(omap_ocp2scp_driver);
MODULE_ALIAS("platform: omap-ocp2scp"); MODULE_ALIAS("platform:omap-ocp2scp");
MODULE_AUTHOR("Texas Instruments Inc."); MODULE_AUTHOR("Texas Instruments Inc.");
MODULE_DESCRIPTION("OMAP OCP2SCP driver"); MODULE_DESCRIPTION("OMAP OCP2SCP driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -23,6 +23,7 @@ config MTK_PMIC_WRAP ...@@ -23,6 +23,7 @@ config MTK_PMIC_WRAP
config MTK_SCPSYS config MTK_SCPSYS
bool "MediaTek SCPSYS Support" bool "MediaTek SCPSYS Support"
depends on ARCH_MEDIATEK || COMPILE_TEST depends on ARCH_MEDIATEK || COMPILE_TEST
default ARM64 && ARCH_MEDIATEK
select REGMAP select REGMAP
select MTK_INFRACFG select MTK_INFRACFG
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
......
...@@ -1179,7 +1179,7 @@ static int knav_queue_setup_link_ram(struct knav_device *kdev) ...@@ -1179,7 +1179,7 @@ static int knav_queue_setup_link_ram(struct knav_device *kdev)
block++; block++;
if (!block->size) if (!block->size)
return 0; continue;
dev_dbg(kdev->dev, "linkram1: phys:%x, virt:%p, size:%x\n", dev_dbg(kdev->dev, "linkram1: phys:%x, virt:%p, size:%x\n",
block->phys, block->virt, block->size); block->phys, block->virt, block->size);
...@@ -1519,9 +1519,9 @@ static int knav_queue_load_pdsp(struct knav_device *kdev, ...@@ -1519,9 +1519,9 @@ static int knav_queue_load_pdsp(struct knav_device *kdev,
for (i = 0; i < ARRAY_SIZE(knav_acc_firmwares); i++) { for (i = 0; i < ARRAY_SIZE(knav_acc_firmwares); i++) {
if (knav_acc_firmwares[i]) { if (knav_acc_firmwares[i]) {
ret = request_firmware(&fw, ret = request_firmware_direct(&fw,
knav_acc_firmwares[i], knav_acc_firmwares[i],
kdev->dev); kdev->dev);
if (!ret) { if (!ret) {
found = true; found = true;
break; break;
......
...@@ -71,7 +71,7 @@ struct scpi_ops { ...@@ -71,7 +71,7 @@ struct scpi_ops {
int (*sensor_get_value)(u16, u32 *); int (*sensor_get_value)(u16, u32 *);
}; };
#if IS_ENABLED(CONFIG_ARM_SCPI_PROTOCOL) #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL)
struct scpi_ops *get_scpi_ops(void); struct scpi_ops *get_scpi_ops(void);
#else #else
static inline struct scpi_ops *get_scpi_ops(void) { return NULL; } static inline struct scpi_ops *get_scpi_ops(void) { return NULL; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment