Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes, nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-03-12 21:29:30 -07:00
commit 1d34357931
582 changed files with 5361 additions and 2774 deletions

View File

@ -86,6 +86,8 @@ ForEachMacros:
- 'bio_for_each_segment_all' - 'bio_for_each_segment_all'
- 'bio_list_for_each' - 'bio_list_for_each'
- 'bip_for_each_vec' - 'bip_for_each_vec'
- 'bitmap_for_each_clear_region'
- 'bitmap_for_each_set_region'
- 'blkg_for_each_descendant_post' - 'blkg_for_each_descendant_post'
- 'blkg_for_each_descendant_pre' - 'blkg_for_each_descendant_pre'
- 'blk_queue_for_each_rl' - 'blk_queue_for_each_rl'
@ -115,6 +117,7 @@ ForEachMacros:
- 'drm_client_for_each_connector_iter' - 'drm_client_for_each_connector_iter'
- 'drm_client_for_each_modeset' - 'drm_client_for_each_modeset'
- 'drm_connector_for_each_possible_encoder' - 'drm_connector_for_each_possible_encoder'
- 'drm_for_each_bridge_in_chain'
- 'drm_for_each_connector_iter' - 'drm_for_each_connector_iter'
- 'drm_for_each_crtc' - 'drm_for_each_crtc'
- 'drm_for_each_encoder' - 'drm_for_each_encoder'
@ -136,9 +139,10 @@ ForEachMacros:
- 'for_each_bio' - 'for_each_bio'
- 'for_each_board_func_rsrc' - 'for_each_board_func_rsrc'
- 'for_each_bvec' - 'for_each_bvec'
- 'for_each_card_auxs'
- 'for_each_card_auxs_safe'
- 'for_each_card_components' - 'for_each_card_components'
- 'for_each_card_links' - 'for_each_card_pre_auxs'
- 'for_each_card_links_safe'
- 'for_each_card_prelinks' - 'for_each_card_prelinks'
- 'for_each_card_rtds' - 'for_each_card_rtds'
- 'for_each_card_rtds_safe' - 'for_each_card_rtds_safe'
@ -166,6 +170,7 @@ ForEachMacros:
- 'for_each_dpcm_fe' - 'for_each_dpcm_fe'
- 'for_each_drhd_unit' - 'for_each_drhd_unit'
- 'for_each_dss_dev' - 'for_each_dss_dev'
- 'for_each_efi_handle'
- 'for_each_efi_memory_desc' - 'for_each_efi_memory_desc'
- 'for_each_efi_memory_desc_in_map' - 'for_each_efi_memory_desc_in_map'
- 'for_each_element' - 'for_each_element'
@ -190,6 +195,7 @@ ForEachMacros:
- 'for_each_lru' - 'for_each_lru'
- 'for_each_matching_node' - 'for_each_matching_node'
- 'for_each_matching_node_and_match' - 'for_each_matching_node_and_match'
- 'for_each_member'
- 'for_each_memblock' - 'for_each_memblock'
- 'for_each_memblock_type' - 'for_each_memblock_type'
- 'for_each_memcg_cache_index' - 'for_each_memcg_cache_index'
@ -200,9 +206,11 @@ ForEachMacros:
- 'for_each_msi_entry' - 'for_each_msi_entry'
- 'for_each_msi_entry_safe' - 'for_each_msi_entry_safe'
- 'for_each_net' - 'for_each_net'
- 'for_each_net_continue_reverse'
- 'for_each_netdev' - 'for_each_netdev'
- 'for_each_netdev_continue' - 'for_each_netdev_continue'
- 'for_each_netdev_continue_rcu' - 'for_each_netdev_continue_rcu'
- 'for_each_netdev_continue_reverse'
- 'for_each_netdev_feature' - 'for_each_netdev_feature'
- 'for_each_netdev_in_bond_rcu' - 'for_each_netdev_in_bond_rcu'
- 'for_each_netdev_rcu' - 'for_each_netdev_rcu'
@ -254,10 +262,10 @@ ForEachMacros:
- 'for_each_reserved_mem_region' - 'for_each_reserved_mem_region'
- 'for_each_rtd_codec_dai' - 'for_each_rtd_codec_dai'
- 'for_each_rtd_codec_dai_rollback' - 'for_each_rtd_codec_dai_rollback'
- 'for_each_rtdcom' - 'for_each_rtd_components'
- 'for_each_rtdcom_safe'
- 'for_each_set_bit' - 'for_each_set_bit'
- 'for_each_set_bit_from' - 'for_each_set_bit_from'
- 'for_each_set_clump8'
- 'for_each_sg' - 'for_each_sg'
- 'for_each_sg_dma_page' - 'for_each_sg_dma_page'
- 'for_each_sg_page' - 'for_each_sg_page'
@ -267,6 +275,7 @@ ForEachMacros:
- 'for_each_subelement_id' - 'for_each_subelement_id'
- '__for_each_thread' - '__for_each_thread'
- 'for_each_thread' - 'for_each_thread'
- 'for_each_wakeup_source'
- 'for_each_zone' - 'for_each_zone'
- 'for_each_zone_zonelist' - 'for_each_zone_zonelist'
- 'for_each_zone_zonelist_nodemask' - 'for_each_zone_zonelist_nodemask'
@ -330,6 +339,7 @@ ForEachMacros:
- 'list_for_each' - 'list_for_each'
- 'list_for_each_codec' - 'list_for_each_codec'
- 'list_for_each_codec_safe' - 'list_for_each_codec_safe'
- 'list_for_each_continue'
- 'list_for_each_entry' - 'list_for_each_entry'
- 'list_for_each_entry_continue' - 'list_for_each_entry_continue'
- 'list_for_each_entry_continue_rcu' - 'list_for_each_entry_continue_rcu'
@ -351,6 +361,7 @@ ForEachMacros:
- 'llist_for_each_entry' - 'llist_for_each_entry'
- 'llist_for_each_entry_safe' - 'llist_for_each_entry_safe'
- 'llist_for_each_safe' - 'llist_for_each_safe'
- 'mci_for_each_dimm'
- 'media_device_for_each_entity' - 'media_device_for_each_entity'
- 'media_device_for_each_intf' - 'media_device_for_each_intf'
- 'media_device_for_each_link' - 'media_device_for_each_link'
@ -444,10 +455,16 @@ ForEachMacros:
- 'virtio_device_for_each_vq' - 'virtio_device_for_each_vq'
- 'xa_for_each' - 'xa_for_each'
- 'xa_for_each_marked' - 'xa_for_each_marked'
- 'xa_for_each_range'
- 'xa_for_each_start' - 'xa_for_each_start'
- 'xas_for_each' - 'xas_for_each'
- 'xas_for_each_conflict' - 'xas_for_each_conflict'
- 'xas_for_each_marked' - 'xas_for_each_marked'
- 'xbc_array_for_each_value'
- 'xbc_for_each_key_value'
- 'xbc_node_for_each_array_value'
- 'xbc_node_for_each_child'
- 'xbc_node_for_each_key_value'
- 'zorro_for_each_dev' - 'zorro_for_each_dev'
#IncludeBlocks: Preserve # Unknown to clang-format-5.0 #IncludeBlocks: Preserve # Unknown to clang-format-5.0

4
.gitignore vendored
View File

