| Message ID | 20170614082338.15673-1-guodong.xu@linaro.org |
|---|---|
| Headers | show |
| Series | arm64: dts: hi3660: add device nodes | expand |
On Wed, Jun 14, 2017 at 04:23:31PM +0800, Guodong Xu wrote: > From: Leo Yan <leo.yan@linaro.org> > > On Hi3660 there have two clusters, one is CA53 cluster and another is > CA73 cluster. This two clusters have different idle states separately. > With Daniel Lezcano's patch (ARM: cpuidle: Support asymmetric idle > definition), now ARM idle driver can support different clusters with > different idle states. > > Base on this, this patch is to bind two clusters idle states on Hi3660. > Except the "WFI" states are enabled by default for all CPUs, this patch > also binds below extra idle states: > > - CA53 CPUs have two more states: > CPU_SLEEP: CPU power off state > CLUSTER_SLEEP_0: Cluster power off state > > - CA73 CPUs have three more states: > CPU_NAP: CPU retention state > CPU_SLEEP: CPU power off state > CLUSTER_SLEEP_1: Cluster power off state Hi Guodong, Wei and all, As Daniel reminded, this patch is dependent on patch (ARM: cpuidle: Support asymmetric idle definition) [1] but his patch has not been finally merged yet. So let us hold on this patch for Daniel's patch is picked up firstly. At the meantime welcome the review and comment for this patch ahead. [1] https://patchwork.kernel.org/patch/9781869/ [...] Thanks, Leo Yan
Hi Uffe, On 2017/6/20 9:36, Ulf Hansson wrote: > Hi Wei, > > On 19 June 2017 at 15:00, Wei Xu <xuwei5@hisilicon.com> wrote: >> Hi Ulf, >> >> On 2017/6/19 13:43, Ulf Hansson wrote: >>> On 14 June 2017 at 10:23, Guodong Xu <guodong.xu@linaro.org> wrote: >>>> Add bindings for hi3660 mmc support >>>> >>>> Signed-off-by: Li Wei <liwei213@huawei.com> >>>> Signed-off-by: Guodong Xu <guodong.xu@linaro.org> >>>> --- >>>> Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 1 + >>>> 1 file changed, 1 insertion(+) >>>> >>>> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>> index df37058..8af1afc 100644 >>>> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>> @@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller. >>>> Required Properties: >>>> >>>> * compatible: should be one of the following. >>>> + - "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions. >>>> - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions. >>>> - "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions. >>>> >>>> -- >>>> 2.10.2 >>>> >>> >>> Thanks, applied for next! >> >> Thanks! >> Last week I had applied the v4 patch set[1] >> and this patch is included. >> But it should be fine for the upper gatekeeper to merge >> since these 2 patch are same. > > No, that's not how git works. > > If the patch has the same hash, that would be fine, but that isn't the > case here as we have two different hashes for the same change. Got it. Thanks for your explaining! > > To deal with this, I have just dropped the change from my tree and > leave it to you to carry the patch. Feel free to add my ack for it. Thanks! But the pull request I sent last week has been merged. Best Regards, Wei > > Kind regards > Uffe > > . >
On 20 June 2017 at 11:59, Wei Xu <xuwei5@hisilicon.com> wrote: > Hi Uffe, > > On 2017/6/20 9:36, Ulf Hansson wrote: >> Hi Wei, >> >> On 19 June 2017 at 15:00, Wei Xu <xuwei5@hisilicon.com> wrote: >>> Hi Ulf, >>> >>> On 2017/6/19 13:43, Ulf Hansson wrote: >>>> On 14 June 2017 at 10:23, Guodong Xu <guodong.xu@linaro.org> wrote: >>>>> Add bindings for hi3660 mmc support >>>>> >>>>> Signed-off-by: Li Wei <liwei213@huawei.com> >>>>> Signed-off-by: Guodong Xu <guodong.xu@linaro.org> >>>>> --- >>>>> Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 1 + >>>>> 1 file changed, 1 insertion(+) >>>>> >>>>> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> index df37058..8af1afc 100644 >>>>> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> @@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller. >>>>> Required Properties: >>>>> >>>>> * compatible: should be one of the following. >>>>> + - "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions. >>>>> - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions. >>>>> - "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions. >>>>> >>>>> -- >>>>> 2.10.2 >>>>> >>>> >>>> Thanks, applied for next! >>> >>> Thanks! >>> Last week I had applied the v4 patch set[1] >>> and this patch is included. >>> But it should be fine for the upper gatekeeper to merge >>> since these 2 patch are same. >> >> No, that's not how git works. >> >> If the patch has the same hash, that would be fine, but that isn't the >> case here as we have two different hashes for the same change. > > Got it. Thanks for your explaining! > >> >> To deal with this, I have just dropped the change from my tree and >> leave it to you to carry the patch. Feel free to add my ack for it. > > Thanks! > But the pull request I sent last week has been merged. No worries, it's fine even without my ack this time. Kind regards Uffe
This patchset adds various devices nodes for hi3660 and hikey960. HiKey960 is one of 96boards. For details information about it, please refer to [1]. In v3, * nothing is changed for patches already exists in v2. * added 9 more dts patches. Most of them already were reviewed with their corresponding driver patchset. For purpose of easy integration for platform maintainer, I copied them here, including threads [2], [3], and [4]. * four patches, this is the first time they are sent out for review. v3-0014-arm64-dts-hi3660-enable-idle-states.patch v3-0019-dt-bindings-mmc-dw_mmc-k3-add-document-of-hi3660-.patch v3-0020-arm64-dts-hi3660-add-sd-sdio-device-nodes.patch v3-0021-arm64-dts-hi3660-hikey960-add-nodes-for-WiFi.patch mmc driver is under review in [5]. In v2, incorporated review comments from Rob Herring <robh@kernel.org> * uart4: max-speed should be in slave device bluetooth node * LEDs: - bt_active triggered by 'hci0-power' - move out of SoC level * pinctrl: update dts to use #pinctrl-cells * uart: add pinctrl information into uart nodes; add label strings. * chosen: update stdout-path. serial6 is used. * i2c: add label strings. change reg address to lower case. * remove unnecessary status="ok" * gpio-keys: move out of SoC level. [1] https://github.com/96boards/documentation/tree/master/ConsumerEdition/HiKey960 [2] sp804 timer: https://www.spinics.net/lists/kernel/msg2513025.html [3] PCIe: https://www.spinics.net/lists/kernel/msg2520677.html [4] mfd and regulator: https://www.spinics.net/lists/arm-kernel/msg586147.html [5] mmc: https://patchwork.kernel.org/patch/9783273/ Chen Feng (2): arm64: dts: hi3660: Add uarts nodes arm64: dts: hi3660: Add pl031 rtc node Chen Jun (1): arm64: dts: hi3660: add power key dts node Guodong Xu (7): dt-bindings: arm: hisilicon: add bindings for HiKey960 board arm64: dts: hisilicon: update compatible string for hikey960 arm64: dts: hikey960: add WL1837 Bluetooth device node arm64: dts: hikey960: add LED nodes dt-bindings: mfd: hi6421: Add hi6421v530 compatible string dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc arm64: dts: hi3660-hikey960: add nodes for WiFi Leo Yan (2): arm64: dts: hi3660: add sp804 timer node arm64: dts: hi3660: enable idle states Li Wei (1): arm64: dts: hi3660: add sd/sdio device nodes Wang Xiaoyin (4): arm64: dts: hikey960: pinctrl: add more pinmux and pinconfig arm64: dts: hi3660: add gpio dtsi file for Hisilicon Hi3660 SOC arm64: dts: hi3660: add spi device nodes arm64: dts: hikey960: add device node for pmic and regulators Xiaowei Song (2): dt-bindings: PCI: hisi: Add document for PCIe of Kirin SoCs arm64: dts: hisi: add kirin pcie node Zhangfei Gao (2): arm64: dts: hi3660: add resources for clock and reset arm64: dts: Add I2C nodes for Hi3660 .../bindings/arm/hisilicon/hisilicon.txt | 4 + Documentation/devicetree/bindings/mfd/hi6421.txt | 4 +- .../devicetree/bindings/mmc/k3-dw-mshc.txt | 1 + .../devicetree/bindings/pci/kirin-pcie.txt | 50 ++ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 217 +++++- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 765 +++++++++++++++++++- .../arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi | 778 +++++++++++++++++++-- 7 files changed, 1744 insertions(+), 75 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt -- 2.10.2