-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'renesas-arm64-dt-for-v4.9' of git://git.kernel.org/pub/scm…
…/linux/kernel/git/horms/renesas into next/late Pull "Renesas ARM64 Based SoC DT Updates for v4.9" from Simon Horman: Clean up: * Remove unnecessary cap-mmc-highspeed property from SDHI nodes on r8a7795 SoC * Add SoC-specific compatible property to audio-dmac nodes on r8a7795 SoC New Board: * Add r8a7794/h3ulcb board Enablement: * Add PFC and GPIO to r8a7796 SoC * Enable DU and USB 2.0 on r8a7795/salvator-x board * Add VTP, FCPV, FCPF and FDP1 to r8a7795 SoC * Set maximum frequency for SDHI clocks on r8a7795 SoC * tag 'renesas-arm64-dt-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (43 commits) arm64: dts: r8a7796: Add GPIO device nodes arm64: dts: r8a7796: salvator-x: add serial console pins arm64: dts: r8a7796: Add pinctrl device node arm64: dts: r8a7795: salvator-x: Configure pins for the DU RGB output arm64: dts: h3ulcb: enable GPIO leds arm64: dts: h3ulcb: Sound SSI support arm64: dts: h3ulcb: enable SDHI0 arm64: dts: h3ulcb: enable GPIO keys arm64: dts: r8a7795: remove unnecessary cap-mmc-highspeed property arm64: dts: h3ulcb: enable USB2.0 Host channel 1 arm64: dts: h3ulcb: enable USB2 PHY of channel 1 arm64: dts: h3ulcb: enable WDT arm64: dts: h3ulcb: enable EXTALR clk arm64: dts: h3ulcb: enable I2C2 arm64: dts: h3ulcb: enable EthernetAVB arm64: dts: h3ulcb: enable SCIF clk and pins arm64: dts: h3ulcb: initial device tree arm64: dts: h3ulcb: add H3ULCB board DT bindings arm64: dts: r8a7795: Add SoC-specific compatible property to audio-dmac nodes arm64: dts: r8a7795: renesas: salvator-x: Enable DU ...
- Loading branch information
Showing
15 changed files
with
6,532 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,328 @@ | ||
| /* | ||
| * Device Tree Source for the H3ULCB board | ||
| * | ||
| * Copyright (C) 2016 Renesas Electronics Corp. | ||
| * Copyright (C) 2016 Cogent Embedded, Inc. | ||
| * | ||
| * This file is licensed under the terms of the GNU General Public License | ||
| * version 2. This program is licensed "as is" without any warranty of any | ||
| * kind, whether express or implied. | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| #include "r8a7795.dtsi" | ||
| #include <dt-bindings/gpio/gpio.h> | ||
| #include <dt-bindings/input/input.h> | ||
|
|
||
| / { | ||
| model = "Renesas H3ULCB board based on r8a7795"; | ||
| compatible = "renesas,h3ulcb", "renesas,r8a7795"; | ||
|
|
||
| aliases { | ||
| serial0 = &scif2; | ||
| ethernet0 = &avb; | ||
| }; | ||
|
|
||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
|
|
||
| memory@48000000 { | ||
| device_type = "memory"; | ||
| /* first 128MB is reserved for secure area. */ | ||
| reg = <0x0 0x48000000 0x0 0x38000000>; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
|
|
||
| led5 { | ||
| gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
| led6 { | ||
| gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
| }; | ||
|
|
||
| keyboard { | ||
| compatible = "gpio-keys"; | ||
|
|
||
| key-1 { | ||
| linux,code = <KEY_1>; | ||
| label = "SW3"; | ||
| wakeup-source; | ||
| debounce-interval = <20>; | ||
| gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; | ||
| }; | ||
| }; | ||
|
|
||
| x12_clk: x12 { | ||
| compatible = "fixed-clock"; | ||
| #clock-cells = <0>; | ||
| clock-frequency = <24576000>; | ||
| }; | ||
|
|
||
| vcc_sdhi0: regulator-vcc-sdhi0 { | ||
| compatible = "regulator-fixed"; | ||
|
|
||
| regulator-name = "SDHI0 Vcc"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
|
|
||
| gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>; | ||
| enable-active-high; | ||
| }; | ||
|
|
||
| vccq_sdhi0: regulator-vccq-sdhi0 { | ||
| compatible = "regulator-gpio"; | ||
|
|
||
| regulator-name = "SDHI0 VccQ"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <3300000>; | ||
|
|
||
| gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; | ||
| gpios-states = <1>; | ||
| states = <3300000 1 | ||
| 1800000 0>; | ||
| }; | ||
|
|
||
| audio_clkout: audio-clkout { | ||
| /* | ||
| * This is same as <&rcar_sound 0> | ||
| * but needed to avoid cs2000/rcar_sound probe dead-lock | ||
| */ | ||
| compatible = "fixed-clock"; | ||
| #clock-cells = <0>; | ||
| clock-frequency = <11289600>; | ||
| }; | ||
|
|
||
| rsnd_ak4613: sound { | ||
| compatible = "simple-audio-card"; | ||
|
|
||
| simple-audio-card,format = "left_j"; | ||
| simple-audio-card,bitclock-master = <&sndcpu>; | ||
| simple-audio-card,frame-master = <&sndcpu>; | ||
|
|
||
| sndcpu: simple-audio-card,cpu { | ||
| sound-dai = <&rcar_sound>; | ||
| }; | ||
|
|
||
| sndcodec: simple-audio-card,codec { | ||
| sound-dai = <&ak4613>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &extal_clk { | ||
| clock-frequency = <16666666>; | ||
| }; | ||
|
|
||
| &extalr_clk { | ||
| clock-frequency = <32768>; | ||
| }; | ||
|
|
||
| &pfc { | ||
| pinctrl-0 = <&scif_clk_pins>; | ||
| pinctrl-names = "default"; | ||
|
|
||
| scif2_pins: scif2 { | ||
| groups = "scif2_data_a"; | ||
| function = "scif2"; | ||
| }; | ||
|
|
||
| scif_clk_pins: scif_clk { | ||
| groups = "scif_clk_a"; | ||
| function = "scif_clk"; | ||
| }; | ||
|
|
||
| i2c2_pins: i2c2 { | ||
| groups = "i2c2_a"; | ||
| function = "i2c2"; | ||
| }; | ||
|
|
||
| avb_pins: avb { | ||
| groups = "avb_mdc"; | ||
| function = "avb"; | ||
| }; | ||
|
|
||
| sdhi0_pins_3v3: sd0_3v3 { | ||
| groups = "sdhi0_data4", "sdhi0_ctrl"; | ||
| function = "sdhi0"; | ||
| power-source = <3300>; | ||
| }; | ||
|
|
||
| sdhi0_pins_1v8: sd0_1v8 { | ||
| groups = "sdhi0_data4", "sdhi0_ctrl"; | ||
| function = "sdhi0"; | ||
| power-source = <1800>; | ||
| }; | ||
|
|
||
| sound_pins: sound { | ||
| groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; | ||
| function = "ssi"; | ||
| }; | ||
|
|
||
| sound_clk_pins: sound-clk { | ||
| groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", | ||
| "audio_clkout_a", "audio_clkout3_a"; | ||
| function = "audio_clk"; | ||
| }; | ||
|
|
||
| usb1_pins: usb1 { | ||
| groups = "usb1"; | ||
| function = "usb1"; | ||
| }; | ||
| }; | ||
|
|
||
| &scif2 { | ||
| pinctrl-0 = <&scif2_pins>; | ||
| pinctrl-names = "default"; | ||
|
|
||
| status = "okay"; | ||
| }; | ||
|
|
||
| &scif_clk { | ||
| clock-frequency = <14745600>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &i2c2 { | ||
| pinctrl-0 = <&i2c2_pins>; | ||
| pinctrl-names = "default"; | ||
|
|
||
| status = "okay"; | ||
|
|
||
| clock-frequency = <100000>; | ||
|
|
||
| ak4613: codec@10 { | ||
| compatible = "asahi-kasei,ak4613"; | ||
| #sound-dai-cells = <0>; | ||
| reg = <0x10>; | ||
| clocks = <&rcar_sound 3>; | ||
|
|
||
| asahi-kasei,in1-single-end; | ||
| asahi-kasei,in2-single-end; | ||
| asahi-kasei,out1-single-end; | ||
| asahi-kasei,out2-single-end; | ||
| asahi-kasei,out3-single-end; | ||
| asahi-kasei,out4-single-end; | ||
| asahi-kasei,out5-single-end; | ||
| asahi-kasei,out6-single-end; | ||
| }; | ||
|
|
||
| cs2000: clk-multiplier@4f { | ||
| #clock-cells = <0>; | ||
| compatible = "cirrus,cs2000-cp"; | ||
| reg = <0x4f>; | ||
| clocks = <&audio_clkout>, <&x12_clk>; | ||
| clock-names = "clk_in", "ref_clk"; | ||
|
|
||
| assigned-clocks = <&cs2000>; | ||
| assigned-clock-rates = <24576000>; /* 1/1 divide */ | ||
| }; | ||
| }; | ||
|
|
||
| &rcar_sound { | ||
| pinctrl-0 = <&sound_pins &sound_clk_pins>; | ||
| pinctrl-names = "default"; | ||
|
|
||
| /* Single DAI */ | ||
| #sound-dai-cells = <0>; | ||
|
|
||
| /* audio_clkout0/1/2/3 */ | ||
| #clock-cells = <1>; | ||
| clock-frequency = <11289600>; | ||
|
|
||
| status = "okay"; | ||
|
|
||
| /* update <audio_clk_b> to <cs2000> */ | ||
| clocks = <&cpg CPG_MOD 1005>, | ||
| <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>, | ||
| <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>, | ||
| <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, | ||
| <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, | ||
| <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, | ||
| <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>, | ||
| <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>, | ||
| <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>, | ||
| <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>, | ||
| <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>, | ||
| <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>, | ||
| <&audio_clk_a>, <&cs2000>, | ||
| <&audio_clk_c>, | ||
| <&cpg CPG_CORE R8A7795_CLK_S0D4>; | ||
|
|
||
| rcar_sound,dai { | ||
| dai0 { | ||
| playback = <&ssi0 &src0 &dvc0>; | ||
| capture = <&ssi1 &src1 &dvc1>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &sdhi0 { | ||
| pinctrl-0 = <&sdhi0_pins_3v3>; | ||
| pinctrl-1 = <&sdhi0_pins_1v8>; | ||
| pinctrl-names = "default", "state_uhs"; | ||
|
|
||
| vmmc-supply = <&vcc_sdhi0>; | ||
| vqmmc-supply = <&vccq_sdhi0>; | ||
| cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>; | ||
| bus-width = <4>; | ||
| sd-uhs-sdr50; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &ssi1 { | ||
| shared-pin; | ||
| }; | ||
|
|
||
| &wdt0 { | ||
| timeout-sec = <60>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &audio_clk_a { | ||
| clock-frequency = <22579200>; | ||
| }; | ||
|
|
||
| &avb { | ||
| pinctrl-0 = <&avb_pins>; | ||
| pinctrl-names = "default"; | ||
| renesas,no-ether-link; | ||
| phy-handle = <&phy0>; | ||
| status = "okay"; | ||
|
|
||
| phy0: ethernet-phy@0 { | ||
| rxc-skew-ps = <900>; | ||
| rxdv-skew-ps = <0>; | ||
| rxd0-skew-ps = <0>; | ||
| rxd1-skew-ps = <0>; | ||
| rxd2-skew-ps = <0>; | ||
| rxd3-skew-ps = <0>; | ||
| txc-skew-ps = <900>; | ||
| txen-skew-ps = <0>; | ||
| txd0-skew-ps = <0>; | ||
| txd1-skew-ps = <0>; | ||
| txd2-skew-ps = <0>; | ||
| txd3-skew-ps = <0>; | ||
| reg = <0>; | ||
| interrupt-parent = <&gpio2>; | ||
| interrupts = <11 IRQ_TYPE_LEVEL_LOW>; | ||
| }; | ||
| }; | ||
|
|
||
| &usb2_phy1 { | ||
| pinctrl-0 = <&usb1_pins>; | ||
| pinctrl-names = "default"; | ||
|
|
||
| status = "okay"; | ||
| }; | ||
|
|
||
| &ehci1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &ohci1 { | ||
| status = "okay"; | ||
| }; |
Oops, something went wrong.