@ -100,10 +100,6 @@ modules.order
/include/ksym/ /include/ksym/
/arch/*/include/generated/ /arch/*/include/generated/
# Generated lkdtm tests
/tools/testing/selftests/lkdtm/*.sh
!/tools/testing/selftests/lkdtm/run.sh
# stgit generated dirs # stgit generated dirs
patches-* patches-*

View File

@ -18,7 +18,7 @@ may look as follows::
$ ls -l /sys/bus/acpi/devices/INT3404:00/ $ ls -l /sys/bus/acpi/devices/INT3404:00/
total 0 total 0
... ...
-r--r--r-- 1 root root 4096 Dec 13 20:38 state0 -r--r--r-- 1 root root 4096 Dec 13 20:38 state0
-r--r--r-- 1 root root 4096 Dec 13 20:38 state1 -r--r--r-- 1 root root 4096 Dec 13 20:38 state1
-r--r--r-- 1 root root 4096 Dec 13 20:38 state10 -r--r--r-- 1 root root 4096 Dec 13 20:38 state10
@ -38,7 +38,7 @@ where each of the "state*" files represents one performance state of the fan
and contains a colon-separated list of 5 integer numbers (fields) with the and contains a colon-separated list of 5 integer numbers (fields) with the
following interpretation:: following interpretation::
control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw
* ``control_percent``: The percent value to be used to set the fan speed to a * ``control_percent``: The percent value to be used to set the fan speed to a
specific level using the _FSL object (0-100). specific level using the _FSL object (0-100).

View File

@ -136,6 +136,10 @@
dynamic table installation which will install SSDT dynamic table installation which will install SSDT
tables to /sys/firmware/acpi/tables/dynamic. tables to /sys/firmware/acpi/tables/dynamic.
acpi_no_watchdog [HW,ACPI,WDT]
Ignore the ACPI-based watchdog interface (WDAT) and let
a native driver control the watchdog device instead.
acpi_rsdp= [ACPI,EFI,KEXEC] acpi_rsdp= [ACPI,EFI,KEXEC]
Pass the RSDP address to the kernel, mostly used Pass the RSDP address to the kernel, mostly used
on machines running EFI runtime service to boot the on machines running EFI runtime service to boot the

View File

@ -102,7 +102,7 @@ Required sub-node properties:
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
[2] Documentation/devicetree/bindings/power/power-domain.yaml [2] Documentation/devicetree/bindings/power/power-domain.yaml
[3] Documentation/devicetree/bindings/thermal/thermal.txt [3] Documentation/devicetree/bindings/thermal/thermal.txt
[4] Documentation/devicetree/bindings/sram/sram.txt [4] Documentation/devicetree/bindings/sram/sram.yaml
[5] Documentation/devicetree/bindings/reset/reset.txt [5] Documentation/devicetree/bindings/reset/reset.txt
Example: Example:

View File

@ -109,7 +109,7 @@ Required properties:
[0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html [0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
[2] Documentation/devicetree/bindings/thermal/thermal.txt [2] Documentation/devicetree/bindings/thermal/thermal.txt
[3] Documentation/devicetree/bindings/sram/sram.txt [3] Documentation/devicetree/bindings/sram/sram.yaml
[4] Documentation/devicetree/bindings/power/power-domain.yaml [4] Documentation/devicetree/bindings/power/power-domain.yaml
Example: Example:

View File

@ -62,7 +62,7 @@ Timer node:
Syscon reboot node: Syscon reboot node:
See Documentation/devicetree/bindings/power/reset/syscon-reboot.txt for the See Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml for the
detailed list of properties, the two values defined below are specific to the detailed list of properties, the two values defined below are specific to the
BCM6328-style timer: BCM6328-style timer:

View File

@ -216,7 +216,7 @@ properties:
$ref: '/schemas/types.yaml#/definitions/phandle-array' $ref: '/schemas/types.yaml#/definitions/phandle-array'
description: | description: |
List of phandles to idle state nodes supported List of phandles to idle state nodes supported
by this cpu (see ./idle-states.txt). by this cpu (see ./idle-states.yaml).
capacity-dmips-mhz: capacity-dmips-mhz:
$ref: '/schemas/types.yaml#/definitions/uint32' $ref: '/schemas/types.yaml#/definitions/uint32'

View File

@ -160,7 +160,7 @@ properties:
items: items:
- enum: - enum:
- armadeus,imx6dl-apf6 # APF6 (Solo) SoM - armadeus,imx6dl-apf6 # APF6 (Solo) SoM
- armadeus,imx6dl-apf6dldev # APF6 (Solo) SoM on APF6Dev board - armadeus,imx6dl-apf6dev # APF6 (Solo) SoM on APF6Dev board
- eckelmann,imx6dl-ci4x10 - eckelmann,imx6dl-ci4x10
- emtrion,emcon-mx6 # emCON-MX6S or emCON-MX6DL SoM - emtrion,emcon-mx6 # emCON-MX6S or emCON-MX6DL SoM
- emtrion,emcon-mx6-avari # emCON-MX6S or emCON-MX6DL SoM on Avari Base - emtrion,emcon-mx6-avari # emCON-MX6S or emCON-MX6DL SoM on Avari Base

View File

@ -1,7 +1,7 @@
* Hisilicon Hi3519 System Controller Block * Hisilicon Hi3519 System Controller Block
This bindings use the following binding: This bindings use the following binding:
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
Required properties: Required properties:
- compatible: "hisilicon,hi3519-sysctrl". - compatible: "hisilicon,hi3519-sysctrl".

View File

@ -81,4 +81,4 @@ Example:
}; };
}; };
[1]. Documentation/devicetree/bindings/arm/idle-states.txt [1]. Documentation/devicetree/bindings/arm/idle-states.yaml

View File

@ -17,7 +17,7 @@ am335x and am437x only:
- pm-sram: Phandles to ocmcram nodes to be used for power management. - pm-sram: Phandles to ocmcram nodes to be used for power management.
First should be type 'protect-exec' for the driver to use to copy First should be type 'protect-exec' for the driver to use to copy
and run PM functions, second should be regular pool to be used for and run PM functions, second should be regular pool to be used for
data region for code. See Documentation/devicetree/bindings/sram/sram.txt data region for code. See Documentation/devicetree/bindings/sram/sram.yaml
for more details. for more details.
Examples: Examples:

View File

@ -100,13 +100,14 @@ properties:
bindings in [1]) must specify this property. bindings in [1]) must specify this property.
[1] Kernel documentation - ARM idle states bindings [1] Kernel documentation - ARM idle states bindings
Documentation/devicetree/bindings/arm/idle-states.txt Documentation/devicetree/bindings/arm/idle-states.yaml
"#power-domain-cells":
description:
The number of cells in a PM domain specifier as per binding in [3].
Must be 0 as to represent a single PM domain.
patternProperties:
"^power-domain-":
allOf:
- $ref: "../power/power-domain.yaml#"
type: object
description: |
ARM systems can have multiple cores, sometimes in an hierarchical ARM systems can have multiple cores, sometimes in an hierarchical
arrangement. This often, but not always, maps directly to the processor arrangement. This often, but not always, maps directly to the processor
power topology of the system. Individual nodes in a topology have their power topology of the system. Individual nodes in a topology have their
@ -122,14 +123,8 @@ properties:
helps to implement support for OSI mode and OS implementations may choose helps to implement support for OSI mode and OS implementations may choose
to mandate it. to mandate it.
[3] Documentation/devicetree/bindings/power/power_domain.txt [3] Documentation/devicetree/bindings/power/power-domain.yaml
[4] Documentation/devicetree/bindings/power/domain-idle-state.txt [4] Documentation/devicetree/bindings/power/domain-idle-state.yaml
power-domains:
$ref: '/schemas/types.yaml#/definitions/phandle-array'
description:
List of phandles and PM domain specifiers, as defined by bindings of the
PM domain provider.
required: required:
- compatible - compatible
@ -199,7 +194,7 @@ examples:
CPU0: cpu@0 { CPU0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "arm,cortex-a53";
reg = <0x0>; reg = <0x0>;
enable-method = "psci"; enable-method = "psci";
power-domains = <&CPU_PD0>; power-domains = <&CPU_PD0>;
@ -208,7 +203,7 @@ examples:
CPU1: cpu@1 { CPU1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a57", "arm,armv8"; compatible = "arm,cortex-a53";
reg = <0x100>; reg = <0x100>;
enable-method = "psci"; enable-method = "psci";
power-domains = <&CPU_PD1>; power-domains = <&CPU_PD1>;
@ -224,6 +219,9 @@ examples:
exit-latency-us = <10>; exit-latency-us = <10>;
min-residency-us = <100>; min-residency-us = <100>;
}; };
};
domain-idle-states {
CLUSTER_RET: cluster-retention { CLUSTER_RET: cluster-retention {
compatible = "domain-idle-state"; compatible = "domain-idle-state";
@ -247,19 +245,19 @@ examples:
compatible = "arm,psci-1.0"; compatible = "arm,psci-1.0";
method = "smc"; method = "smc";
CPU_PD0: cpu-pd0 { CPU_PD0: power-domain-cpu0 {
#power-domain-cells = <0>; #power-domain-cells = <0>;
domain-idle-states = <&CPU_PWRDN>; domain-idle-states = <&CPU_PWRDN>;
power-domains = <&CLUSTER_PD>; power-domains = <&CLUSTER_PD>;
}; };
CPU_PD1: cpu-pd1 { CPU_PD1: power-domain-cpu1 {
#power-domain-cells = <0>; #power-domain-cells = <0>;
domain-idle-states = <&CPU_PWRDN>; domain-idle-states = <&CPU_PWRDN>;
power-domains = <&CLUSTER_PD>; power-domains = <&CLUSTER_PD>;
}; };
CLUSTER_PD: cluster-pd { CLUSTER_PD: power-domain-cluster {
#power-domain-cells = <0>; #power-domain-cells = <0>;
domain-idle-states = <&CLUSTER_RET>, <&CLUSTER_PWRDN>; domain-idle-states = <&CLUSTER_RET>, <&CLUSTER_PWRDN>;
}; };

View File

@ -52,7 +52,7 @@ required:
examples: examples:
- | - |
mlahb: ahb { mlahb: ahb@38000000 {
compatible = "st,mlahb", "simple-bus"; compatible = "st,mlahb", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -70,7 +70,6 @@ examples:
#size-cells = <0>; #size-cells = <0>;
pmic@3e3 { pmic@3e3 {
compatible = "...";
reg = <0x3e3>; reg = <0x3e3>;
/* ... */ /* ... */

View File

