Message ID | 20220928-mdm9615-dt-schema-fixes-v1-7-b6e63a7df1e8@linaro.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | arm: qcom: mdm9615: first round of bindings and DT fixes | expand |
On 28/09/2022 11:14, Neil Armstrong wrote: > Since amba node type has been deprecated, remove this subnode and How device node can be deprecated? simple-bus is still supported, isn't it? > move the mmc nodes in the main soc node. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> While reshuffling maybe move properties to match common style: 1. compatible 2. reg 3. ... 4. status (last) > Best regards, Krzysztof
On 28/09/2022 20:05, Krzysztof Kozlowski wrote: > On 28/09/2022 11:14, Neil Armstrong wrote: >> Since amba node type has been deprecated, remove this subnode and > > How device node can be deprecated? simple-bus is still supported, isn't it? The amba subnode remained after the amba compatible was changed to simple-bus, there's no need for such subnode anymore. > > >> move the mmc nodes in the main soc node. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > > While reshuffling maybe move properties to match common style: > 1. compatible > 2. reg > 3. ... > 4. status (last) Ack, will do. > >> > Best regards, > Krzysztof > Thanks, Neil
On 29/09/2022 10:19, Neil Armstrong wrote: > On 28/09/2022 20:05, Krzysztof Kozlowski wrote: > > On 28/09/2022 11:14, Neil Armstrong wrote: > >> Since amba node type has been deprecated, remove this subnode and > > > > How device node can be deprecated? simple-bus is still supported, isn't it? > The amba subnode remained after the amba compatible was changed to simple-bus, there's no need for such subnode anymore. OK, but it is quite different than a node type being deprecated. Best regards, Krzysztof
On 29/09/2022 11:05, Krzysztof Kozlowski wrote: > On 29/09/2022 10:19, Neil Armstrong wrote: >> On 28/09/2022 20:05, Krzysztof Kozlowski wrote: >> > On 28/09/2022 11:14, Neil Armstrong wrote: >> >> Since amba node type has been deprecated, remove this subnode and >> > >> > How device node can be deprecated? simple-bus is still supported, isn't it? >> The amba subnode remained after the amba compatible was changed to simple-bus, there's no need for such subnode anymore. > > OK, but it is quite different than a node type being deprecated. Well it's still related, it's because of the deprecation we have a now useless subnode, anyway will re-word for v2. > > Best regards, > Krzysztof > Thanks, Neil
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi index d8723bd3fedb..1db822db7702 100644 --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi @@ -314,49 +314,43 @@ sdcc2bam: dma-controller@12142000{ qcom,ee = <0>; }; - amba { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - sdcc1: mmc@12180000 { - status = "disabled"; - compatible = "arm,pl18x", "arm,primecell"; - arm,primecell-periphid = <0x00051180>; - reg = <0x12180000 0x2000>; - interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>; - clock-names = "mclk", "apb_pclk"; - bus-width = <8>; - max-frequency = <48000000>; - cap-sd-highspeed; - cap-mmc-highspeed; - vmmc-supply = <&vsdcc_fixed>; - dmas = <&sdcc1bam 2>, <&sdcc1bam 1>; - dma-names = "tx", "rx"; - assigned-clocks = <&gcc SDC1_CLK>; - assigned-clock-rates = <400000>; - }; + sdcc1: mmc@12180000 { + status = "disabled"; + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; + reg = <0x12180000 0x2000>; + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>; + clock-names = "mclk", "apb_pclk"; + bus-width = <8>; + max-frequency = <48000000>; + cap-sd-highspeed; + cap-mmc-highspeed; + vmmc-supply = <&vsdcc_fixed>; + dmas = <&sdcc1bam 2>, <&sdcc1bam 1>; + dma-names = "tx", "rx"; + assigned-clocks = <&gcc SDC1_CLK>; + assigned-clock-rates = <400000>; + }; - sdcc2: mmc@12140000 { - compatible = "arm,pl18x", "arm,primecell"; - arm,primecell-periphid = <0x00051180>; - status = "disabled"; - reg = <0x12140000 0x2000>; - interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>; - clock-names = "mclk", "apb_pclk"; - bus-width = <4>; - cap-sd-highspeed; - cap-mmc-highspeed; - max-frequency = <48000000>; - no-1-8-v; - vmmc-supply = <&vsdcc_fixed>; - dmas = <&sdcc2bam 2>, <&sdcc2bam 1>; - dma-names = "tx", "rx"; - assigned-clocks = <&gcc SDC2_CLK>; - assigned-clock-rates = <400000>; - }; + sdcc2: mmc@12140000 { + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; + status = "disabled"; + reg = <0x12140000 0x2000>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&gcc SDC2_CLK>, <&gcc SDC2_H_CLK>; + clock-names = "mclk", "apb_pclk"; + bus-width = <4>; + cap-sd-highspeed; + cap-mmc-highspeed; + max-frequency = <48000000>; + no-1-8-v; + vmmc-supply = <&vsdcc_fixed>; + dmas = <&sdcc2bam 2>, <&sdcc2bam 1>; + dma-names = "tx", "rx"; + assigned-clocks = <&gcc SDC2_CLK>; + assigned-clock-rates = <400000>; }; tcsr: syscon@1a400000 {
Since amba node type has been deprecated, remove this subnode and move the mmc nodes in the main soc node. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>