]> Git Repo - linux.git/commitdiff
Merge tag 'omap-for-v4.16/dt-pt3-signed' of ssh://gitolite.kernel.org/pub/scm/linux...
authorArnd Bergmann <[email protected]>
Tue, 23 Jan 2018 09:19:46 +0000 (10:19 +0100)
committerArnd Bergmann <[email protected]>
Tue, 23 Jan 2018 09:19:46 +0000 (10:19 +0100)
Pull "dts fixes for omaps for v4.16 merge window" from Tony Lindgren:

Few omap dts fixes and n9 volume keys update for v4.16 merge window

For now, we need to rely on dts alias for n900 lcd and tvout order
to prevent occasional blank lcd. And we need to reduce the shut down
temperature for dra7 for non-cpu thermal cases.

And looks like we're missing the n9 volume key mappings and there is
active work going happening for n9 at least for postmarketos. So let's
make sure the keys can be actually used as they are the only buttons
on n9 in addition to the power key.

* tag 'omap-for-v4.16/dt-pt3-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Nokia N9: add support for up/down keys in the dts
  ARM: dts: dra7: Reduce shut down temperature of non-cpu thermal zones
  ARM: dts: n900: Add aliases for lcd and tvout displays

1  2 
arch/arm/boot/dts/dra7.dtsi