@ -40,7 +40,7 @@ additionalProperties: false
examples: examples:
- | - |
osc24M: clk@01c20050 { osc24M: clk@1c20050 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-a10-osc-clk"; compatible = "allwinner,sun4i-a10-osc-clk";
reg = <0x01c20050 0x4>; reg = <0x01c20050 0x4>;

View File

@ -41,7 +41,7 @@ additionalProperties: false
examples: examples:
- | - |
clk@0600005c { clk@600005c {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun9i-a80-gt-clk"; compatible = "allwinner,sun9i-a80-gt-clk";
reg = <0x0600005c 0x4>; reg = <0x0600005c 0x4>;

View File

@ -42,7 +42,7 @@ properties:
be part of GCC and hence the TSENS properties can also be part be part of GCC and hence the TSENS properties can also be part
of the GCC/clock-controller node. of the GCC/clock-controller node.
For more details on the TSENS properties please refer For more details on the TSENS properties please refer
Documentation/devicetree/bindings/thermal/qcom-tsens.txt Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
nvmem-cell-names: nvmem-cell-names:
minItems: 1 minItems: 1

View File

@ -49,11 +49,7 @@ examples:
resets = <&tcon_ch0_clk 0>; resets = <&tcon_ch0_clk 0>;
port { port {
#address-cells = <1>; tve0_in_tcon0: endpoint {
#size-cells = <0>;
tve0_in_tcon0: endpoint@0 {
reg = <0>;
remote-endpoint = <&tcon0_out_tve0>; remote-endpoint = <&tcon0_out_tve0>;
}; };
}; };

View File

@ -79,21 +79,15 @@ examples:
#size-cells = <0>; #size-cells = <0>;
anx6345_in: port@0 { anx6345_in: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; reg = <0>;
anx6345_in_tcon0: endpoint@0 { anx6345_in_tcon0: endpoint {
reg = <0>;
remote-endpoint = <&tcon0_out_anx6345>; remote-endpoint = <&tcon0_out_anx6345>;
}; };
}; };
anx6345_out: port@1 { anx6345_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>; reg = <1>;
anx6345_out_panel: endpoint@0 { anx6345_out_panel: endpoint {
reg = <0>;
remote-endpoint = <&panel_in_edp>; remote-endpoint = <&panel_in_edp>;
}; };
}; };

View File

@ -37,6 +37,8 @@ examples:
dsi@ff450000 { dsi@ff450000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0xff450000 0x1000>;
panel@0 { panel@0 {
compatible = "leadtek,ltk500hd1829"; compatible = "leadtek,ltk500hd1829";
reg = <0>; reg = <0>;

View File

@ -37,6 +37,8 @@ examples:
dsi@ff450000 { dsi@ff450000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0xff450000 0x1000>;
panel@0 { panel@0 {
compatible = "xinpeng,xpp055c272"; compatible = "xinpeng,xpp055c272";
reg = <0>; reg = <0>;

View File

@ -174,10 +174,6 @@ examples:
}; };
}; };
soc@1c00000 { lcdc0: lcdc { };
lcdc0: lcdc@1c0c000 {
compatible = "allwinner,sun4i-a10-lcdc";
};
};
... ...

View File

@ -37,7 +37,7 @@ Optional nodes:
supports a single port with a single endpoint. supports a single port with a single endpoint.
- See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and
Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt for connecting
tfp410 DVI encoder or lcd panel to lcdc tfp410 DVI encoder or lcd panel to lcdc
[1] There is an errata about AM335x color wiring. For 16-bit color mode [1] There is an errata about AM335x color wiring. For 16-bit color mode

View File

@ -143,7 +143,7 @@ examples:
#size-cells = <2>; #size-cells = <2>;
dma-coherent; dma-coherent;
dma-ranges; dma-ranges;
ranges; ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0x05000000>;
ti,sci-dev-id = <118>; ti,sci-dev-id = <118>;
@ -169,16 +169,4 @@ examples:
ti,sci-rm-range-rflow = <0x6>; /* GP RFLOW */ ti,sci-rm-range-rflow = <0x6>; /* GP RFLOW */
}; };
}; };
mcasp0: mcasp@02B00000 {
dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;
dma-names = "tx", "rx";
};
crypto: crypto@4E00000 {
compatible = "ti,sa2ul-crypto";
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, <&main_udmap 0x4001>;
dma-names = "tx", "rx1", "rx2";
};
}; };

View File

@ -84,31 +84,31 @@ examples:
gpu_opp_table: opp_table0 { gpu_opp_table: opp_table0 {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp@533000000 { opp-533000000 {
opp-hz = /bits/ 64 <533000000>; opp-hz = /bits/ 64 <533000000>;
opp-microvolt = <1250000>; opp-microvolt = <1250000>;
}; };
opp@450000000 { opp-450000000 {
opp-hz = /bits/ 64 <450000000>; opp-hz = /bits/ 64 <450000000>;
opp-microvolt = <1150000>; opp-microvolt = <1150000>;
}; };
opp@400000000 { opp-400000000 {
opp-hz = /bits/ 64 <400000000>; opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <1125000>; opp-microvolt = <1125000>;
}; };
opp@350000000 { opp-350000000 {
opp-hz = /bits/ 64 <350000000>; opp-hz = /bits/ 64 <350000000>;
opp-microvolt = <1075000>; opp-microvolt = <1075000>;
}; };
opp@266000000 { opp-266000000 {
opp-hz = /bits/ 64 <266000000>; opp-hz = /bits/ 64 <266000000>;
opp-microvolt = <1025000>; opp-microvolt = <1025000>;
}; };
opp@160000000 { opp-160000000 {
opp-hz = /bits/ 64 <160000000>; opp-hz = /bits/ 64 <160000000>;
opp-microvolt = <925000>; opp-microvolt = <925000>;
}; };
opp@100000000 { opp-100000000 {
opp-hz = /bits/ 64 <100000000>; opp-hz = /bits/ 64 <100000000>;
opp-microvolt = <912500>; opp-microvolt = <912500>;
}; };

View File

@ -138,31 +138,31 @@ examples:
gpu_opp_table: opp_table0 { gpu_opp_table: opp_table0 {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp@533000000 { opp-533000000 {
opp-hz = /bits/ 64 <533000000>; opp-hz = /bits/ 64 <533000000>;
opp-microvolt = <1250000>; opp-microvolt = <1250000>;
}; };
opp@450000000 { opp-450000000 {
opp-hz = /bits/ 64 <450000000>; opp-hz = /bits/ 64 <450000000>;
opp-microvolt = <1150000>; opp-microvolt = <1150000>;
}; };
opp@400000000 { opp-400000000 {
opp-hz = /bits/ 64 <400000000>; opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <1125000>; opp-microvolt = <1125000>;
}; };
opp@350000000 { opp-350000000 {
opp-hz = /bits/ 64 <350000000>; opp-hz = /bits/ 64 <350000000>;
opp-microvolt = <1075000>; opp-microvolt = <1075000>;
}; };
opp@266000000 { opp-266000000 {
opp-hz = /bits/ 64 <266000000>; opp-hz = /bits/ 64 <266000000>;
opp-microvolt = <1025000>; opp-microvolt = <1025000>;
}; };
opp@160000000 { opp-160000000 {
opp-hz = /bits/ 64 <160000000>; opp-hz = /bits/ 64 <160000000>;
opp-microvolt = <925000>; opp-microvolt = <925000>;
}; };
opp@100000000 { opp-100000000 {
opp-hz = /bits/ 64 <100000000>; opp-hz = /bits/ 64 <100000000>;
opp-microvolt = <912500>; opp-microvolt = <912500>;
}; };

View File

@ -123,7 +123,7 @@ examples:
samsung,syscon-phandle = <&pmu_system_controller>; samsung,syscon-phandle = <&pmu_system_controller>;
/* NTC thermistor is a hwmon device */ /* NTC thermistor is a hwmon device */
ncp15wb473@0 { ncp15wb473 {
compatible = "murata,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;

View File

@ -62,7 +62,7 @@ required:
examples: examples:
- | - |
i2c@00000000 { i2c {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
gt928@5d { gt928@5d {

View File

@ -1,7 +1,7 @@
Texas Instruments TWL family (twl4030) pwrbutton module Texas Instruments TWL family (twl4030) pwrbutton module
This module is part of the TWL4030. For more details about the whole This module is part of the TWL4030. For more details about the whole
chip see Documentation/devicetree/bindings/mfd/twl-familly.txt. chip see Documentation/devicetree/bindings/mfd/twl-family.txt.
This module provides a simple power button event via an Interrupt. This module provides a simple power button event via an Interrupt.

View File

@ -85,7 +85,7 @@ properties:
# LED will act as a back-light, controlled by the framebuffer system # LED will act as a back-light, controlled by the framebuffer system
- backlight - backlight
# LED will turn on (but for leds-gpio see "default-state" property in # LED will turn on (but for leds-gpio see "default-state" property in
# Documentation/devicetree/bindings/leds/leds-gpio.txt) # Documentation/devicetree/bindings/leds/leds-gpio.yaml)
- default-on - default-on
# LED "double" flashes at a load average based rate # LED "double" flashes at a load average based rate
- heartbeat - heartbeat

View File

@ -5,7 +5,7 @@ where single bits in a certain register can turn on/off a
single LED. The register bit LEDs appear as children to the single LED. The register bit LEDs appear as children to the
syscon device, with the proper compatible string. For the syscon device, with the proper compatible string. For the
syscon bindings see: syscon bindings see:
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
Each LED is represented as a sub-node of the syscon device. Each Each LED is represented as a sub-node of the syscon device. Each
node's name represents the name of the corresponding LED. node's name represents the name of the corresponding LED.

View File

@ -177,7 +177,7 @@ examples:
}; };
}; };
i2c5: i2c@4807c000 { i2c {
clock-frequency = <400000>; clock-frequency = <400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

View File

@ -32,7 +32,7 @@ Required only for "ti,emif-am3352" and "ti,emif-am4372":
- sram : Phandles for generic sram driver nodes, - sram : Phandles for generic sram driver nodes,
first should be type 'protect-exec' for the driver to use to copy first should be type 'protect-exec' for the driver to use to copy
and run PM functions, second should be regular pool to be used for and run PM functions, second should be regular pool to be used for
data region for code. See Documentation/devicetree/bindings/sram/sram.txt data region for code. See Documentation/devicetree/bindings/sram/sram.yaml
for more details. for more details.
Optional properties: Optional properties:

View File

@ -97,14 +97,14 @@ examples:
regulators { regulators {
compatible = "maxim,max77650-regulator"; compatible = "maxim,max77650-regulator";
max77650_ldo: regulator@0 { max77650_ldo: regulator-ldo {
regulator-compatible = "ldo"; regulator-compatible = "ldo";
regulator-name = "max77650-ldo"; regulator-name = "max77650-ldo";
regulator-min-microvolt = <1350000>; regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <2937500>; regulator-max-microvolt = <2937500>;
}; };
max77650_sbb0: regulator@1 { max77650_sbb0: regulator-sbb0 {
regulator-compatible = "sbb0"; regulator-compatible = "sbb0";
regulator-name = "max77650-sbb0"; regulator-name = "max77650-sbb0";
regulator-min-microvolt = <800000>; regulator-min-microvolt = <800000>;

View File

@ -26,8 +26,8 @@ Required properties:
ldo6, ldo7, ldo8 ldo6, ldo7, ldo8
- xxx-supply: Input voltage supply regulator. - xxx-supply: Input voltage supply regulator.
These entries are require if regulators are enabled for a device. Missing of these These entries are required if regulators are enabled for a device. Missing these
properties can cause the regulator registration fails. properties can cause the regulator registration to fail.
If some of input supply is powered through battery or always-on supply then If some of input supply is powered through battery or always-on supply then
also it is require to have these parameters with proper node handle of always also it is require to have these parameters with proper node handle of always
on power supply. on power supply.

View File

@ -20,7 +20,7 @@ RAVE SP consists of the following sub-devices:
Device Description Device Description
------ ----------- ------ -----------
rave-sp-wdt : Watchdog rave-sp-wdt : Watchdog
rave-sp-nvmem : Interface to onborad EEPROM rave-sp-nvmem : Interface to onboard EEPROM
rave-sp-backlight : Display backlight rave-sp-backlight : Display backlight
rave-sp-hwmon : Interface to onboard hardware sensors rave-sp-hwmon : Interface to onboard hardware sensors
rave-sp-leds : Interface to onboard LEDs rave-sp-leds : Interface to onboard LEDs

View File

@ -26,7 +26,7 @@ For generic IOMMU bindings, see
Documentation/devicetree/bindings/iommu/iommu.txt. Documentation/devicetree/bindings/iommu/iommu.txt.
For arm-smmu binding, see: For arm-smmu binding, see:
Documentation/devicetree/bindings/iommu/arm,smmu.txt. Documentation/devicetree/bindings/iommu/arm,smmu.yaml.
Required properties: Required properties:

View File

@ -370,6 +370,7 @@ examples:
mmc3: mmc@1c12000 { mmc3: mmc@1c12000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x1c12000 0x200>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vmmc3>; vmmc-supply = <&reg_vmmc3>;

View File

@ -27,7 +27,7 @@ Required properties of NAND chips:
- reg: shall contain the native Chip Select ids from 0 to max supported by - reg: shall contain the native Chip Select ids from 0 to max supported by
the cadence nand flash controller the cadence nand flash controller
See Documentation/devicetree/bindings/mtd/nand.txt for more details on See Documentation/devicetree/bindings/mtd/nand-controller.yaml for more details on
generic bindings. generic bindings.
Example: Example:

View File

@ -45,7 +45,7 @@ Optional properties:
switch queue switch queue
- resets: a single phandle and reset identifier pair. See - resets: a single phandle and reset identifier pair. See
Documentation/devicetree/binding/reset/reset.txt for details. Documentation/devicetree/bindings/reset/reset.txt for details.
- reset-names: If the "reset" property is specified, this property should have - reset-names: If the "reset" property is specified, this property should have
the value "switch" to denote the switch reset line. the value "switch" to denote the switch reset line.

View File

@ -110,6 +110,13 @@ PROPERTIES
Usage: required Usage: required
Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt
- fsl,erratum-a050385
Usage: optional
Value type: boolean
Definition: A boolean property. Indicates the presence of the
erratum A050385 which indicates that DMA transactions that are
split can result in a FMan lock.
============================================================================= =============================================================================
FMan MURAM Node FMan MURAM Node

View File

@ -76,6 +76,8 @@ examples:
qfprom: eeprom@700000 { qfprom: eeprom@700000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x00700000 0x100000>;
wp-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
/* ... */ /* ... */

View File

@ -86,7 +86,7 @@ examples:
#include <dt-bindings/clock/sun4i-a10-ccu.h> #include <dt-bindings/clock/sun4i-a10-ccu.h>
#include <dt-bindings/reset/sun4i-a10-ccu.h> #include <dt-bindings/reset/sun4i-a10-ccu.h>
usbphy: phy@01c13400 { usbphy: phy@1c13400 {
#phy-cells = <1>; #phy-cells = <1>;
compatible = "allwinner,sun4i-a10-usb-phy"; compatible = "allwinner,sun4i-a10-usb-phy";
reg = <0x01c13400 0x10>, <0x01c14800 0x4>, <0x01c1c800 0x4>; reg = <0x01c13400 0x10>, <0x01c14800 0x4>, <0x01c1c800 0x4>;

View File

@ -17,7 +17,7 @@ description: |+
"aspeed,ast2400-scu", "syscon", "simple-mfd" "aspeed,ast2400-scu", "syscon", "simple-mfd"
Refer to the the bindings described in Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
properties: properties:
compatible: compatible:

View File

@ -18,7 +18,7 @@ description: |+
"aspeed,g5-scu", "syscon", "simple-mfd" "aspeed,g5-scu", "syscon", "simple-mfd"
Refer to the the bindings described in Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
properties: properties:
compatible: compatible:

View File

@ -17,7 +17,7 @@ description: |+
"aspeed,ast2600-scu", "syscon", "simple-mfd" "aspeed,ast2600-scu", "syscon", "simple-mfd"
Refer to the the bindings described in Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
properties: properties:
compatible: compatible:

View File

@ -248,7 +248,7 @@ examples:
}; };
//Example 3 pin groups //Example 3 pin groups
pinctrl@60020000 { pinctrl {
usart1_pins_a: usart1-0 { usart1_pins_a: usart1-0 {
pins1 { pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; pinmux = <STM32_PINMUX('A', 9, AF7)>;

View File

@ -18,7 +18,7 @@ description: |+
"amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon" "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon"
Refer to the the bindings described in Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
properties: properties:
compatible: compatible:

View File

@ -1,33 +0,0 @@
PM Domain Idle State Node:
A domain idle state node represents the state parameters that will be used to
select the state when there are no active components in the domain.
The state node has the following parameters -
- compatible:
Usage: Required
Value type: <string>
Definition: Must be "domain-idle-state".
- entry-latency-us
Usage: Required
Value type: <prop-encoded-array>
Definition: u32 value representing worst case latency in
microseconds required to enter the idle state.
The exit-latency-us duration may be guaranteed
only after entry-latency-us has passed.
- exit-latency-us
Usage: Required
Value type: <prop-encoded-array>
Definition: u32 value representing worst case latency
in microseconds required to exit the idle state.
- min-residency-us
Usage: Required
Value type: <prop-encoded-array>
Definition: u32 value representing minimum residency duration
in microseconds after which the idle state will yield
power benefits after overcoming the overhead in entering
i the idle state.

View File

@ -0,0 +1,64 @@
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/power/domain-idle-state.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: PM Domain Idle States binding description
maintainers:
- Ulf Hansson <ulf.hansson@linaro.org>
description:
A domain idle state node represents the state parameters that will be used to
select the state when there are no active components in the PM domain.
properties:
$nodename:
const: domain-idle-states
patternProperties:
"^(cpu|cluster|domain)-":
type: object
description:
Each state node represents a domain idle state description.
properties:
compatible:
const: domain-idle-state
entry-latency-us:
description:
The worst case latency in microseconds required to enter the idle
state. Note that, the exit-latency-us duration may be guaranteed only
after the entry-latency-us has passed.
exit-latency-us:
description:
The worst case latency in microseconds required to exit the idle
state.
min-residency-us:
description:
The minimum residency duration in microseconds after which the idle
state will yield power benefits, after overcoming the overhead while
entering the idle state.
required:
- compatible
- entry-latency-us
- exit-latency-us
- min-residency-us
examples:
- |
domain-idle-states {
domain_retention: domain-retention {
compatible = "domain-idle-state";
entry-latency-us = <20>;
exit-latency-us = <40>;
min-residency-us = <80>;
};
};
...

View File

@ -25,22 +25,20 @@ description: |+
properties: properties:
$nodename: $nodename:
pattern: "^(power-controller|power-domain)(@.*)?$" pattern: "^(power-controller|power-domain)([@-].*)?$"
domain-idle-states: domain-idle-states:
$ref: /schemas/types.yaml#/definitions/phandle-array $ref: /schemas/types.yaml#/definitions/phandle-array
description: description: |
A phandle of an idle-state that shall be soaked into a generic domain Phandles of idle states that defines the available states for the
power state. The idle state definitions are compatible with power-domain provider. The idle state definitions are compatible with the
domain-idle-state specified in domain-idle-state bindings, specified in ./domain-idle-state.yaml.
Documentation/devicetree/bindings/power/domain-idle-state.txt
phandles that are not compatible with domain-idle-state will be ignored. Note that, the domain-idle-state property reflects the idle states of this
The domain-idle-state property reflects the idle state of this PM domain PM domain and not the idle states of the devices or sub-domains in the PM
and not the idle states of the devices or sub-domains in the PM domain. domain. Devices and sub-domains have their own idle states independent of
Devices and sub-domains have their own idle-states independent the parent domain's idle states. In the absence of this property, the
of the parent domain's idle states. In the absence of this property, domain would be considered as capable of being powered-on or powered-off.
the domain would be considered as capable of being powered-on
or powered-off.
operating-points-v2: operating-points-v2:
$ref: /schemas/types.yaml#/definitions/phandle-array $ref: /schemas/types.yaml#/definitions/phandle-array

View File

@ -109,4 +109,4 @@ Example:
required-opps = <&domain1_opp_1>; required-opps = <&domain1_opp_1>;
}; };
[1]. Documentation/devicetree/bindings/power/domain-idle-state.txt [1]. Documentation/devicetree/bindings/power/domain-idle-state.yaml

View File

@ -161,7 +161,7 @@ The regulator node houses sub-nodes for each regulator within the device. Each
sub-node is identified using the node's name, with valid values listed for each sub-node is identified using the node's name, with valid values listed for each
of the PMICs below. of the PMICs below.
pm8005: pm8004:
s2, s5 s2, s5
pm8005: pm8005:

View File

@ -191,7 +191,7 @@ patternProperties:
examples: examples:
- | - |
xyzreg: regulator@0 { xyzreg: regulator {
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <2500000>; regulator-max-microvolt = <2500000>;
regulator-always-on; regulator-always-on;

View File

@ -23,7 +23,11 @@ properties:
description: Global reset register offset and bit offset. description: Global reset register offset and bit offset.
allOf: allOf:
- $ref: /schemas/types.yaml#/definitions/uint32-array - $ref: /schemas/types.yaml#/definitions/uint32-array
- maxItems: 2 items:
- description: Register offset
- description: Register bit offset
minimum: 0
maximum: 31
"#reset-cells": "#reset-cells":
minimum: 2 minimum: 2

View File

@ -3,4 +3,4 @@ STMicroelectronics STM32MP1 Peripheral Reset Controller
The RCC IP is both a reset and a clock controller. The RCC IP is both a reset and a clock controller.
Please see Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt Please see Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml

View File

@ -36,7 +36,7 @@ SAI subnodes required properties:
- clock-names: Must contain "sai_ck". - clock-names: Must contain "sai_ck".
Must also contain "MCLK", if SAI shares a master clock, Must also contain "MCLK", if SAI shares a master clock,
with a SAI set as MCLK clock provider. with a SAI set as MCLK clock provider.
- dmas: see Documentation/devicetree/bindings/dma/stm32-dma.txt - dmas: see Documentation/devicetree/bindings/dma/st,stm32-dma.yaml
- dma-names: identifier string for each DMA request line - dma-names: identifier string for each DMA request line
"tx": if sai sub-block is configured as playback DAI "tx": if sai sub-block is configured as playback DAI
"rx": if sai sub-block is configured as capture DAI "rx": if sai sub-block is configured as capture DAI

View File

@ -10,7 +10,7 @@ Required properties:
- clock-names: must contain "kclk" - clock-names: must contain "kclk"
- interrupts: cpu DAI interrupt line - interrupts: cpu DAI interrupt line
- dmas: DMA specifiers for audio data DMA and iec control flow DMA - dmas: DMA specifiers for audio data DMA and iec control flow DMA
See STM32 DMA bindings, Documentation/devicetree/bindings/dma/stm32-dma.txt See STM32 DMA bindings, Documentation/devicetree/bindings/dma/st,stm32-dma.yaml
- dma-names: two dmas have to be defined, "rx" and "rx-ctrl" - dma-names: two dmas have to be defined, "rx" and "rx-ctrl"
Optional properties: Optional properties:

View File

@ -49,7 +49,7 @@ properties:
dmas: dmas:
description: | description: |
DMA specifiers for tx and rx dma. DMA fifo mode must be used. See DMA specifiers for tx and rx dma. DMA fifo mode must be used. See
the STM32 DMA bindings Documentation/devicetree/bindings/dma/stm32-dma.txt. the STM32 DMA bindings Documentation/devicetree/bindings/dma/st,stm32-dma.yaml.
items: items:
- description: rx DMA channel - description: rx DMA channel
- description: tx DMA channel - description: tx DMA channel

View File

@ -125,7 +125,7 @@ examples:
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
sram_a: sram@00000000 { sram_a: sram@0 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00000000 0xc000>; reg = <0x00000000 0xc000>;
#address-cells = <1>; #address-cells = <1>;

View File

@ -17,7 +17,7 @@ description: |+
"brcm,bcm2711-avs-monitor", "syscon", "simple-mfd" "brcm,bcm2711-avs-monitor", "syscon", "simple-mfd"
Refer to the the bindings described in Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt Documentation/devicetree/bindings/mfd/syscon.yaml
properties: properties:
compatible: compatible:

View File

@ -87,7 +87,7 @@ additionalProperties: false
examples: examples:
- | - |
timer { timer@1c20c00 {
compatible = "allwinner,sun4i-a10-timer"; compatible = "allwinner,sun4i-a10-timer";
reg = <0x01c20c00 0x400>; reg = <0x01c20c00 0x400>;
interrupts = <22>, interrupts = <22>,

View File

@ -151,8 +151,8 @@ The details of these operations are:
Note that callbacks will always be invoked from the DMA Note that callbacks will always be invoked from the DMA
engines tasklet, never from interrupt context. engines tasklet, never from interrupt context.
Optional: per descriptor metadata **Optional: per descriptor metadata**
---------------------------------
DMAengine provides two ways for metadata support. DMAengine provides two ways for metadata support.
DESC_METADATA_CLIENT DESC_METADATA_CLIENT
@ -199,12 +199,15 @@ Optional: per descriptor metadata
DESC_METADATA_CLIENT DESC_METADATA_CLIENT
- DMA_MEM_TO_DEV / DEV_MEM_TO_MEM: - DMA_MEM_TO_DEV / DEV_MEM_TO_MEM:
1. prepare the descriptor (dmaengine_prep_*) 1. prepare the descriptor (dmaengine_prep_*)
construct the metadata in the client's buffer construct the metadata in the client's buffer
2. use dmaengine_desc_attach_metadata() to attach the buffer to the 2. use dmaengine_desc_attach_metadata() to attach the buffer to the
descriptor descriptor
3. submit the transfer 3. submit the transfer
- DMA_DEV_TO_MEM: - DMA_DEV_TO_MEM:
1. prepare the descriptor (dmaengine_prep_*) 1. prepare the descriptor (dmaengine_prep_*)
2. use dmaengine_desc_attach_metadata() to attach the buffer to the 2. use dmaengine_desc_attach_metadata() to attach the buffer to the
descriptor descriptor
@ -215,6 +218,7 @@ Optional: per descriptor metadata
DESC_METADATA_ENGINE DESC_METADATA_ENGINE
- DMA_MEM_TO_DEV / DEV_MEM_TO_MEM: - DMA_MEM_TO_DEV / DEV_MEM_TO_MEM:
1. prepare the descriptor (dmaengine_prep_*) 1. prepare the descriptor (dmaengine_prep_*)
2. use dmaengine_desc_get_metadata_ptr() to get the pointer to the 2. use dmaengine_desc_get_metadata_ptr() to get the pointer to the
engine's metadata area engine's metadata area
@ -222,7 +226,9 @@ Optional: per descriptor metadata
4. use dmaengine_desc_set_metadata_len() to tell the DMA engine the 4. use dmaengine_desc_set_metadata_len() to tell the DMA engine the
amount of data the client has placed into the metadata buffer amount of data the client has placed into the metadata buffer
5. submit the transfer 5. submit the transfer
- DMA_DEV_TO_MEM: - DMA_DEV_TO_MEM:
1. prepare the descriptor (dmaengine_prep_*) 1. prepare the descriptor (dmaengine_prep_*)
2. submit the transfer 2. submit the transfer
3. on transfer completion, use dmaengine_desc_get_metadata_ptr() to get 3. on transfer completion, use dmaengine_desc_get_metadata_ptr() to get
@ -278,8 +284,8 @@ Optional: per descriptor metadata
void dma_async_issue_pending(struct dma_chan *chan); void dma_async_issue_pending(struct dma_chan *chan);
Further APIs: Further APIs
------------- ------------
1. Terminate APIs 1. Terminate APIs

View File

@ -164,9 +164,9 @@ file.
void __iomem *base; void __iomem *base;
}; };
struct dentry *debugfs_create_regset32(const char *name, umode_t mode, debugfs_create_regset32(const char *name, umode_t mode,
struct dentry *parent, struct dentry *parent,
struct debugfs_regset32 *regset); struct debugfs_regset32 *regset);
void debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs, void debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs,
int nregs, void __iomem *base, char *prefix); int nregs, void __iomem *base, char *prefix);

View File

@ -850,3 +850,11 @@ business doing so.
d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are
very suspect (and won't work in modules). Such uses are very likely to very suspect (and won't work in modules). Such uses are very likely to
be misspelled d_alloc_anon(). be misspelled d_alloc_anon().
---
**mandatory**
[should've been added in 2016] stale comment in finish_open() nonwithstanding,
failure exits in ->atomic_open() instances should *NOT* fput() the file,
no matter what. Everything is handled by the caller.

View File

@ -20,8 +20,7 @@ Usage Notes
----------- -----------
This driver does not auto-detect devices. You will have to instantiate the This driver does not auto-detect devices. You will have to instantiate the
devices explicitly. Please see Documentation/i2c/instantiating-devices for devices explicitly. Please see :doc:`/i2c/instantiating-devices` for details.
details.
Sysfs entries Sysfs entries

View File

@ -40,9 +40,6 @@ example usage
# Delete a snapshot using: # Delete a snapshot using:
$ devlink region del pci/0000:00:05.0/cr-space snapshot 1 $ devlink region del pci/0000:00:05.0/cr-space snapshot 1
# Trigger (request) a snapshot be taken:
$ devlink region trigger pci/0000:00:05.0/cr-space
# Dump a snapshot: # Dump a snapshot:
$ devlink region dump pci/0000:00:05.0/fw-health snapshot 1 $ devlink region dump pci/0000:00:05.0/fw-health snapshot 1
0000000000000000 0014 95dc 0014 9514 0035 1670 0034 db30 0000000000000000 0014 95dc 0014 9514 0035 1670 0034 db30

View File

@ -8,9 +8,9 @@ Overview
======== ========
The net_failover driver provides an automated failover mechanism via APIs The net_failover driver provides an automated failover mechanism via APIs
to create and destroy a failover master netdev and mananges a primary and to create and destroy a failover master netdev and manages a primary and
standby slave netdevs that get registered via the generic failover standby slave netdevs that get registered via the generic failover
infrastructrure. infrastructure.
The failover netdev acts a master device and controls 2 slave devices. The The failover netdev acts a master device and controls 2 slave devices. The
original paravirtual interface is registered as 'standby' slave netdev and original paravirtual interface is registered as 'standby' slave netdev and
@ -29,7 +29,7 @@ virtio-net accelerated datapath: STANDBY mode
============================================= =============================================
net_failover enables hypervisor controlled accelerated datapath to virtio-net net_failover enables hypervisor controlled accelerated datapath to virtio-net
enabled VMs in a transparent manner with no/minimal guest userspace chanages. enabled VMs in a transparent manner with no/minimal guest userspace changes.
To support this, the hypervisor needs to enable VIRTIO_NET_F_STANDBY To support this, the hypervisor needs to enable VIRTIO_NET_F_STANDBY
feature on the virtio-net interface and assign the same MAC address to both feature on the virtio-net interface and assign the same MAC address to both

View File

@ -159,7 +159,7 @@ Socket Interface
set SO_RDS_TRANSPORT on a socket for which the transport has set SO_RDS_TRANSPORT on a socket for which the transport has
been previously attached explicitly (by SO_RDS_TRANSPORT) or been previously attached explicitly (by SO_RDS_TRANSPORT) or
implicitly (via bind(2)) will return an error of EOPNOTSUPP. implicitly (via bind(2)) will return an error of EOPNOTSUPP.
An attempt to set SO_RDS_TRANSPPORT to RDS_TRANS_NONE will An attempt to set SO_RDS_TRANSPORT to RDS_TRANS_NONE will
always return EINVAL. always return EINVAL.
RDMA for RDS RDMA for RDS

View File

@ -13,7 +13,6 @@ Power Management
drivers-testing drivers-testing
energy-model energy-model
freezing-of-tasks freezing-of-tasks
interface
opp opp
pci pci
pm_qos_interface pm_qos_interface

View File

@ -693,7 +693,7 @@ ALLWINNER CPUFREQ DRIVER
M: Yangtao Li <tiny.windzz@gmail.com> M: Yangtao Li <tiny.windzz@gmail.com>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt F: Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
F: drivers/cpufreq/sun50i-cpufreq-nvmem.c F: drivers/cpufreq/sun50i-cpufreq-nvmem.c
ALLWINNER CRYPTO DRIVERS ALLWINNER CRYPTO DRIVERS
@ -4017,7 +4017,7 @@ M: Cheng-Yi Chiang <cychiang@chromium.org>
S: Maintained S: Maintained
R: Enric Balletbo i Serra <enric.balletbo@collabora.com> R: Enric Balletbo i Serra <enric.balletbo@collabora.com>
R: Guenter Roeck <groeck@chromium.org> R: Guenter Roeck <groeck@chromium.org>
F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
F: sound/soc/codecs/cros_ec_codec.* F: sound/soc/codecs/cros_ec_codec.*
CIRRUS LOGIC AUDIO CODEC DRIVERS CIRRUS LOGIC AUDIO CODEC DRIVERS
@ -4073,7 +4073,6 @@ F: drivers/scsi/snic/
CISCO VIC ETHERNET NIC DRIVER CISCO VIC ETHERNET NIC DRIVER
M: Christian Benvenuti <benve@cisco.com> M: Christian Benvenuti <benve@cisco.com>
M: Govindarajulu Varadarajan <_govind@gmx.com> M: Govindarajulu Varadarajan <_govind@gmx.com>
M: Parvi Kaustubhi <pkaustub@cisco.com>
S: Supported S: Supported
F: drivers/net/ethernet/cisco/enic/ F: drivers/net/ethernet/cisco/enic/
@ -4475,7 +4474,7 @@ L: linux-media@vger.kernel.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
S: Maintained S: Maintained
F: drivers/media/platform/sunxi/sun6i-csi/ F: drivers/media/platform/sunxi/sun6i-csi/
F: Documentation/devicetree/bindings/media/sun6i-csi.txt F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
CW1200 WLAN driver CW1200 WLAN driver
M: Solomon Peachy <pizza@shaftnet.org> M: Solomon Peachy <pizza@shaftnet.org>
@ -4572,7 +4571,7 @@ F: drivers/infiniband/hw/cxgb4/
F: include/uapi/rdma/cxgb4-abi.h F: include/uapi/rdma/cxgb4-abi.h
CXGB4VF ETHERNET DRIVER (CXGB4VF) CXGB4VF ETHERNET DRIVER (CXGB4VF)
M: Casey Leedom <leedom@chelsio.com> M: Vishal Kulkarni <vishal@gmail.com>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
W: http://www.chelsio.com W: http://www.chelsio.com
S: Supported S: Supported
@ -5668,7 +5667,7 @@ L: dri-devel@lists.freedesktop.org
T: git git://anongit.freedesktop.org/drm/drm-misc T: git git://anongit.freedesktop.org/drm/drm-misc
S: Maintained S: Maintained
F: drivers/gpu/drm/stm F: drivers/gpu/drm/stm
F: Documentation/devicetree/bindings/display/st,stm32-ltdc.txt F: Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
DRM DRIVERS FOR TI LCDC DRM DRIVERS FOR TI LCDC
M: Jyri Sarha <jsarha@ti.com> M: Jyri Sarha <jsarha@ti.com>
@ -6198,7 +6197,6 @@ S: Supported
F: drivers/scsi/be2iscsi/ F: drivers/scsi/be2iscsi/
Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net) Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
M: Sathya Perla <sathya.perla@broadcom.com>
M: Ajit Khaparde <ajit.khaparde@broadcom.com> M: Ajit Khaparde <ajit.khaparde@broadcom.com>
M: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com> M: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
M: Somnath Kotur <somnath.kotur@broadcom.com> M: Somnath Kotur <somnath.kotur@broadcom.com>
@ -7738,7 +7736,7 @@ Hyper-V CORE AND DRIVERS
M: "K. Y. Srinivasan" <kys@microsoft.com> M: "K. Y. Srinivasan" <kys@microsoft.com>
M: Haiyang Zhang <haiyangz@microsoft.com> M: Haiyang Zhang <haiyangz@microsoft.com>
M: Stephen Hemminger <sthemmin@microsoft.com> M: Stephen Hemminger <sthemmin@microsoft.com>
M: Sasha Levin <sashal@kernel.org> M: Wei Liu <wei.liu@kernel.org>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
L: linux-hyperv@vger.kernel.org L: linux-hyperv@vger.kernel.org
S: Supported S: Supported
@ -10164,7 +10162,7 @@ MAXBOTIX ULTRASONIC RANGER IIO DRIVER
M: Andreas Klinger <ak@it-klinger.de> M: Andreas Klinger <ak@it-klinger.de>
L: linux-iio@vger.kernel.org L: linux-iio@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt F: Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
F: drivers/iio/proximity/mb1232.c F: drivers/iio/proximity/mb1232.c
MAXIM MAX77650 PMIC MFD DRIVER MAXIM MAX77650 PMIC MFD DRIVER
@ -10467,7 +10465,7 @@ M: Hugues Fruchet <hugues.fruchet@st.com>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
S: Supported S: Supported
F: Documentation/devicetree/bindings/media/st,stm32-dcmi.txt F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
F: drivers/media/platform/stm32/stm32-dcmi.c F: drivers/media/platform/stm32/stm32-dcmi.c
MEDIA DRIVERS FOR NVIDIA TEGRA - VDE MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@ -11119,7 +11117,7 @@ M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
L: linux-mips@vger.kernel.org L: linux-mips@vger.kernel.org
W: http://www.linux-mips.org/ W: http://www.linux-mips.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
Q: http://patchwork.linux-mips.org/project/linux-mips/list/ Q: https://patchwork.kernel.org/project/linux-mips/list/
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/mips/ F: Documentation/devicetree/bindings/mips/
F: Documentation/mips/ F: Documentation/mips/
@ -12739,7 +12737,7 @@ M: Tom Joseph <tjoseph@cadence.com>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/pci/cdns,*.txt F: Documentation/devicetree/bindings/pci/cdns,*.txt
F: drivers/pci/controller/pcie-cadence* F: drivers/pci/controller/cadence/
PCI DRIVER FOR FREESCALE LAYERSCAPE PCI DRIVER FOR FREESCALE LAYERSCAPE
M: Minghuan Lian <minghuan.Lian@nxp.com> M: Minghuan Lian <minghuan.Lian@nxp.com>
@ -12952,7 +12950,6 @@ M: Robert Richter <rrichter@marvell.com>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported S: Supported
F: Documentation/devicetree/bindings/pci/pci-thunder-*
F: drivers/pci/controller/pci-thunder-* F: drivers/pci/controller/pci-thunder-*
PCIE DRIVER FOR HISILICON PCIE DRIVER FOR HISILICON
@ -14233,7 +14230,7 @@ F: include/dt-bindings/reset/
F: include/linux/reset.h F: include/linux/reset.h
F: include/linux/reset/ F: include/linux/reset/
F: include/linux/reset-controller.h F: include/linux/reset-controller.h
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
RESTARTABLE SEQUENCES SUPPORT RESTARTABLE SEQUENCES SUPPORT
M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@ -15928,7 +15925,7 @@ F: drivers/*/stm32-*timer*
F: drivers/pwm/pwm-stm32* F: drivers/pwm/pwm-stm32*
F: include/linux/*/stm32-*tim* F: include/linux/*/stm32-*tim*
F: Documentation/ABI/testing/*timer-stm32 F: Documentation/ABI/testing/*timer-stm32
F: Documentation/devicetree/bindings/*/stm32-*timer* F: Documentation/devicetree/bindings/*/*stm32-*timer*
F: Documentation/devicetree/bindings/pwm/pwm-stm32* F: Documentation/devicetree/bindings/pwm/pwm-stm32*
STMMAC ETHERNET DRIVER STMMAC ETHERNET DRIVER
@ -16087,6 +16084,8 @@ SYNOPSYS DESIGNWARE 8250 UART DRIVER
R: Andy Shevchenko <andriy.shevchenko@linux.intel.com> R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
S: Maintained S: Maintained
F: drivers/tty/serial/8250/8250_dw.c F: drivers/tty/serial/8250/8250_dw.c
F: drivers/tty/serial/8250/8250_dwlib.*
F: drivers/tty/serial/8250/8250_lpss.c
SYNOPSYS DESIGNWARE APB GPIO DRIVER SYNOPSYS DESIGNWARE APB GPIO DRIVER
M: Hoan Tran <hoan@os.amperecomputing.com> M: Hoan Tran <hoan@os.amperecomputing.com>

View File

@ -2,7 +2,7 @@
VERSION = 5 VERSION = 5
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc3 EXTRAVERSION = -rc5
NAME = Kleptomaniac Octopus NAME = Kleptomaniac Octopus
# *DOCUMENTATION* # *DOCUMENTATION*

View File

@ -738,8 +738,9 @@ config HAVE_STACK_VALIDATION
config HAVE_RELIABLE_STACKTRACE config HAVE_RELIABLE_STACKTRACE
bool bool
help help
Architecture has a save_stack_trace_tsk_reliable() function which Architecture has either save_stack_trace_tsk_reliable() or
only returns a stack trace if it can guarantee the trace is reliable. arch_stack_walk_reliable() function which only returns a stack trace
if it can guarantee the trace is reliable.
config HAVE_ARCH_HASH config HAVE_ARCH_HASH
bool bool

View File

@ -526,11 +526,11 @@
* Supply voltage supervisor on board will not allow opp50 so * Supply voltage supervisor on board will not allow opp50 so
* disable it and set opp100 as suspend OPP. * disable it and set opp100 as suspend OPP.
*/ */
opp50@300000000 { opp50-300000000 {
status = "disabled"; status = "disabled";
}; };
opp100@600000000 { opp100-600000000 {
opp-suspend; opp-suspend;
}; };
}; };

View File

@ -21,6 +21,7 @@
aliases { aliases {
ethernet0 = &genet; ethernet0 = &genet;
pcie0 = &pcie0;
}; };
leds { leds {
@ -31,6 +32,8 @@
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
}; };
}; };

View File

@ -26,6 +26,8 @@
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
}; };
}; };
}; };

View File

@ -27,6 +27,8 @@
pwr { pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep";
linux,default-trigger = "default-on";
}; };
}; };

View File

@ -61,10 +61,10 @@
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
}; };
evm_3v3: fixedregulator-evm3v3 { vsys_3v3: fixedregulator-vsys3v3 {
/* Output of Cntlr A of TPS43351-Q1 on dra7-evm */ /* Output of Cntlr A of TPS43351-Q1 on dra7-evm */
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "evm_3v3"; regulator-name = "vsys_3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
vin-supply = <&evm_12v0>; vin-supply = <&evm_12v0>;

View File

@ -3474,6 +3474,7 @@
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER13_CLKCTRL 24>; clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER13_CLKCTRL 24>;
clock-names = "fck"; clock-names = "fck";
interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm;
}; };
}; };
@ -3501,6 +3502,7 @@
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER14_CLKCTRL 24>; clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER14_CLKCTRL 24>;
clock-names = "fck"; clock-names = "fck";
interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm;
}; };
}; };
@ -3528,6 +3530,7 @@
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>; clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>;
clock-names = "fck"; clock-names = "fck";
interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm;
}; };
}; };
@ -3555,6 +3558,7 @@
clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>; clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>;
clock-names = "fck"; clock-names = "fck";
interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
ti,timer-pwm;
}; };
}; };