index 700080a948a312dd37c862d23c7a0ed89ce4e458,b4ef814c556cb32b19e1ef6bdf110174abd80bea..daa37a85dbf03229fb4674cadba7677306fcebe8
@@@ -7,11 -7,8 +7,11 @@@
   * Based on "omap4.dtsi"
   */
  
 +#include <dt-bindings/bus/ti-sysc.h>
 +#include <dt-bindings/clock/dra7.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  #include <dt-bindings/pinctrl/dra.h>
 +#include <dt-bindings/clock/dra7.h>
  
  #define MAX_SOURCES 400
  
                        };
  
                        cm_core_aon: cm_core_aon@5000 {
 -                              compatible = "ti,dra7-cm-core-aon";
 +                              compatible = "ti,dra7-cm-core-aon",
 +                                            "simple-bus";
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
                                reg = <0x5000 0x2000>;
 +                              ranges = <0 0x5000 0x2000>;
  
                                cm_core_aon_clocks: clocks {
                                        #address-cells = <1>;
                        };
  
                        cm_core: cm_core@8000 {
 -                              compatible = "ti,dra7-cm-core";
 +                              compatible = "ti,dra7-cm-core", "simple-bus";
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
                                reg = <0x8000 0x3000>;
 +                              ranges = <0 0x8000 0x3000>;
  
                                cm_core_clocks: clocks {
                                        #address-cells = <1>;
                        };
  
                        prm: prm@6000 {
 -                              compatible = "ti,dra7-prm";
 +                              compatible = "ti,dra7-prm", "simple-bus";
                                reg = <0x6000 0x3000>;
                                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              ranges = <0 0x6000 0x3000>;
  
                                prm_clocks: clocks {
                                        #address-cells = <1>;
                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "timer1";
                        ti,timer-alwon;
 +                      clock-names = "fck";
 +                      clocks = <&wkupaon_clkctrl DRA7_TIMER1_CLKCTRL 24>;
                };
  
                timer2: timer@48032000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        ti,hwmods = "qspi";
 -                      clocks = <&qspi_gfclk_div>;
 +                      clocks = <&l4per_clkctrl DRA7_QSPI_CLKCTRL 25>;
                        clock-names = "fck";
                        num-cs = <4>;
                        interrupts = <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>;
                                      <0x4A096800 0x40>; /* pll_ctrl */
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
                                syscon-phy-power = <&scm_conf 0x374>;
 -                              clocks = <&sys_clkin1>, <&sata_ref_clk>;
 +                              clocks = <&sys_clkin1>,
 +                                       <&l3init_clkctrl DRA7_SATA_CLKCTRL 8>;
                                clock-names = "sysclk", "refclk";
                                syscon-pllreset = <&scm_conf 0x3fc>;
                                #phy-cells = <0>;
                                syscon-pcs = <&scm_conf_pcie 0x10>;
                                clocks = <&dpll_pcie_ref_ck>,
                                         <&dpll_pcie_ref_m2ldo_ck>,
 -                                       <&optfclk_pciephy1_32khz>,
 -                                       <&optfclk_pciephy1_clk>,
 -                                       <&optfclk_pciephy1_div_clk>,
 +                                       <&l3init_clkctrl DRA7_PCIE1_CLKCTRL 8>,
 +                                       <&l3init_clkctrl DRA7_PCIE1_CLKCTRL 9>,
 +                                       <&l3init_clkctrl DRA7_PCIE1_CLKCTRL 10>,
                                         <&optfclk_pciephy_div>,
                                         <&sys_clkin1>;
                                clock-names = "dpll_ref", "dpll_ref_m2",
                                syscon-pcs = <&scm_conf_pcie 0x10>;
                                clocks = <&dpll_pcie_ref_ck>,
                                         <&dpll_pcie_ref_m2ldo_ck>,
 -                                       <&optfclk_pciephy2_32khz>,
 -                                       <&optfclk_pciephy2_clk>,
 -                                       <&optfclk_pciephy2_div_clk>,
 +                                       <&l3init_clkctrl DRA7_PCIE2_CLKCTRL 8>,
 +                                       <&l3init_clkctrl DRA7_PCIE2_CLKCTRL 9>,
 +                                       <&l3init_clkctrl DRA7_PCIE2_CLKCTRL 10>,
                                         <&optfclk_pciephy_div>,
                                         <&sys_clkin1>;
                                clock-names = "dpll_ref", "dpll_ref_m2",
                        interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&sata_phy>;
                        phy-names = "sata-phy";
 -                      clocks = <&sata_ref_clk>;
 +                      clocks = <&l3init_clkctrl DRA7_SATA_CLKCTRL 8>;
                        ti,hwmods = "sata";
                        ports-implemented = <0x1>;
                };
                                reg = <0x4a084000 0x400>;
                                syscon-phy-power = <&scm_conf 0x300>;
                                clocks = <&usb_phy1_always_on_clk32k>,
 -                                       <&usb_otg_ss1_refclk960m>;
 +                                       <&l3init_clkctrl DRA7_USB_OTG_SS1_CLKCTRL 8>;
                                clock-names =   "wkupclk",
                                                "refclk";
                                #phy-cells = <0>;
                                reg = <0x4a085000 0x400>;
                                syscon-phy-power = <&scm_conf 0xe74>;
                                clocks = <&usb_phy2_always_on_clk32k>,
 -                                       <&usb_otg_ss2_refclk960m>;
 +                                       <&l3init_clkctrl DRA7_USB_OTG_SS2_CLKCTRL 8>;
                                clock-names =   "wkupclk",
                                                "refclk";
                                #phy-cells = <0>;
                                syscon-phy-power = <&scm_conf 0x370>;
                                clocks = <&usb_phy3_always_on_clk32k>,
                                         <&sys_clkin1>,
 -                                       <&usb_otg_ss1_refclk960m>;
 +                                       <&l3init_clkctrl DRA7_USB_OTG_SS1_CLKCTRL 8>;
                                clock-names =   "wkupclk",
                                                "sysclk",
                                                "refclk";
                target-module@4a0dd000 {
                        compatible = "ti,sysc-omap4-sr";
                        ti,hwmods = "smartreflex_core";
 -                      reg = <0x4a0dd000 0x4>,
 -                            <0x4a0dd008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0dd038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_CORE_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0dd000 0x001000>;
                target-module@4a0d9000 {
                        compatible = "ti,sysc-omap4-sr";
                        ti,hwmods = "smartreflex_mpu";
 -                      reg = <0x4a0d9000 0x4>,
 -                            <0x4a0d9008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0d9038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_MPU_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0d9000 0x001000>;
                        ti,hwmods = "atl";
                        ti,provided-clocks = <&atl_clkin0_ck>, <&atl_clkin1_ck>,
                                             <&atl_clkin2_ck>, <&atl_clkin3_ck>;
 -                      clocks = <&atl_gfclk_mux>;
 +                      clocks = <&atl_clkctrl DRA7_ATL_CLKCTRL 26>;
                        clock-names = "fck";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 129 1>, <&edma_xbar 128 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp1_aux_gfclk_mux>, <&mcasp1_ahclkx_mux>,
 -                               <&mcasp1_ahclkr_mux>;
 +                      clocks = <&ipu_clkctrl DRA7_MCASP1_CLKCTRL 22>, <&ipu_clkctrl DRA7_MCASP1_CLKCTRL 24>,
 +                               <&ipu_clkctrl DRA7_MCASP1_CLKCTRL 28>;
                        clock-names = "fck", "ahclkx", "ahclkr";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 131 1>, <&edma_xbar 130 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp2_aux_gfclk_mux>, <&mcasp2_ahclkx_mux>,
 -                               <&mcasp2_ahclkr_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP2_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP2_CLKCTRL 24>,
 +                               <&l4per_clkctrl DRA7_MCASP2_CLKCTRL 28>;
                        clock-names = "fck", "ahclkx", "ahclkr";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 133 1>, <&edma_xbar 132 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp3_aux_gfclk_mux>, <&mcasp3_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 135 1>, <&edma_xbar 134 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp4_aux_gfclk_mux>, <&mcasp4_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP4_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP4_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 137 1>, <&edma_xbar 136 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp5_aux_gfclk_mux>, <&mcasp5_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP5_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP5_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 139 1>, <&edma_xbar 138 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp6_aux_gfclk_mux>, <&mcasp6_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP6_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP6_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 141 1>, <&edma_xbar 140 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp7_aux_gfclk_mux>, <&mcasp7_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP7_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP7_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                        interrupt-names = "tx", "rx";
                        dmas = <&edma_xbar 143 1>, <&edma_xbar 142 1>;
                        dma-names = "tx", "rx";
 -                      clocks = <&mcasp8_aux_gfclk_mux>, <&mcasp8_ahclkx_mux>;
 +                      clocks = <&l4per_clkctrl DRA7_MCASP8_CLKCTRL 22>,
 +                               <&l4per_clkctrl DRA7_MCASP8_CLKCTRL 24>;
                        clock-names = "fck", "ahclkx";
                        status = "disabled";
                };
                mac: ethernet@48484000 {
                        compatible = "ti,dra7-cpsw","ti,cpsw";
                        ti,hwmods = "gmac";
 -                      clocks = <&gmac_main_clk>, <&gmac_rft_clk_mux>;
 +                      clocks = <&gmac_main_clk>, <&l3init_clkctrl DRA7_GMAC_CLKCTRL 25>;
                        clock-names = "fck", "cpts";
                        cpdma_channels = <8>;
                        ale_entries = <1024>;
                        reg = <0x4ae3c000 0x2000>;
                        syscon-raminit = <&scm_conf 0x558 0>;
                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>;
 -                      clocks = <&dcan1_sys_clk_mux>;
 +                      clocks = <&wkupaon_clkctrl DRA7_DCAN1_CLKCTRL 24>;
                        status = "disabled";
                };
  
                                reg = <0x58001000 0x1000>;
                                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                                ti,hwmods = "dss_dispc";
 -                              clocks = <&dss_dss_clk>;
 +                              clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
                                clock-names = "fck";
                                /* CTRL_CORE_SMA_SW_1 */
                                syscon-pol = <&scm_conf 0x534>;
                                interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                                ti,hwmods = "dss_hdmi";
 -                              clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>;
 +                              clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
 +                                       <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>;
                                clock-names = "fck", "sys_clk";
                                dmas = <&sdma_xbar 76>;
                                dma-names = "audio_tx";
        temperature = <120000>; /* milli Celsius */
  };
  
 -
 -/include/ "dra7xx-clocks.dtsi"
 +#include "dra7xx-clocks.dtsi"
++
+ &core_crit {
+       temperature = <120000>; /* milli Celsius */
+ };
+ &gpu_crit {
+       temperature = <120000>; /* milli Celsius */
+ };
+ &dspeve_crit {
+       temperature = <120000>; /* milli Celsius */
+ };
+ &iva_crit {
+       temperature = <120000>; /* milli Celsius */
+ };
This page took 0.086933 seconds and 4 git commands to generate.