View File

@ -184,6 +184,7 @@
device_type = "pci"; device_type = "pci";
ranges = <0x81000000 0 0 0x03000 0 0x00010000 ranges = <0x81000000 0 0 0x03000 0 0x00010000
0x82000000 0 0x20013000 0x13000 0 0xffed000>; 0x82000000 0 0x20013000 0x13000 0 0xffed000>;
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
num-lanes = <1>; num-lanes = <1>;
@ -238,6 +239,7 @@
device_type = "pci"; device_type = "pci";
ranges = <0x81000000 0 0 0x03000 0 0x00010000 ranges = <0x81000000 0 0 0x03000 0 0x00010000
0x82000000 0 0x30013000 0x13000 0 0xffed000>; 0x82000000 0 0x30013000 0x13000 0 0xffed000>;
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
num-lanes = <1>; num-lanes = <1>;

View File

@ -128,3 +128,8 @@
&usb4_tm { &usb4_tm {
status = "disabled"; status = "disabled";
}; };
&mmc3 {
/* dra76x is not affected by i887 */
max-frequency = <96000000>;
};

View File

@ -796,16 +796,6 @@
clock-div = <1>; clock-div = <1>;
}; };
ipu1_gfclk_mux: ipu1_gfclk_mux@520 {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>;
ti,bit-shift = <24>;
reg = <0x0520>;
assigned-clocks = <&ipu1_gfclk_mux>;
assigned-clock-parents = <&dpll_core_h22x2_ck>;
};
dummy_ck: dummy_ck { dummy_ck: dummy_ck {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
@ -1564,6 +1554,8 @@
compatible = "ti,clkctrl"; compatible = "ti,clkctrl";
reg = <0x20 0x4>; reg = <0x20 0x4>;
#clock-cells = <2>; #clock-cells = <2>;
assigned-clocks = <&ipu1_clkctrl DRA7_IPU1_MMU_IPU1_CLKCTRL 24>;
assigned-clock-parents = <&dpll_core_h22x2_ck>;
}; };
ipu_clkctrl: ipu-clkctrl@50 { ipu_clkctrl: ipu-clkctrl@50 {

View File

@ -275,7 +275,7 @@
/* SRAM on Colibri nEXT_CS0 */ /* SRAM on Colibri nEXT_CS0 */
sram@0,0 { sram@0,0 {
compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
reg = <0 0 0x00010000>; reg = <0 0 0x00010000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -286,7 +286,7 @@
/* SRAM on Colibri nEXT_CS1 */ /* SRAM on Colibri nEXT_CS1 */
sram@1,0 { sram@1,0 {
compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
reg = <1 0 0x00010000>; reg = <1 0 0x00010000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -192,7 +192,6 @@
pinctrl-0 = <&pinctrl_usdhc4>; pinctrl-0 = <&pinctrl_usdhc4>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
vmmc-supply = <&vdd_emmc_1p8>;
status = "disabled"; status = "disabled";
}; };

View File

@ -336,7 +336,6 @@
assigned-clock-rates = <400000000>; assigned-clock-rates = <400000000>;
bus-width = <8>; bus-width = <8>;
fsl,tuning-step = <2>; fsl,tuning-step = <2>;
max-frequency = <100000000>;
vmmc-supply = <&reg_module_3v3>; vmmc-supply = <&reg_module_3v3>;
vqmmc-supply = <&reg_DCDC3>; vqmmc-supply = <&reg_DCDC3>;
non-removable; non-removable;

View File

@ -44,7 +44,7 @@
opp-hz = /bits/ 64 <792000000>; opp-hz = /bits/ 64 <792000000>;
opp-microvolt = <1000000>; opp-microvolt = <1000000>;
clock-latency-ns = <150000>; clock-latency-ns = <150000>;
opp-supported-hw = <0xd>, <0xf>; opp-supported-hw = <0xd>, <0x7>;
opp-suspend; opp-suspend;
}; };
@ -52,7 +52,7 @@
opp-hz = /bits/ 64 <996000000>; opp-hz = /bits/ 64 <996000000>;
opp-microvolt = <1100000>; opp-microvolt = <1100000>;
clock-latency-ns = <150000>; clock-latency-ns = <150000>;
opp-supported-hw = <0xc>, <0xf>; opp-supported-hw = <0xc>, <0x7>;
opp-suspend; opp-suspend;
}; };
@ -60,7 +60,7 @@
opp-hz = /bits/ 64 <1200000000>; opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <1225000>; opp-microvolt = <1225000>;
clock-latency-ns = <150000>; clock-latency-ns = <150000>;
opp-supported-hw = <0x8>, <0xf>; opp-supported-hw = <0x8>, <0x3>;
opp-suspend; opp-suspend;
}; };
}; };

View File

@ -747,7 +747,7 @@
}; };
mdio0: mdio@2d24000 { mdio0: mdio@2d24000 {
compatible = "fsl,etsec2-mdio"; compatible = "gianfar";
device_type = "mdio"; device_type = "mdio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -756,7 +756,7 @@
}; };
mdio1: mdio@2d64000 { mdio1: mdio@2d64000 {
compatible = "fsl,etsec2-mdio"; compatible = "gianfar";
device_type = "mdio"; device_type = "mdio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

View File

@ -182,6 +182,14 @@
pwm-names = "enable", "direction"; pwm-names = "enable", "direction";
direction-duty-cycle-ns = <10000000>; direction-duty-cycle-ns = <10000000>;
}; };
backlight: backlight {
compatible = "led-backlight";
leds = <&backlight_led>;
brightness-levels = <31 63 95 127 159 191 223 255>;
default-brightness-level = <6>;
};
}; };
&dss { &dss {
@ -205,6 +213,8 @@
vddi-supply = <&lcd_regulator>; vddi-supply = <&lcd_regulator>;
reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */ reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
backlight = <&backlight>;
width-mm = <50>; width-mm = <50>;
height-mm = <89>; height-mm = <89>;
@ -393,12 +403,11 @@
ramp-up-us = <1024>; ramp-up-us = <1024>;
ramp-down-us = <8193>; ramp-down-us = <8193>;
led@0 { backlight_led: led@0 {
reg = <0>; reg = <0>;
led-sources = <2>; led-sources = <2>;
ti,led-mode = <0>; ti,led-mode = <0>;
label = ":backlight"; label = ":backlight";
linux,default-trigger = "backlight";
}; };
led@1 { led@1 {

View File

@ -377,7 +377,7 @@
}; };
sata: sata@fc600000 { sata: sata@fc600000 {
compatible = "renesas,sata-r8a7779", "renesas,rcar-sata"; compatible = "renesas,sata-r8a7779";
reg = <0xfc600000 0x200000>; reg = <0xfc600000 0x200000>;
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7779_CLK_SATA>; clocks = <&mstp1_clks R8A7779_CLK_SATA>;

View File

@ -178,6 +178,7 @@ CONFIG_SCHED_TRACER=y
CONFIG_STACK_TRACER=y CONFIG_STACK_TRACER=y
CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_PROFILER=y
CONFIG_TEST_KSTRTOX=y CONFIG_TEST_KSTRTOX=y
CONFIG_DEBUG_FS=y
CONFIG_KGDB=y CONFIG_KGDB=y
CONFIG_KGDB_KDB=y CONFIG_KGDB_KDB=y
CONFIG_STRICT_DEVMEM=y CONFIG_STRICT_DEVMEM=y

View File

@ -375,6 +375,7 @@ CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_PWM=m
CONFIG_BACKLIGHT_PANDORA=m CONFIG_BACKLIGHT_PANDORA=m
CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_GPIO=m
CONFIG_BACKLIGHT_LED=m
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_LOGO=y CONFIG_LOGO=y

View File

@ -157,6 +157,7 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_DETECT_HUNG_TASK=y CONFIG_DETECT_HUNG_TASK=y
# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHED_DEBUG is not set
CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_TRACER=y

View File

@ -392,9 +392,6 @@ static inline void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) {}
static inline void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) {} static inline void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) {}
static inline void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) {} static inline void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) {}
static inline void kvm_arm_vhe_guest_enter(void) {}
static inline void kvm_arm_vhe_guest_exit(void) {}
#define KVM_BP_HARDEN_UNKNOWN -1 #define KVM_BP_HARDEN_UNKNOWN -1
#define KVM_BP_HARDEN_WA_NEEDED 0 #define KVM_BP_HARDEN_WA_NEEDED 0
#define KVM_BP_HARDEN_NOT_REQUIRED 1 #define KVM_BP_HARDEN_NOT_REQUIRED 1

View File

@ -91,6 +91,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
endif endif
AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SOC_IMX6) += resume-imx6.o
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
obj-$(CONFIG_SOC_IMX1) += mach-imx1.o obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

View File

@ -109,17 +109,17 @@ void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu); int imx_cpu_kill(unsigned int cpu);
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
void v7_cpu_resume(void);
void imx53_suspend(void __iomem *ocram_vbase); void imx53_suspend(void __iomem *ocram_vbase);
extern const u32 imx53_suspend_sz; extern const u32 imx53_suspend_sz;
void imx6_suspend(void __iomem *ocram_vbase); void imx6_suspend(void __iomem *ocram_vbase);
#else #else
static inline void v7_cpu_resume(void) {}
static inline void imx53_suspend(void __iomem *ocram_vbase) {} static inline void imx53_suspend(void __iomem *ocram_vbase) {}
static const u32 imx53_suspend_sz; static const u32 imx53_suspend_sz;
static inline void imx6_suspend(void __iomem *ocram_vbase) {} static inline void imx6_suspend(void __iomem *ocram_vbase) {}
#endif #endif
void v7_cpu_resume(void);
void imx6_pm_ccm_init(const char *ccm_compat); void imx6_pm_ccm_init(const char *ccm_compat);
void imx6q_pm_init(void); void imx6q_pm_init(void);
void imx6dl_pm_init(void); void imx6dl_pm_init(void);

View File

@ -0,0 +1,24 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
#include <asm/hardware/cache-l2x0.h>
#include "hardware.h"
/*
* The following code must assume it is running from physical address
* where absolute virtual addresses to the data section have to be
* turned into relative ones.
*/
ENTRY(v7_cpu_resume)
bl v7_invalidate_l1
#ifdef CONFIG_CACHE_L2X0
bl l2c310_early_resume
#endif
b cpu_resume
ENDPROC(v7_cpu_resume)

View File

@ -327,17 +327,3 @@ resume:
ret lr ret lr
ENDPROC(imx6_suspend) ENDPROC(imx6_suspend)
/*
* The following code must assume it is running from physical address
* where absolute virtual addresses to the data section have to be
* turned into relative ones.
*/
ENTRY(v7_cpu_resume)
bl v7_invalidate_l1
#ifdef CONFIG_CACHE_L2X0
bl l2c310_early_resume
#endif
b cpu_resume
ENDPROC(v7_cpu_resume)

View File

@ -9,7 +9,6 @@ menuconfig ARCH_MESON
select CACHE_L2X0 select CACHE_L2X0
select PINCTRL select PINCTRL
select PINCTRL_MESON select PINCTRL_MESON
select COMMON_CLK
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP

Some files were not shown because too many files have changed in this diff Show More